Skip to content

F
ffmpeg.wasm-core
Commit ae3313e1 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '53c20f17' 

* commit '53c20f17':
  vp8: K&R formatting cosmetics

Conflicts:
	libavcodec/vp8.c
	libavcodec/vp8.h
	libavcodec/vp8data.h
	libavcodec/vp8dsp.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents af3b6aed 53c20f17
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 951 additions and 823 deletions
libavcodec/vp8.c
View file @ ae3313e1
This diff is collapsed.
libavcodec/vp8.h
View file @ ae3313e1
...@@ -28,16 +28,17 @@ ...@@ -28,16 +28,17 @@
#include "libavutil/buffer.h" #include "libavutil/buffer.h"
#include "vp56.h"
#include "vp8dsp.h"
#include "h264pred.h" #include "h264pred.h"
#include "thread.h" #include "thread.h"
#include "vp56.h"
#include "vp8dsp.h"
#if HAVE_PTHREADS #if HAVE_PTHREADS
#include <pthread.h> # include <pthread.h>
#elif HAVE_OS2THREADS #elif HAVE_OS2THREADS
#include "compat/os2threads.h" # include "compat/os2threads.h"
#elif HAVE_W32THREADS #elif HAVE_W32THREADS
#include "compat/w32pthreads.h" # include "compat/w32pthreads.h"
#endif #endif
#define VP8_MAX_QUANT 127 #define VP8_MAX_QUANT 127
...@@ -84,7 +85,7 @@ typedef struct VP8FilterStrength { ...@@ -84,7 +85,7 @@ typedef struct VP8FilterStrength {
typedef struct VP8Macroblock { typedef struct VP8Macroblock {
uint8_t skip; uint8_t skip;
// todo: make it possible to check for at least (i4x4 or split_mv) // TODO: make it possible to check for at least (i4x4 or split_mv)
// in one op. are others needed? // in one op. are others needed?
uint8_t mode; uint8_t mode;
uint8_t ref_frame; uint8_t ref_frame;
...@@ -118,7 +119,7 @@ typedef struct VP8ThreadData { ...@@ -118,7 +119,7 @@ typedef struct VP8ThreadData {
int thread_nr; int thread_nr;
#if HAVE_THREADS #if HAVE_THREADS
pthread_mutex_t lock; pthread_mutex_t lock;
pthread_cond_t cond; pthread_cond_t cond;
#endif #endif
int thread_mb_pos; // (mb_y << 16) | (mb_x & 0xFFFF) int thread_mb_pos; // (mb_y << 16) | (mb_x & 0xFFFF)
int wait_mb_pos; // What the current thread is waiting on. int wait_mb_pos; // What the current thread is waiting on.
...@@ -205,7 +206,7 @@ typedef struct VP8Context { ...@@ -205,7 +206,7 @@ typedef struct VP8Context {
* [7] - split mv * [7] - split mv
* i16x16 modes never have any adjustment * i16x16 modes never have any adjustment
*/ */
int8_t mode[VP8_MVMODE_SPLIT+1]; int8_t mode[VP8_MVMODE_SPLIT + 1];
/** /**
* filter strength adjustment for macroblocks that reference: * filter strength adjustment for macroblocks that reference:
...@@ -217,7 +218,7 @@ typedef struct VP8Context { ...@@ -217,7 +218,7 @@ typedef struct VP8Context {
int8_t ref[4]; int8_t ref[4];
} lf_delta; } lf_delta;
uint8_t (*top_border)[16+8+8]; uint8_t (*top_border)[16 + 8 + 8];
uint8_t (*top_nnz)[9]; uint8_t (*top_nnz)[9];
VP56RangeCoder c; ///< header context, includes mb modes and motion vectors VP56RangeCoder c; ///< header context, includes mb modes and motion vectors
...@@ -236,7 +237,7 @@ typedef struct VP8Context { ...@@ -236,7 +237,7 @@ typedef struct VP8Context {
uint8_t golden; uint8_t golden;
uint8_t pred16x16[4]; uint8_t pred16x16[4];
uint8_t pred8x8c[3]; uint8_t pred8x8c[3];
uint8_t token[4][16][3][NUM_DCT_TOKENS-1]; uint8_t token[4][16][3][NUM_DCT_TOKENS - 1];
uint8_t mvc[2][19]; uint8_t mvc[2][19];
uint8_t scan[16]; uint8_t scan[16];
} prob[2]; } prob[2];
......
libavcodec/vp8_parser.c
View file @ ae3313e1
...@@ -21,18 +21,19 @@ ...@@ -21,18 +21,19 @@
#include "parser.h" #include "parser.h"
static int parse(AVCodecParserContext *s, static int parse(AVCodecParserContext *s,
AVCodecContext *avctx, AVCodecContext *avctx,
const uint8_t **poutbuf, int *poutbuf_size, const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
s->pict_type= (buf[0]&0x01) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; s->pict_type = (buf[0] & 0x01) ? AV_PICTURE_TYPE_P
: AV_PICTURE_TYPE_I;
*poutbuf = buf; *poutbuf = buf;
*poutbuf_size = buf_size; *poutbuf_size = buf_size;
return buf_size; return buf_size;
} }
AVCodecParser ff_vp8_parser = { AVCodecParser ff_vp8_parser = {
.codec_ids = { AV_CODEC_ID_VP8 }, .codec_ids = { AV_CODEC_ID_VP8 },
.parser_parse = parse, .parser_parse = parse,
}; };
libavcodec/vp8data.h
View file @ ae3313e1
...@@ -38,28 +38,25 @@ static const uint8_t vp7_pred4x4_mode[] = ...@@ -38,28 +38,25 @@ static const uint8_t vp7_pred4x4_mode[] =
[PLANE_PRED8x8] = TM_VP8_PRED, [PLANE_PRED8x8] = TM_VP8_PRED,
}; };
static const uint8_t vp8_pred4x4_mode[] = static const uint8_t vp8_pred4x4_mode[] = {
{
[DC_PRED8x8] = DC_PRED, [DC_PRED8x8] = DC_PRED,
[VERT_PRED8x8] = VERT_PRED, [VERT_PRED8x8] = VERT_PRED,
[HOR_PRED8x8] = HOR_PRED, [HOR_PRED8x8] = HOR_PRED,
[PLANE_PRED8x8] = TM_VP8_PRED, [PLANE_PRED8x8] = TM_VP8_PRED,
}; };
static const int8_t vp8_pred16x16_tree_intra[4][2] = static const int8_t vp8_pred16x16_tree_intra[4][2] = {
{ { -MODE_I4x4, 1 }, // '0'
{ -MODE_I4x4, 1 }, // '0' { 2, 3 },
{ 2, 3 }, { -DC_PRED8x8, -VERT_PRED8x8 }, // '100', '101'
{ -DC_PRED8x8, -VERT_PRED8x8 }, // '100', '101' { -HOR_PRED8x8, -PLANE_PRED8x8 }, // '110', '111'
{ -HOR_PRED8x8, -PLANE_PRED8x8 }, // '110', '111'
}; };
static const int8_t vp8_pred16x16_tree_inter[4][2] = static const int8_t vp8_pred16x16_tree_inter[4][2] = {
{ { -DC_PRED8x8, 1 }, // '0'
{ -DC_PRED8x8, 1 }, // '0' { 2, 3 },
{ 2, 3 }, { -VERT_PRED8x8, -HOR_PRED8x8 }, // '100', '101'
{ -VERT_PRED8x8, -HOR_PRED8x8 }, // '100', '101' { -PLANE_PRED8x8, -MODE_I4x4 }, // '110', '111'
{ -PLANE_PRED8x8, -MODE_I4x4 }, // '110', '111'
}; };
typedef struct { typedef struct {
...@@ -129,26 +126,26 @@ static const int vp8_mode_contexts[6][4] = { ...@@ -129,26 +126,26 @@ static const int vp8_mode_contexts[6][4] = {
}; };
static const uint8_t vp8_mbsplits[5][16] = { static const uint8_t vp8_mbsplits[5][16] = {
{ 0, 0, 0, 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1 },
1, 1, 1, 1, 1, 1, 1, 1 }, { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1 },
{ 0, 0, 1, 1, 0, 0, 1, 1, { 0, 0, 1, 1, 0, 0, 1, 1, 2, 2, 3, 3, 2, 2, 3, 3 },
0, 0, 1, 1, 0, 0, 1, 1 }, { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
{ 0, 0, 1, 1, 0, 0, 1, 1, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
2, 2, 3, 3, 2, 2, 3, 3 },
{ 0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15 },
{ 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0 }
}; };
static const uint8_t vp8_mbfirstidx[4][16] = { static const uint8_t vp8_mbfirstidx[4][16] = {
{ 0, 8 }, { 0, 2 }, { 0, 2, 8, 10 }, { 0, 8 },
{ 0, 1, 2, 3, 4, 5, 6, 7, { 0, 2 },
8, 9, 10, 11, 12, 13, 14, 15 } { 0, 2, 8, 10 },
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }
}; };
static const uint8_t vp8_mbsplit_count[4] = { 2, 2, 4, 16 }; static const uint8_t vp8_mbsplit_count[4] = {
static const uint8_t vp8_mbsplit_prob[3] = { 110, 111, 150 }; 2, 2, 4, 16
};
static const uint8_t vp8_mbsplit_prob[3] = {
110, 111, 150
};
static const uint8_t vp7_submv_prob[3] = { 180, 162, 25 }; static const uint8_t vp7_submv_prob[3] = { 180, 162, 25 };
...@@ -160,39 +157,42 @@ static const uint8_t vp8_submv_prob[5][3] = { ...@@ -160,39 +157,42 @@ static const uint8_t vp8_submv_prob[5][3] = {
{ 208, 1, 1 } { 208, 1, 1 }
}; };
static const uint8_t vp8_pred16x16_prob_intra[4] = { 145, 156, 163, 128 }; static const uint8_t vp8_pred16x16_prob_intra[4] = {
static const uint8_t vp8_pred16x16_prob_inter[4] = { 112, 86, 140, 37 }; 145, 156, 163, 128
};
static const uint8_t vp8_pred16x16_prob_inter[4] = {
112, 86, 140, 37
};
static const int8_t vp8_pred4x4_tree[9][2] = static const int8_t vp8_pred4x4_tree[9][2] = {
{ { -DC_PRED, 1 }, // '0'
{ -DC_PRED, 1 }, // '0' { -TM_VP8_PRED, 2 }, // '10'
{ -TM_VP8_PRED, 2 }, // '10' { -VERT_PRED, 3 }, // '110'
{ -VERT_PRED, 3 }, // '110' { 4, 6 },
{ 4, 6 }, { -HOR_PRED, 5 }, // '11100'
{ -HOR_PRED, 5 }, // '11100' { -DIAG_DOWN_RIGHT_PRED, -VERT_RIGHT_PRED }, // '111010', '111011'
{ -DIAG_DOWN_RIGHT_PRED, -VERT_RIGHT_PRED }, // '111010', '111011' { -DIAG_DOWN_LEFT_PRED, 7 }, // '11110'
{ -DIAG_DOWN_LEFT_PRED, 7 }, // '11110' { -VERT_LEFT_PRED, 8 }, // '111110'
{ -VERT_LEFT_PRED, 8 }, // '111110' { -HOR_DOWN_PRED, -HOR_UP_PRED }, // '1111110', '1111111'
{ -HOR_DOWN_PRED, -HOR_UP_PRED }, // '1111110', '1111111'
};
static const int8_t vp8_pred8x8c_tree[3][2] =
{
{ -DC_PRED8x8, 1 }, // '0'
{ -VERT_PRED8x8, 2 }, // '10
{ -HOR_PRED8x8, -PLANE_PRED8x8 }, // '110', '111'
}; };
static const uint8_t vp8_pred8x8c_prob_intra[3] = { 142, 114, 183 }; static const int8_t vp8_pred8x8c_tree[3][2] = {
static const uint8_t vp8_pred8x8c_prob_inter[3] = { 162, 101, 204 }; { -DC_PRED8x8, 1 }, // '0'
{ -VERT_PRED8x8, 2 }, // '10
{ -HOR_PRED8x8, -PLANE_PRED8x8 }, // '110', '111'
};
static const uint8_t vp8_pred4x4_prob_inter[9] = static const uint8_t vp8_pred8x8c_prob_intra[3] = {
{ 142, 114, 183
};
static const uint8_t vp8_pred8x8c_prob_inter[3] = {
162, 101, 204
};
static const uint8_t vp8_pred4x4_prob_inter[9] = {
120, 90, 79, 133, 87, 85, 80, 111, 151 120, 90, 79, 133, 87, 85, 80, 111, 151
}; };
static const uint8_t vp8_pred4x4_prob_intra[10][10][9] = static const uint8_t vp8_pred4x4_prob_intra[10][10][9] = {
{
{ {
{ 39, 53, 200, 87, 26, 21, 43, 232, 171 }, { 39, 53, 200, 87, 26, 21, 43, 232, 171 },
{ 56, 34, 51, 104, 114, 102, 29, 93, 77 }, { 56, 34, 51, 104, 114, 102, 29, 93, 77 },
...@@ -315,50 +315,57 @@ static const uint8_t vp8_pred4x4_prob_intra[10][10][9] = ...@@ -315,50 +315,57 @@ static const uint8_t vp8_pred4x4_prob_intra[10][10][9] =
}, },
}; };
static const int8_t vp8_segmentid_tree[][2] = static const int8_t vp8_segmentid_tree[][2] = {
{ { 1, 2 },
{ 1, 2 }, { -0, -1 }, // '00', '01'
{ -0, -1 }, // '00', '01' { -2, -3 }, // '10', '11'
{ -2, -3 }, // '10', '11'
}; };
static const uint8_t vp8_coeff_band[16] = static const uint8_t vp8_coeff_band[16] = {
{
0, 1, 2, 3, 6, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7 0, 1, 2, 3, 6, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7
}; };
/* Inverse of vp8_coeff_band: mappings of bands to coefficient indexes. /* Inverse of vp8_coeff_band: mappings of bands to coefficient indexes.
* Each list is -1-terminated. */ * Each list is -1-terminated. */
static const int8_t vp8_coeff_band_indexes[8][10] = static const int8_t vp8_coeff_band_indexes[8][10] = {
{ { 0, -1 },
{0, -1}, { 1, -1 },
{1, -1}, { 2, -1 },
{2, -1}, { 3, -1 },
{3, -1}, { 5, -1 },
{5, -1}, { 6, -1 },
{6, -1}, { 4, 7, 8, 9, 10, 11, 12, 13, 14, -1 },
{4, 7, 8, 9, 10, 11, 12, 13, 14, -1}, { 15, -1 }
{15, -1} };
};
static const uint8_t vp8_dct_cat1_prob[] = {
static const uint8_t vp8_dct_cat1_prob[] = { 159, 0 }; 159, 0
static const uint8_t vp8_dct_cat2_prob[] = { 165, 145, 0 }; };
static const uint8_t vp8_dct_cat3_prob[] = { 173, 148, 140, 0 }; static const uint8_t vp8_dct_cat2_prob[] = {
static const uint8_t vp8_dct_cat4_prob[] = { 176, 155, 140, 135, 0 }; 165, 145, 0
static const uint8_t vp8_dct_cat5_prob[] = { 180, 157, 141, 134, 130, 0 }; };
static const uint8_t vp8_dct_cat6_prob[] = { 254, 254, 243, 230, 196, 177, 153, 140, 133, 130, 129, 0 }; static const uint8_t vp8_dct_cat3_prob[] = {
173, 148, 140, 0
};
static const uint8_t vp8_dct_cat4_prob[] = {
176, 155, 140, 135, 0
};
static const uint8_t vp8_dct_cat5_prob[] = {
180, 157, 141, 134, 130, 0
};
static const uint8_t vp8_dct_cat6_prob[] = {
254, 254, 243, 230, 196, 177, 153, 140, 133, 130, 129, 0
};
// only used for cat3 and above; cat 1 and 2 are referenced directly // only used for cat3 and above; cat 1 and 2 are referenced directly
const uint8_t * const ff_vp8_dct_cat_prob[] = const uint8_t *const ff_vp8_dct_cat_prob[] = {
{
vp8_dct_cat3_prob, vp8_dct_cat3_prob,
vp8_dct_cat4_prob, vp8_dct_cat4_prob,
vp8_dct_cat5_prob, vp8_dct_cat5_prob,
vp8_dct_cat6_prob, vp8_dct_cat6_prob,
}; };
static const uint8_t vp8_token_default_probs[4][8][3][NUM_DCT_TOKENS-1] = static const uint8_t vp8_token_default_probs[4][8][3][NUM_DCT_TOKENS - 1] = {
{
{ {
{ {
{ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
...@@ -529,8 +536,7 @@ static const uint8_t vp8_token_default_probs[4][8][3][NUM_DCT_TOKENS-1] = ...@@ -529,8 +536,7 @@ static const uint8_t vp8_token_default_probs[4][8][3][NUM_DCT_TOKENS-1] =
}, },
}; };
static const uint8_t vp8_token_update_probs[4][8][3][NUM_DCT_TOKENS-1] = static const uint8_t vp8_token_update_probs[4][8][3][NUM_DCT_TOKENS - 1] = {
{
{ {
{ {
{ 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }, { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 },
...@@ -702,15 +708,14 @@ static const uint8_t vp8_token_update_probs[4][8][3][NUM_DCT_TOKENS-1] = ...@@ -702,15 +708,14 @@ static const uint8_t vp8_token_update_probs[4][8][3][NUM_DCT_TOKENS-1] =
}; };
// fixme: copied from h264data.h // fixme: copied from h264data.h
static const uint8_t zigzag_scan[16]={ static const uint8_t zigzag_scan[16] = {
0+0*4, 1+0*4, 0+1*4, 0+2*4, 0 + 0 * 4, 1 + 0 * 4, 0 + 1 * 4, 0 + 2 * 4,
1+1*4, 2+0*4, 3+0*4, 2+1*4, 1 + 1 * 4, 2 + 0 * 4, 3 + 0 * 4, 2 + 1 * 4,
1+2*4, 0+3*4, 1+3*4, 2+2*4, 1 + 2 * 4, 0 + 3 * 4, 1 + 3 * 4, 2 + 2 * 4,
3+1*4, 3+2*4, 2+3*4, 3+3*4, 3 + 1 * 4, 3 + 2 * 4, 2 + 3 * 4, 3 + 3 * 4,
}; };
static const uint8_t vp8_dc_qlookup[VP8_MAX_QUANT+1] = static const uint8_t vp8_dc_qlookup[VP8_MAX_QUANT + 1] = {
{
4, 5, 6, 7, 8, 9, 10, 10, 11, 12, 13, 14, 15, 16, 17, 17, 4, 5, 6, 7, 8, 9, 10, 10, 11, 12, 13, 14, 15, 16, 17, 17,
18, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 25, 25, 26, 27, 28, 18, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 25, 25, 26, 27, 28,
29, 30, 31, 32, 33, 34, 35, 36, 37, 37, 38, 39, 40, 41, 42, 43, 29, 30, 31, 32, 33, 34, 35, 36, 37, 37, 38, 39, 40, 41, 42, 43,
...@@ -721,8 +726,7 @@ static const uint8_t vp8_dc_qlookup[VP8_MAX_QUANT+1] = ...@@ -721,8 +726,7 @@ static const uint8_t vp8_dc_qlookup[VP8_MAX_QUANT+1] =
122, 124, 126, 128, 130, 132, 134, 136, 138, 140, 143, 145, 148, 151, 154, 157, 122, 124, 126, 128, 130, 132, 134, 136, 138, 140, 143, 145, 148, 151, 154, 157,
}; };
static const uint16_t vp8_ac_qlookup[VP8_MAX_QUANT+1] = static const uint16_t vp8_ac_qlookup[VP8_MAX_QUANT + 1] = {
{
4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
......
libavcodec/vp8dsp.c
View file @ ae3313e1
This diff is collapsed.
libavcodec/vp8dsp.h
View file @ ae3313e1
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
typedef void (*vp8_mc_func)(uint8_t *dst/*align 8*/, ptrdiff_t dstStride, typedef void (*vp8_mc_func)(uint8_t *dst /* align 8 */, ptrdiff_t dstStride,
uint8_t *src/*align 1*/, ptrdiff_t srcStride, uint8_t *src /* align 1 */, ptrdiff_t srcStride,
int h, int x, int y); int h, int x, int y);
typedef struct VP8DSPContext { typedef struct VP8DSPContext {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment