diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-03-31 18:12:58 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-04-01 23:47:25 +0200 |
| commit | d2264740e6345a4bcfaeac529a66715bdd5f8fbe (patch) | |
| tree | f7d270541288ecc441cd17fe73850a816e604080 /libavcodec/vp3.c | |
| parent | 66d04c068a30751750818dcfbb6555ab74eb3f6d (diff) | |
VP3: K&R formatting cosmetics
Diffstat (limited to 'libavcodec/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 1542 |
1 files changed, 787 insertions, 755 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index dba286c3bb..2de3ebdc89 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -34,20 +34,21 @@ #include <string.h> #include "libavutil/imgutils.h" + #include "avcodec.h" -#include "internal.h" #include "get_bits.h" #include "hpeldsp.h" +#include "internal.h" #include "mathops.h" +#include "thread.h" #include "videodsp.h" #include "vp3data.h" #include "vp3dsp.h" #include "xiph.h" -#include "thread.h" #define FRAGMENT_PIXELS 8 -//FIXME split things out into their own arrays +// FIXME split things out into their own arrays typedef struct Vp3Fragment { int16_t dc; uint8_t coding_method; @@ -77,51 +78,49 @@ typedef struct Vp3Fragment { #define MODE_COPY 8 /* There are 6 preset schemes, plus a free-form scheme */ -static const int ModeAlphabet[6][CODING_MODE_COUNT] = -{ +static const int ModeAlphabet[6][CODING_MODE_COUNT] = { /* scheme 1: Last motion vector dominates */ - { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST, - MODE_INTER_PLUS_MV, MODE_INTER_NO_MV, - MODE_INTRA, MODE_USING_GOLDEN, - MODE_GOLDEN_MV, MODE_INTER_FOURMV }, + { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST, + MODE_INTER_PLUS_MV, MODE_INTER_NO_MV, + MODE_INTRA, MODE_USING_GOLDEN, + MODE_GOLDEN_MV, MODE_INTER_FOURMV }, /* scheme 2 */ - { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST, - MODE_INTER_NO_MV, MODE_INTER_PLUS_MV, - MODE_INTRA, MODE_USING_GOLDEN, - MODE_GOLDEN_MV, MODE_INTER_FOURMV }, + { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST, + MODE_INTER_NO_MV, MODE_INTER_PLUS_MV, + MODE_INTRA, MODE_USING_GOLDEN, + MODE_GOLDEN_MV, MODE_INTER_FOURMV }, /* scheme 3 */ - { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV, - MODE_INTER_PRIOR_LAST, MODE_INTER_NO_MV, - MODE_INTRA, MODE_USING_GOLDEN, - MODE_GOLDEN_MV, MODE_INTER_FOURMV }, + { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV, + MODE_INTER_PRIOR_LAST, MODE_INTER_NO_MV, + MODE_INTRA, MODE_USING_GOLDEN, + MODE_GOLDEN_MV, MODE_INTER_FOURMV }, /* scheme 4 */ - { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV, - MODE_INTER_NO_MV, MODE_INTER_PRIOR_LAST, - MODE_INTRA, MODE_USING_GOLDEN, - MODE_GOLDEN_MV, MODE_INTER_FOURMV }, + { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV, + MODE_INTER_NO_MV, MODE_INTER_PRIOR_LAST, + MODE_INTRA, MODE_USING_GOLDEN, + MODE_GOLDEN_MV, MODE_INTER_FOURMV }, /* scheme 5: No motion vector dominates */ - { MODE_INTER_NO_MV, MODE_INTER_LAST_MV, - MODE_INTER_PRIOR_LAST, MODE_INTER_PLUS_MV, - MODE_INTRA, MODE_USING_GOLDEN, - MODE_GOLDEN_MV, MODE_INTER_FOURMV }, + { MODE_INTER_NO_MV, MODE_INTER_LAST_MV, + MODE_INTER_PRIOR_LAST, MODE_INTER_PLUS_MV, + MODE_INTRA, MODE_USING_GOLDEN, + MODE_GOLDEN_MV, MODE_INTER_FOURMV }, /* scheme 6 */ - { MODE_INTER_NO_MV, MODE_USING_GOLDEN, - MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST, - MODE_INTER_PLUS_MV, MODE_INTRA, - MODE_GOLDEN_MV, MODE_INTER_FOURMV }, - + { MODE_INTER_NO_MV, MODE_USING_GOLDEN, + MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST, + MODE_INTER_PLUS_MV, MODE_INTRA, + MODE_GOLDEN_MV, MODE_INTER_FOURMV }, }; static const uint8_t hilbert_offset[16][2] = { - {0,0}, {1,0}, {1,1}, {0,1}, - {0,2}, {0,3}, {1,3}, {1,2}, - {2,2}, {2,3}, {3,3}, {3,2}, - {3,1}, {2,1}, {2,0}, {3,0} + { 0, 0 }, { 1, 0 }, { 1, 1 }, { 0, 1 }, + { 0, 2 }, { 0, 3 }, { 1, 3 }, { 1, 2 }, + { 2, 2 }, { 2, 3 }, { 3, 3 }, { 3, 2 }, + { 3, 1 }, { 2, 1 }, { 2, 0 }, { 3, 0 } }; #define MIN_DEQUANT_VAL 2 @@ -180,7 +179,7 @@ typedef struct Vp3DecodeContext { uint32_t coded_ac_scale_factor[64]; uint8_t base_matrix[384][64]; uint8_t qr_count[2][3]; - uint8_t qr_size [2][3][64]; + uint8_t qr_size[2][3][64]; uint16_t qr_base[2][3][64]; /** @@ -207,7 +206,8 @@ typedef struct Vp3DecodeContext { #define TOKEN_COEFF(coeff) (((coeff) << 2) + 2) /** - * number of blocks that contain DCT coefficients at the given level or higher + * number of blocks that contain DCT coefficients at + * the given level or higher */ int num_coded_frags[3][64]; int total_num_coded_frags; @@ -251,7 +251,7 @@ typedef struct Vp3DecodeContext { uint32_t huffman_table[80][32][2]; uint8_t filter_limit_values[64]; - DECLARE_ALIGNED(8, int, bounding_values_array)[256+2]; + DECLARE_ALIGNED(8, int, bounding_values_array)[256 + 2]; } Vp3DecodeContext; /************************************************************************ @@ -307,7 +307,6 @@ static av_cold int vp3_decode_end(AVCodecContext *avctx) ff_free_vlc(&s->mode_code_vlc); ff_free_vlc(&s->motion_vector_vlc); - return 0; } @@ -324,19 +323,22 @@ static int init_block_mapping(Vp3DecodeContext *s) int x, y, i, j = 0; for (plane = 0; plane < 3; plane++) { - int sb_width = plane ? s->c_superblock_width : s->y_superblock_width; - int sb_height = plane ? s->c_superblock_height : s->y_superblock_height; + int sb_width = plane ? s->c_superblock_width + : s->y_superblock_width; + int sb_height = plane ? s->c_superblock_height + : s->y_superblock_height; int frag_width = s->fragment_width[!!plane]; int frag_height = s->fragment_height[!!plane]; for (sb_y = 0; sb_y < sb_height; sb_y++) for (sb_x = 0; sb_x < sb_width; sb_x++) for (i = 0; i < 16; i++) { - x = 4*sb_x + hilbert_offset[i][0]; - y = 4*sb_y + hilbert_offset[i][1]; + x = 4 * sb_x + hilbert_offset[i][0]; + y = 4 * sb_y + hilbert_offset[i][1]; if (x < frag_width && y < frag_height) - s->superblock_fragments[j++] = s->fragment_start[plane] + y*frag_width + x; + s->superblock_fragments[j++] = s->fragment_start[plane] + + y * frag_width + x; else s->superblock_fragments[j++] = -1; } @@ -355,30 +357,31 @@ static void init_dequantizer(Vp3DecodeContext *s, int qpi) int dc_scale_factor = s->coded_dc_scale_factor[s->qps[qpi]]; int i, plane, inter, qri, bmi, bmj, qistart; - for(inter=0; inter<2; inter++){ - for(plane=0; plane<3; plane++){ - int sum=0; - for(qri=0; qri<s->qr_count[inter][plane]; qri++){ - sum+= s->qr_size[inter][plane][qri]; - if(s->qps[qpi] <= sum) + for (inter = 0; inter < 2; inter++) { + for (plane = 0; plane < 3; plane++) { + int sum = 0; + for (qri = 0; qri < s->qr_count[inter][plane]; qri++) { + sum += s->qr_size[inter][plane][qri]; + if (s->qps[qpi] <= sum) break; } - qistart= sum - s->qr_size[inter][plane][qri]; - bmi= s->qr_base[inter][plane][qri ]; - bmj= s->qr_base[inter][plane][qri+1]; - for(i=0; i<64; i++){ - int coeff= ( 2*(sum -s->qps[qpi])*s->base_matrix[bmi][i] - - 2*(qistart-s->qps[qpi])*s->base_matrix[bmj][i] - + s->qr_size[inter][plane][qri]) - / (2*s->qr_size[inter][plane][qri]); - - int qmin= 8<<(inter + !i); - int qscale= i ? ac_scale_factor : dc_scale_factor; + qistart = sum - s->qr_size[inter][plane][qri]; + bmi = s->qr_base[inter][plane][qri]; + bmj = s->qr_base[inter][plane][qri + 1]; + for (i = 0; i < 64; i++) { + int coeff = (2 * (sum - s->qps[qpi]) * s->base_matrix[bmi][i] - + 2 * (qistart - s->qps[qpi]) * s->base_matrix[bmj][i] + + s->qr_size[inter][plane][qri]) / + (2 * s->qr_size[inter][plane][qri]); + + int qmin = 8 << (inter + !i); + int qscale = i ? ac_scale_factor : dc_scale_factor; s->qmat[qpi][inter][plane][s->idct_permutation[i]] = av_clip((qscale * coeff) / 100 * 4, qmin, 4096); } - // all DC coefficients use the same quant so as not to interfere with DC prediction + /* all DC coefficients use the same quant so as not to interfere + * with DC prediction */ s->qmat[qpi][inter][plane][0] = s->qmat[0][inter][plane][0]; } } @@ -392,7 +395,7 @@ static void init_dequantizer(Vp3DecodeContext *s, int qpi) */ static void init_loop_filter(Vp3DecodeContext *s) { - int *bounding_values= s->bounding_values_array+127; + int *bounding_values = s->bounding_values_array + 127; int filter_limit; int x; int value; @@ -421,7 +424,9 @@ static void init_loop_filter(Vp3DecodeContext *s) */ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb) { - int superblock_starts[3] = { 0, s->u_superblock_start, s->v_superblock_start }; + int superblock_starts[3] = { + 0, s->u_superblock_start, s->v_superblock_start + }; int bit = 0; int current_superblock = 0; int current_run = 0; @@ -433,11 +438,9 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb) if (s->keyframe) { memset(s->superblock_coding, SB_FULLY_CODED, s->superblock_count); - } else { - /* unpack the list of partially-coded superblocks */ - bit = get_bits1(gb) ^ 1; + bit = get_bits1(gb) ^ 1; current_run = 0; while (current_superblock < s->superblock_count && get_bits_left(gb) > 0) { @@ -446,13 +449,14 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb) else bit ^= 1; - current_run = get_vlc2(gb, - s->superblock_run_length_vlc.table, 6, 2) + 1; - if (current_run == 34) - current_run += get_bits(gb, 12); + current_run = get_vlc2(gb, s->superblock_run_length_vlc.table, + 6, 2) + 1; + if (current_run == 34) + current_run += get_bits(gb, 12); if (current_superblock + current_run > s->superblock_count) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid partially coded superblock run length\n"); + av_log(s->avctx, AV_LOG_ERROR, + "Invalid partially coded superblock run length\n"); return -1; } @@ -469,33 +473,33 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb) int superblocks_decoded = 0; current_superblock = 0; - bit = get_bits1(gb) ^ 1; - current_run = 0; - - while (superblocks_decoded < s->superblock_count - num_partial_superblocks - && get_bits_left(gb) > 0) { + bit = get_bits1(gb) ^ 1; + current_run = 0; + while (superblocks_decoded < s->superblock_count - num_partial_superblocks && + get_bits_left(gb) > 0) { if (s->theora && current_run == MAXIMUM_LONG_BIT_RUN) bit = get_bits1(gb); else bit ^= 1; - current_run = get_vlc2(gb, - s->superblock_run_length_vlc.table, 6, 2) + 1; - if (current_run == 34) - current_run += get_bits(gb, 12); + current_run = get_vlc2(gb, s->superblock_run_length_vlc.table, + 6, 2) + 1; + if (current_run == 34) + current_run += get_bits(gb, 12); for (j = 0; j < current_run; current_superblock++) { if (current_superblock >= s->superblock_count) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid fully coded superblock run length\n"); + av_log(s->avctx, AV_LOG_ERROR, + "Invalid fully coded superblock run length\n"); return -1; } - /* skip any superblocks already marked as partially coded */ - if (s->superblock_coding[current_superblock] == SB_NOT_CODED) { - s->superblock_coding[current_superblock] = 2*bit; - j++; - } + /* skip any superblocks already marked as partially coded */ + if (s->superblock_coding[current_superblock] == SB_NOT_CODED) { + s->superblock_coding[current_superblock] = 2 * bit; + j++; + } } superblocks_decoded += current_run; } @@ -504,9 +508,8 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb) /* if there were partial blocks, initialize bitstream for * unpacking fragment codings */ if (num_partial_superblocks) { - current_run = 0; - bit = get_bits1(gb); + bit = get_bits1(gb); /* toggle the bit because as soon as the first run length is * fetched the bit will be toggled again */ bit ^= 1; @@ -520,30 +523,27 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb) for (plane = 0; plane < 3; plane++) { int sb_start = superblock_starts[plane]; - int sb_end = sb_start + (plane ? s->c_superblock_count : s->y_superblock_count); + int sb_end = sb_start + (plane ? s->c_superblock_count + : s->y_superblock_count); int num_coded_frags = 0; - for (i = sb_start; i < sb_end && get_bits_left(gb) > 0; i++) { - - /* iterate through all 16 fragments in a superblock */ - for (j = 0; j < 16; j++) { - - /* if the fragment is in bounds, check its coding status */ - current_fragment = s->superblock_fragments[i * 16 + j]; - if (current_fragment != -1) { - int coded = s->superblock_coding[i]; - - if (s->superblock_coding[i] == SB_PARTIALLY_CODED) { - - /* fragment may or may not be coded; this is the case - * that cares about the fragment coding runs */ - if (current_run-- == 0) { - bit ^= 1; - current_run = get_vlc2(gb, - s->fragment_run_length_vlc.table, 5, 2); + for (i = sb_start; i < sb_end && get_bits_left(gb) > 0; i++) { + /* iterate through all 16 fragments in a superblock */ + for (j = 0; j < 16; j++) { + /* if the fragment is in bounds, check its coding status */ + current_fragment = s->superblock_fragments[i * 16 + j]; + if (current_fragment != -1) { + int coded = s->superblock_coding[i]; + + if (s->superblock_coding[i] == SB_PARTIALLY_CODED) { + /* fragment may or may not be coded; this is the case + * that cares about the fragment coding runs */ + if (current_run-- == 0) { + bit ^= 1; + current_run = get_vlc2(gb, s->fragment_run_length_vlc.table, 5, 2); + } + coded = bit; } - coded = bit; - } if (coded) { /* default mode; actual mode will be decoded in @@ -557,14 +557,15 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb) s->all_fragments[current_fragment].coding_method = MODE_COPY; } + } } } - } s->total_num_coded_frags += num_coded_frags; for (i = 0; i < 64; i++) s->num_coded_frags[plane][i] = num_coded_frags; if (plane < 2) - s->coded_fragment_list[plane+1] = s->coded_fragment_list[plane] + num_coded_frags; + s->coded_fragment_list[plane + 1] = s->coded_fragment_list[plane] + + num_coded_frags; } return 0; } @@ -587,9 +588,7 @@ static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb) if (s->keyframe) { for (i = 0; i < s->fragment_count; i++) s->all_fragments[i].coding_method = MODE_INTRA; - } else { - /* fetch the mode coding scheme for this frame */ scheme = get_bits(gb, 3); @@ -601,7 +600,7 @@ static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb) custom_mode_alphabet[get_bits(gb, 3)] = i; alphabet = custom_mode_alphabet; } else - alphabet = ModeAlphabet[scheme-1]; + alphabet = ModeAlphabet[scheme - 1]; /* iterate through all of the macroblocks that contain 1 or more * coded fragments */ @@ -610,65 +609,70 @@ static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb) if (get_bits_left(gb) <= 0) return -1; - for (j = 0; j < 4; j++) { - int mb_x = 2*sb_x + (j>>1); - int mb_y = 2*sb_y + (((j>>1)+j)&1); - current_macroblock = mb_y * s->macroblock_width + mb_x; + for (j = 0; j < 4; j++) { + int mb_x = 2 * sb_x + (j >> 1); + int mb_y = 2 * sb_y + (((j >> 1) + j) & 1); + current_macroblock = mb_y * s->macroblock_width + mb_x; - if (mb_x >= s->macroblock_width || mb_y >= s->macroblock_height) - continue; + if (mb_x >= s->macroblock_width || + mb_y >= s->macroblock_height) + continue; -#define BLOCK_X (2*mb_x + (k&1)) -#define BLOCK_Y (2*mb_y + (k>>1)) - /* coding modes are only stored if the macroblock has at least one - * luma block coded, otherwise it must be INTER_NO_MV */ - for (k = 0; k < 4; k++) { - current_fragment = BLOCK_Y*s->fragment_width[0] + BLOCK_X; - if (s->all_fragments[current_fragment].coding_method != MODE_COPY) - break; - } - if (k == 4) { - s->macroblock_coding[current_macroblock] = MODE_INTER_NO_MV; - continue; - } +#define BLOCK_X (2 * mb_x + (k & 1)) +#define BLOCK_Y (2 * mb_y + (k >> 1)) + /* coding modes are only stored if the macroblock has + * at least one luma block coded, otherwise it must be + * INTER_NO_MV */ + for (k = 0; k < 4; k++) { + current_fragment = BLOCK_Y * + s->fragment_width[0] + BLOCK_X; + if (s->all_fragments[current_fragment].coding_method != MODE_COPY) + break; + } + if (k == 4) { + s->macroblock_coding[current_macroblock] = MODE_INTER_NO_MV; + continue; + } - /* mode 7 means get 3 bits for each coding mode */ - if (scheme == 7) - coding_mode = get_bits(gb, 3); - else - coding_mode = alphabet - [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)]; + /* mode 7 means get 3 bits for each coding mode */ + if (scheme == 7) + coding_mode = get_bits(gb, 3); + else + coding_mode = alphabet[get_vlc2(gb, s->mode_code_vlc.table, 3, 3)]; - s->macroblock_coding[current_macroblock] = coding_mode; - for (k = 0; k < 4; k++) { - frag = s->all_fragments + BLOCK_Y*s->fragment_width[0] + BLOCK_X; - if (frag->coding_method != MODE_COPY) - frag->coding_method = coding_mode; - } + s->macroblock_coding[current_macroblock] = coding_mode; + for (k = 0; k < 4; k++) { + frag = s->all_fragments + BLOCK_Y * s->fragment_width[0] + BLOCK_X; + if (frag->coding_method != MODE_COPY) + frag->coding_method = coding_mode; + } -#define SET_CHROMA_MODES \ - if (frag[s->fragment_start[1]].coding_method != MODE_COPY) \ - frag[s->fragment_start[1]].coding_method = coding_mode;\ - if (frag[s->fragment_start[2]].coding_method != MODE_COPY) \ +#define SET_CHROMA_MODES \ + if (frag[s->fragment_start[1]].coding_method != MODE_COPY) \ + frag[s->fragment_start[1]].coding_method = coding_mode; \ + if (frag[s->fragment_start[2]].coding_method != MODE_COPY) \ frag[s->fragment_start[2]].coding_method = coding_mode; - if (s->chroma_y_shift) { - frag = s->all_fragments + mb_y*s->fragment_width[1] + mb_x; - SET_CHROMA_MODES - } else if (s->chroma_x_shift) { - frag = s->all_fragments + 2*mb_y*s->fragment_width[1] + mb_x; - for (k = 0; k < 2; k++) { - SET_CHROMA_MODES - frag += s->fragment_width[1]; - } - } else { - for (k = 0; k < 4; k++) { - frag = s->all_fragments + BLOCK_Y*s->fragment_width[1] + BLOCK_X; + if (s->chroma_y_shift) { + frag = s->all_fragments + mb_y * + s->fragment_width[1] + mb_x; SET_CHROMA_MODES + } else if (s->chroma_x_shift) { + frag = s->all_fragments + + 2 * mb_y * s->fragment_width[1] + mb_x; + for (k = 0; k < 2; k++) { + SET_CHROMA_MODES + frag += s->fragment_width[1]; + } + } else { + for (k = 0; k < 4; k++) { + frag = s->all_fragments + + BLOCK_Y * s->fragment_width[1] + BLOCK_X; + SET_CHROMA_MODES + } } } } - } } } @@ -706,151 +710,152 @@ static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb) if (get_bits_left(gb) <= 0) return -1; - for (j = 0; j < 4; j++) { - int mb_x = 2*sb_x + (j>>1); - int mb_y = 2*sb_y + (((j>>1)+j)&1); - current_macroblock = mb_y * s->macroblock_width + mb_x; + for (j = 0; j < 4; j++) { + int mb_x = 2 * sb_x + (j >> 1); + int mb_y = 2 * sb_y + (((j >> 1) + j) & 1); + current_macroblock = mb_y * s->macroblock_width + mb_x; - if (mb_x >= s->macroblock_width || mb_y >= s->macroblock_height || - (s->macroblock_coding[current_macroblock] == MODE_COPY)) - continue; + if (mb_x >= s->macroblock_width || + mb_y >= s->macroblock_height || + s->macroblock_coding[current_macroblock] == MODE_COPY) + continue; - switch (s->macroblock_coding[current_macroblock]) { + switch (s->macroblock_coding[current_macroblock]) { + case MODE_INTER_PLUS_MV: + case MODE_GOLDEN_MV: + /* all 6 fragments use the same motion vector */ + if (coding_mode == 0) { + motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; + motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; + } else { + motion_x[0] = fixed_motion_vector_table[get_bits(gb, 6)]; + motion_y[0] = fixed_motion_vector_table[get_bits(gb, 6)]; + } - case MODE_INTER_PLUS_MV: - case MODE_GOLDEN_MV: - /* all 6 fragments use the same motion vector */ - if (coding_mode == 0) { - motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; - motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; - } else { - motion_x[0] = fixed_motion_vector_table[get_bits(gb, 6)]; - motion_y[0] = fixed_motion_vector_table[get_bits(gb, 6)]; - } + /* vector maintenance, only on MODE_INTER_PLUS_MV */ + if (s->macroblock_coding[current_macroblock] == MODE_INTER_PLUS_MV) { + prior_last_motion_x = last_motion_x; + prior_last_motion_y = last_motion_y; + last_motion_x = motion_x[0]; + last_motion_y = motion_y[0]; + } + break; - /* vector maintenance, only on MODE_INTER_PLUS_MV */ - if (s->macroblock_coding[current_macroblock] == - MODE_INTER_PLUS_MV) { + case MODE_INTER_FOURMV: + /* vector maintenance */ prior_last_motion_x = last_motion_x; prior_last_motion_y = last_motion_y; - last_motion_x = motion_x[0]; - last_motion_y = motion_y[0]; - } - break; - - case MODE_INTER_FOURMV: - /* vector maintenance */ - prior_last_motion_x = last_motion_x; - prior_last_motion_y = last_motion_y; - /* fetch 4 vectors from the bitstream, one for each - * Y fragment, then average for the C fragment vectors */ - for (k = 0; k < 4; k++) { - current_fragment = BLOCK_Y*s->fragment_width[0] + BLOCK_X; - if (s->all_fragments[current_fragment].coding_method != MODE_COPY) { - if (coding_mode == 0) { - motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; - motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; + /* fetch 4 vectors from the bitstream, one for each + * Y fragment, then average for the C fragment vectors */ + for (k = 0; k < 4; k++) { + current_fragment = BLOCK_Y * s->fragment_width[0] + BLOCK_X; + if (s->all_fragments[current_fragment].coding_method != MODE_COPY) { + if (coding_mode == 0) { + motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; + motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; + } else { + motion_x[k] = fixed_motion_vector_table[get_bits(gb, 6)]; + motion_y[k] = fixed_motion_vector_table[get_bits(gb, 6)]; + } + last_motion_x = motion_x[k]; + last_motion_y = motion_y[k]; } else { - motion_x[k] = fixed_motion_vector_table[get_bits(gb, 6)]; - motion_y[k] = fixed_motion_vector_table[get_bits(gb, 6)]; + motion_x[k] = 0; + motion_y[k] = 0; } - last_motion_x = motion_x[k]; - last_motion_y = motion_y[k]; - } else { - motion_x[k] = 0; - motion_y[k] = 0; } - } - break; - - case MODE_INTER_LAST_MV: - /* all 6 fragments use the last motion vector */ - motion_x[0] = last_motion_x; - motion_y[0] = last_motion_y; - - /* no vector maintenance (last vector remains the - * last vector) */ - break; - - case MODE_INTER_PRIOR_LAST: - /* all 6 fragments use the motion vector prior to the - * last motion vector */ - motion_x[0] = prior_last_motion_x; - motion_y[0] = prior_last_motion_y; - - /* vector maintenance */ - prior_last_motion_x = last_motion_x; - prior_last_motion_y = last_motion_y; - last_motion_x = motion_x[0]; - last_motion_y = motion_y[0]; - break; - - default: - /* covers intra, inter without MV, golden without MV */ - motion_x[0] = 0; - motion_y[0] = 0; - - /* no vector maintenance */ - break; - } + break; - /* assign the motion vectors to the correct fragments */ - for (k = 0; k < 4; k++) { - current_fragment = - BLOCK_Y*s->fragment_width[0] + BLOCK_X; - if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) { - s->motion_val[0][current_fragment][0] = motion_x[k]; - s->motion_val[0][current_fragment][1] = motion_y[k]; - } else { - s->motion_val[0][current_fragment][0] = motion_x[0]; - s->motion_val[0][current_fragment][1] = motion_y[0]; - } - } + case MODE_INTER_LAST_MV: + /* all 6 fragments use the last motion vector */ + motion_x[0] = last_motion_x; + motion_y[0] = last_motion_y; - if (s->chroma_y_shift) { - if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) { - motion_x[0] = RSHIFT(motion_x[0] + motion_x[1] + motion_x[2] + motion_x[3], 2); - motion_y[0] = RSHIFT(motion_y[0] + motion_y[1] + motion_y[2] + motion_y[3], 2); - } - motion_x[0] = (motion_x[0]>>1) | (motion_x[0]&1); - motion_y[0] = (motion_y[0]>>1) | (motion_y[0]&1); - frag = mb_y*s->fragment_width[1] + mb_x; - s->motion_val[1][frag][0] = motion_x[0]; - s->motion_val[1][frag][1] = motion_y[0]; - } else if (s->chroma_x_shift) { - if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) { - motion_x[0] = RSHIFT(motion_x[0] + motion_x[1], 1); - motion_y[0] = RSHIFT(motion_y[0] + motion_y[1], 1); - motion_x[1] = RSHIFT(motion_x[2] + motion_x[3], 1); - motion_y[1] = RSHIFT(motion_y[2] + motion_y[3], 1); - } else { - motion_x[1] = motion_x[0]; - motion_y[1] = motion_y[0]; - } - motion_x[0] = (motion_x[0]>>1) | (motion_x[0]&1); - motion_x[1] = (motion_x[1]>>1) | (motion_x[1]&1); - - frag = 2*mb_y*s->fragment_width[1] + mb_x; - for (k = 0; k < 2; k++) { - s->motion_val[1][frag][0] = motion_x[k]; - s->motion_val[1][frag][1] = motion_y[k]; - frag += s->fragment_width[1]; + /* no vector maintenance (last vector remains the + * last vector) */ + break; + + case MODE_INTER_PRIOR_LAST: + /* all 6 fragments use the motion vector prior to the + * last motion vector */ + motion_x[0] = prior_last_motion_x; + motion_y[0] = prior_last_motion_y; + + /* vector maintenance */ + prior_last_motion_x = last_motion_x; + prior_last_motion_y = last_motion_y; + last_motion_x = motion_x[0]; + last_motion_y = motion_y[0]; + break; + + default: + /* covers intra, inter without MV, golden without MV */ + motion_x[0] = 0; + motion_y[0] = 0; + + /* no vector maintenance */ + break; } - } else { + + /* assign the motion vectors to the correct fragments */ for (k = 0; k < 4; k++) { - frag = BLOCK_Y*s->fragment_width[1] + BLOCK_X; + current_fragment = + BLOCK_Y * s->fragment_width[0] + BLOCK_X; + if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) { + s->motion_val[0][current_fragment][0] = motion_x[k]; + s->motion_val[0][current_fragment][1] = motion_y[k]; + } else { + s->motion_val[0][current_fragment][0] = motion_x[0]; + s->motion_val[0][current_fragment][1] = motion_y[0]; + } + } + + if (s->chroma_y_shift) { if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) { + motion_x[0] = RSHIFT(motion_x[0] + motion_x[1] + + motion_x[2] + motion_x[3], 2); + motion_y[0] = RSHIFT(motion_y[0] + motion_y[1] + + motion_y[2] + motion_y[3], 2); + } + motion_x[0] = (motion_x[0] >> 1) | (motion_x[0] & 1); + motion_y[0] = (motion_y[0] >> 1) | (motion_y[0] & 1); + frag = mb_y * s->fragment_width[1] + mb_x; + s->motion_val[1][frag][0] = motion_x[0]; + s->motion_val[1][frag][1] = motion_y[0]; + } else if (s->chroma_x_shift) { + if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) { + motion_x[0] = RSHIFT(motion_x[0] + motion_x[1], 1); + motion_y[0] = RSHIFT(motion_y[0] + motion_y[1], 1); + motion_x[1] = RSHIFT(motion_x[2] + motion_x[3], 1); + motion_y[1] = RSHIFT(motion_y[2] + motion_y[3], 1); + } else { + motion_x[1] = motion_x[0]; + motion_y[1] = motion_y[0]; + } + motion_x[0] = (motion_x[0] >> 1) | (motion_x[0] & 1); + motion_x[1] = (motion_x[1] >> 1) | (motion_x[1] & 1); + + frag = 2 * mb_y * s->fragment_width[1] + mb_x; + for (k = 0; k < 2; k++) { s->motion_val[1][frag][0] = motion_x[k]; s->motion_val[1][frag][1] = motion_y[k]; - } else { - s->motion_val[1][frag][0] = motion_x[0]; - s->motion_val[1][frag][1] = motion_y[0]; + frag += s->fragment_width[1]; + } + } else { + for (k = 0; k < 4; k++) { + frag = BLOCK_Y * s->fragment_width[1] + BLOCK_X; + if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) { + s->motion_val[1][frag][0] = motion_x[k]; + s->motion_val[1][frag][1] = motion_y[k]; + } else { + s->motion_val[1][frag][0] = motion_x[0]; + s->motion_val[1][frag][1] = motion_y[0]; + } } } } } - } } return 0; @@ -861,10 +866,10 @@ static int unpack_block_qpis(Vp3DecodeContext *s, GetBitContext *gb) int qpi, i, j, bit, run_length, blocks_decoded, num_blocks_at_qpi; int num_blocks = s->total_num_coded_frags; - for (qpi = 0; qpi < s->nqps-1 && num_blocks > 0; qpi++) { + for (qpi = 0; qpi < s->nqps - 1 && num_blocks > 0; qpi++) { i = blocks_decoded = num_blocks_at_qpi = 0; - bit = get_bits1(gb) ^ 1; + bit = get_bits1(gb) ^ 1; run_length = 0; do { @@ -911,34 +916,37 @@ static int unpack_block_qpis(Vp3DecodeContext *s, GetBitContext *gb) * be passed into the next call to this same function. */ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb, - VLC *table, int coeff_index, - int plane, - int eob_run) + VLC *table, int coeff_index, + int plane, + int eob_run) { int i, j = 0; int token; - int zero_run = 0; + int zero_run = 0; int16_t coeff = 0; int bits_to_get; int blocks_ended; int coeff_i = 0; - int num_coeffs = s->num_coded_frags[plane][coeff_index]; + int num_coeffs = s->num_coded_frags[plane][coeff_index]; int16_t *dct_tokens = s->dct_tokens[plane][coeff_index]; /* local references to structure members to avoid repeated deferences */ - int *coded_fragment_list = s->coded_fragment_list[plane]; + int *coded_fragment_list = s->coded_fragment_list[plane]; Vp3Fragment *all_fragments = s->all_fragments; - VLC_TYPE (*vlc_table)[2] = table->table; + VLC_TYPE(*vlc_table)[2] = table->table; if (num_coeffs < 0) - av_log(s->avctx, AV_LOG_ERROR, "Invalid number of coefficents at level %d\n", coeff_index); + av_log(s->avctx, AV_LOG_ERROR, + "Invalid number of coefficents at level %d\n", coeff_index); if (eob_run > num_coeffs) { - coeff_i = blocks_ended = num_coeffs; - eob_run -= num_coeffs; + coeff_i = + blocks_ended = num_coeffs; + eob_run -= num_coeffs; } else { - coeff_i = blocks_ended = eob_run; - eob_run = 0; + coeff_i = + blocks_ended = eob_run; + eob_run = 0; } // insert fake EOB token to cover the split between planes or zzi @@ -946,66 +954,66 @@ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb, dct_tokens[j++] = blocks_ended << 2; while (coeff_i < num_coeffs && get_bits_left(gb) > 0) { - /* decode a VLC into a token */ - token = get_vlc2(gb, vlc_table, 11, 3); - /* use the token to get a zero run, a coefficient, and an eob run */ - if ((unsigned) token <= 6U) { - eob_run = eob_run_base[token]; - if (eob_run_get_bits[token]) - eob_run += get_bits(gb, eob_run_get_bits[token]); - - // record only the number of blocks ended in this plane, - // any spill will be recorded in the next plane. - if (eob_run > num_coeffs - coeff_i) { - dct_tokens[j++] = TOKEN_EOB(num_coeffs - coeff_i); - blocks_ended += num_coeffs - coeff_i; - eob_run -= num_coeffs - coeff_i; - coeff_i = num_coeffs; - } else { - dct_tokens[j++] = TOKEN_EOB(eob_run); - blocks_ended += eob_run; - coeff_i += eob_run; - eob_run = 0; - } - } else if (token >= 0) { - bits_to_get = coeff_get_bits[token]; - if (bits_to_get) - bits_to_get = get_bits(gb, bits_to_get); - coeff = coeff_tables[token][bits_to_get]; - - zero_run = zero_run_base[token]; - if (zero_run_get_bits[token]) - zero_run += get_bits(gb, zero_run_get_bits[token]); - - if (zero_run) { - dct_tokens[j++] = TOKEN_ZERO_RUN(coeff, zero_run); - } else { - // Save DC into the fragment structure. DC prediction is - // done in raster order, so the actual DC can't be in with - // other tokens. We still need the token in dct_tokens[] - // however, or else the structure collapses on itself. - if (!coeff_index) - all_fragments[coded_fragment_list[coeff_i]].dc = coeff; - - dct_tokens[j++] = TOKEN_COEFF(coeff); - } - - if (coeff_index + zero_run > 64) { - av_log(s->avctx, AV_LOG_DEBUG, "Invalid zero run of %d with" - " %d coeffs left\n", zero_run, 64-coeff_index); - zero_run = 64 - coeff_index; - } - - // zero runs code multiple coefficients, - // so don't try to decode coeffs for those higher levels - for (i = coeff_index+1; i <= coeff_index+zero_run; i++) - s->num_coded_frags[plane][i]--; - coeff_i++; + /* decode a VLC into a token */ + token = get_vlc2(gb, vlc_table, 11, 3); + /* use the token to get a zero run, a coefficient, and an eob run */ + if ((unsigned) token <= 6U) { + eob_run = eob_run_base[token]; + if (eob_run_get_bits[token]) + eob_run += get_bits(gb, eob_run_get_bits[token]); + + // record only the number of blocks ended in this plane, + // any spill will be recorded in the next plane. + if (eob_run > num_coeffs - coeff_i) { + dct_tokens[j++] = TOKEN_EOB(num_coeffs - coeff_i); + blocks_ended += num_coeffs - coeff_i; + eob_run -= num_coeffs - coeff_i; + coeff_i = num_coeffs; } else { - av_log(s->avctx, AV_LOG_ERROR, - "Invalid token %d\n", token); - return -1; + dct_tokens[j++] = TOKEN_EOB(eob_run); + blocks_ended += eob_run; + coeff_i += eob_run; + eob_run = 0; } + } else if (token >= 0) { + bits_to_get = coeff_get_bits[token]; + if (bits_to_get) + bits_to_get = get_bits(gb, bits_to_get); + coeff = coeff_tables[token][bits_to_get]; + + zero_run = zero_run_base[token]; + if (zero_run_get_bits[token]) + zero_run += get_bits(gb, zero_run_get_bits[token]); + + if (zero_run) { + dct_tokens[j++] = TOKEN_ZERO_RUN(coeff, zero_run); + } else { + // Save DC into the fragment structure. DC prediction is + // done in raster order, so the actual DC can't be in with + // other tokens. We still need the token in dct_tokens[] + // however, or else the structure collapses on itself. + if (!coeff_index) + all_fragments[coded_fragment_list[coeff_i]].dc = coeff; + + dct_tokens[j++] = TOKEN_COEFF(coeff); + } + + if (coeff_index + zero_run > 64) { + av_log(s->avctx, AV_LOG_DEBUG, + "Invalid zero run of %d with %d coeffs left\n", + zero_run, 64 - coeff_index); + zero_run = 64 - coeff_index; + } + + // zero runs code multiple coefficients, + // so don't try to decode coeffs for those higher levels + for (i = coeff_index + 1; i <= coeff_index + zero_run; i++) + s->num_coded_frags[plane][i]--; + coeff_i++; + } else { + av_log(s->avctx, AV_LOG_ERROR, "Invalid token %d\n", token); + return -1; + } } if (blocks_ended > s->num_coded_frags[plane][coeff_index]) @@ -1014,14 +1022,14 @@ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb, // decrement the number of blocks that have higher coeffecients for each // EOB run at this level if (blocks_ended) - for (i = coeff_index+1; i < 64; i++) + for (i = coeff_index + 1; i < 64; i++) s->num_coded_frags[plane][i] -= blocks_ended; // setup the next buffer if (plane < 2) - s->dct_tokens[plane+1][coeff_index] = dct_tokens + j; + s->dct_tokens[plane + 1][coeff_index] = dct_tokens + j; else if (coeff_index < 63) - s->dct_tokens[0][coeff_index+1] = dct_tokens + j; + s->dct_tokens[0][coeff_index + 1] = dct_tokens + j; return eob_run; } @@ -1053,7 +1061,7 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) /* unpack the Y plane DC coefficients */ residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_y_table], 0, - 0, residual_eob_run); + 0, residual_eob_run); if (residual_eob_run < 0) return residual_eob_run; @@ -1062,21 +1070,20 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) /* unpack the C plane DC coefficients */ residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0, - 1, residual_eob_run); + 1, residual_eob_run); if (residual_eob_run < 0) return residual_eob_run; residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0, - 2, residual_eob_run); + 2, residual_eob_run); if (residual_eob_run < 0) return residual_eob_run; /* reverse prediction of the C-plane DC coefficients */ - if (!(s->avctx->flags & CODEC_FLAG_GRAY)) - { + if (!(s->avctx->flags & CODEC_FLAG_GRAY)) { reverse_dc_prediction(s, s->fragment_start[1], - s->fragment_width[1], s->fragment_height[1]); + s->fragment_width[1], s->fragment_height[1]); reverse_dc_prediction(s, s->fragment_start[2], - s->fragment_width[1], s->fragment_height[1]); + s->fragment_width[1], s->fragment_height[1]); } /* fetch the AC table indexes */ @@ -1103,19 +1110,19 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) /* decode all AC coefficents */ for (i = 1; i <= 63; i++) { - residual_eob_run = unpack_vlcs(s, gb, y_tables[i], i, - 0, residual_eob_run); - if (residual_eob_run < 0) - return residual_eob_run; - - residual_eob_run = unpack_vlcs(s, gb, c_tables[i], i, - 1, residual_eob_run); - if (residual_eob_run < 0) - return residual_eob_run; - residual_eob_run = unpack_vlcs(s, gb, c_tables[i], i, - 2, residual_eob_run); - if (residual_eob_run < 0) - return residual_eob_run; + residual_eob_run = unpack_vlcs(s, gb, y_tables[i], i, + 0, residual_eob_run); + if (residual_eob_run < 0) + return residual_eob_run; + + residual_eob_run = unpack_vlcs(s, gb, c_tables[i], i, + 1, residual_eob_run); + if (residual_eob_run < 0) + return residual_eob_run; + residual_eob_run = unpack_vlcs(s, gb, c_tables[i], i, + 2, residual_eob_run); + if (residual_eob_run < 0) + return residual_eob_run; } return 0; @@ -1126,8 +1133,8 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) * the frame. Much of this function is adapted directly from the original * VP3 source code. */ -#define COMPATIBLE_FRAME(x) \ - (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type) +#define COMPATIBLE_FRAME(x) \ + (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type) #define DC_COEFF(u) s->all_fragments[u].dc static void reverse_dc_prediction(Vp3DecodeContext *s, @@ -1135,7 +1142,6 @@ static void reverse_dc_prediction(Vp3DecodeContext *s, int fragment_width, int fragment_height) { - #define PUL 8 #define PU 4 #define PUR 2 @@ -1160,22 +1166,22 @@ static void reverse_dc_prediction(Vp3DecodeContext *s, * 3: left multiplier */ static const int predictor_transform[16][4] = { - { 0, 0, 0, 0}, - { 0, 0, 0,128}, // PL - { 0, 0,128, 0}, // PUR - { 0, 0, 53, 75}, // PUR|PL - { 0,128, 0, 0}, // PU - { 0, 64, 0, 64}, // PU|PL - { 0,128, 0, 0}, // PU|PUR - { 0, 0, 53, 75}, // PU|PUR|PL - {128, 0, 0, 0}, // PUL - { 0, 0, 0,128}, // PUL|PL - { 64, 0, 64, 0}, // PUL|PUR - { 0, 0, 53, 75}, // PUL|PUR|PL - { 0,128, 0, 0}, // PUL|PU - {-104,116, 0,116}, // PUL|PU|PL - { 24, 80, 24, 0}, // PUL|PU|PUR - {-104,116, 0,116} // PUL|PU|PUR|PL + { 0, 0, 0, 0 }, + { 0, 0, 0, 128 }, // PL + { 0, 0, 128, 0 }, // PUR + { 0, 0, 53, 75 }, // PUR|PL + { 0, 128, 0, 0 }, // PU + { 0, 64, 0, 64 }, // PU |PL + { 0, 128, 0, 0 }, // PU |PUR + { 0, 0, 53, 75 }, // PU |PUR|PL + { 128, 0, 0, 0 }, // PUL + { 0, 0, 0, 128 }, // PUL|PL + { 64, 0, 64, 0 }, // PUL|PUR + { 0, 0, 53, 75 }, // PUL|PUR|PL + { 0, 128, 0, 0 }, // PUL|PU + { -104, 116, 0, 116 }, // PUL|PU |PL + { 24, 80, 24, 0 }, // PUL|PU |PUR + { -104, 116, 0, 116 } // PUL|PU |PUR|PL }; /* This table shows which types of blocks can use other blocks for @@ -1202,54 +1208,55 @@ static void reverse_dc_prediction(Vp3DecodeContext *s, int transform = 0; - vul = vu = vur = vl = 0; - last_dc[0] = last_dc[1] = last_dc[2] = 0; + vul = + vu = + vur = + vl = 0; + last_dc[0] = + last_dc[1] = + last_dc[2] = 0; /* for each fragment row... */ for (y = 0; y < fragment_height; y++) { - /* for each fragment in a row... */ for (x = 0; x < fragment_width; x++, i++) { /* reverse prediction if this block was coded */ if (s->all_fragments[i].coding_method != MODE_COPY) { - current_frame_type = compatible_frame[s->all_fragments[i].coding_method]; - transform= 0; - if(x){ - l= i-1; + transform = 0; + if (x) { + l = i - 1; vl = DC_COEFF(l); - if(COMPATIBLE_FRAME(l)) + if (COMPATIBLE_FRAME(l)) transform |= PL; } - if(y){ - u= i-fragment_width; + if (y) { + u = i - fragment_width; vu = DC_COEFF(u); - if(COMPATIBLE_FRAME(u)) + if (COMPATIBLE_FRAME(u)) transform |= PU; - if(x){ - ul= i-fragment_width-1; + if (x) { + ul = i - fragment_width - 1; vul = DC_COEFF(ul); - if(COMPATIBLE_FRAME(ul)) + if (COMPATIBLE_FRAME(ul)) transform |= PUL; } - if(x + 1 < fragment_width){ - ur= i-fragment_width+1; + if (x + 1 < fragment_width) { + ur = i - fragment_width + 1; vur = DC_COEFF(ur); - if(COMPATIBLE_FRAME(ur)) + if (COMPATIBLE_FRAME(ur)) transform |= PUR; } } if (transform == 0) { - /* if there were no fragments to predict from, use last * DC saved */ predicted_dc = last_dc[current_frame_type]; } else { - /* apply the appropriate predictor transform */ predicted_dc = (predictor_transform[transform][0] * vul) + @@ -1280,39 +1287,39 @@ static void reverse_dc_prediction(Vp3DecodeContext *s, } } -static void apply_loop_filter(Vp3DecodeContext *s, int plane, int ystart, int yend) +static void apply_loop_filter(Vp3DecodeContext *s, int plane, + int ystart, int yend) { int x, y; - int *bounding_values= s->bounding_values_array+127; + int *bounding_values = s->bounding_values_array + 127; int width = s->fragment_width[!!plane]; int height = s->fragment_height[!!plane]; - int fragment = s->fragment_start [plane] + ystart * width; + int fragment = s->fragment_start[plane] + ystart * width; ptrdiff_t stride = s->current_frame.f->linesize[plane]; - uint8_t *plane_data = s->current_frame.f->data [plane]; - if (!s->flipped_image) stride = -stride; - plane_data += s->data_offset[plane] + 8*ystart*stride; + uint8_t *plane_data = s->current_frame.f->data[plane]; + if (!s->flipped_image) + stride = -stride; + plane_data += s->data_offset[plane] + 8 * ystart * stride; for (y = ystart; y < yend; y++) { - for (x = 0; x < width; x++) { /* This code basically just deblocks on the edges of coded blocks. * However, it has to be much more complicated because of the * braindamaged deblock ordering used in VP3/Theora. Order matters * because some pixels get filtered twice. */ - if( s->all_fragments[fragment].coding_method != MODE_COPY ) - { + if (s->all_fragments[fragment].coding_method != MODE_COPY) { /* do not perform left edge filter for left columns frags */ if (x > 0) { s->vp3dsp.h_loop_filter( - plane_data + 8*x, + plane_data + 8 * x, stride, bounding_values); } /* do not perform top edge filter for top row fragments */ if (y > 0) { s->vp3dsp.v_loop_filter( - plane_data + 8*x, + plane_data + 8 * x, stride, bounding_values); } @@ -1322,7 +1329,7 @@ static void apply_loop_filter(Vp3DecodeContext *s, int plane, int ystart, int ye if ((x < width - 1) && (s->all_fragments[fragment + 1].coding_method == MODE_COPY)) { s->vp3dsp.h_loop_filter( - plane_data + 8*x + 8, + plane_data + 8 * x + 8, stride, bounding_values); } @@ -1332,14 +1339,14 @@ static void apply_loop_filter(Vp3DecodeContext *s, int plane, int ystart, int ye if ((y < height - 1) && (s->all_fragments[fragment + width].coding_method == MODE_COPY)) { s->vp3dsp.v_loop_filter( - plane_data + 8*x + 8*stride, + plane_data + 8 * x + 8 * stride, stride, bounding_values); } } fragment++; } - plane_data += 8*stride; + plane_data += 8 * stride; } } @@ -1358,7 +1365,7 @@ static inline int vp3_dequant(Vp3DecodeContext *s, Vp3Fragment *frag, int token = *s->dct_tokens[plane][i]; switch (token & 3) { case 0: // EOB - if (--token < 4) // 0-3 are token types, so the EOB run must now be 0 + if (--token < 4) // 0-3 are token types so the EOB run must now be 0 s->dct_tokens[plane][i]++; else *s->dct_tokens[plane][i] = token & ~3; @@ -1397,30 +1404,32 @@ static void vp3_draw_horiz_band(Vp3DecodeContext *s, int y) int h, cy, i; int offset[AV_NUM_DATA_POINTERS]; - if (HAVE_THREADS && s->avctx->active_thread_type&FF_THREAD_FRAME) { - int y_flipped = s->flipped_image ? s->avctx->height-y : y; + if (HAVE_THREADS && s->avctx->active_thread_type & FF_THREAD_FRAME) { + int y_flipped = s->flipped_image ? s->avctx->height - y : y; - // At the end of the frame, report INT_MAX instead of the height of the frame. - // This makes the other threads' ff_thread_await_progress() calls cheaper, because - // they don't have to clip their values. - ff_thread_report_progress(&s->current_frame, y_flipped==s->avctx->height ? INT_MAX : y_flipped-1, 0); + /* At the end of the frame, report INT_MAX instead of the height of + * the frame. This makes the other threads' ff_thread_await_progress() + * calls cheaper, because they don't have to clip their values. */ + ff_thread_report_progress(&s->current_frame, + y_flipped == s->avctx->height ? INT_MAX + : y_flipped - 1, + 0); } - if(s->avctx->draw_horiz_band==NULL) + if (s->avctx->draw_horiz_band == NULL) return; - h= y - s->last_slice_end; - s->last_slice_end= y; + h = y - s->last_slice_end; + s->last_slice_end = y; y -= h; - if (!s->flipped_image) { + if (!s->flipped_image) y = s->avctx->height - y - h; - } - cy = y >> s->chroma_y_shift; - offset[0] = s->current_frame.f->linesize[0]*y; - offset[1] = s->current_frame.f->linesize[1]*cy; - offset[2] = s->current_frame.f->linesize[2]*cy; + cy = y >> s->chroma_y_shift; + offset[0] = s->current_frame.f->linesize[0] * y; + offset[1] = s->current_frame.f->linesize[1] * cy; + offset[2] = s->current_frame.f->linesize[2] * cy; for (i = 3; i < AV_NUM_DATA_POINTERS; i++) offset[i] = 0; @@ -1432,11 +1441,12 @@ static void vp3_draw_horiz_band(Vp3DecodeContext *s, int y) * Wait for the reference frame of the current fragment. * The progress value is in luma pixel rows. */ -static void await_reference_row(Vp3DecodeContext *s, Vp3Fragment *fragment, int motion_y, int y) +static void await_reference_row(Vp3DecodeContext *s, Vp3Fragment *fragment, + int motion_y, int y) { ThreadFrame *ref_frame; int ref_row; - int border = motion_y&1; + int border = motion_y & 1; if (fragment->coding_method == MODE_USING_GOLDEN || fragment->coding_method == MODE_GOLDEN_MV) @@ -1444,7 +1454,7 @@ static void await_reference_row(Vp3DecodeContext *s, Vp3Fragment *fragment, int else ref_frame = &s->last_frame; - ref_row = y + (motion_y>>1); + ref_row = y + (motion_y >> 1); ref_row = FFMAX(FFABS(ref_row), ref_row + 8 + border); ff_thread_await_progress(ref_frame, ref_row, 0); @@ -1467,38 +1477,43 @@ static void render_slice(Vp3DecodeContext *s, int slice) return; for (plane = 0; plane < 3; plane++) { - uint8_t *output_plane = s->current_frame.f->data [plane] + s->data_offset[plane]; - uint8_t * last_plane = s-> last_frame.f->data [plane] + s->data_offset[plane]; - uint8_t *golden_plane = s-> golden_frame.f->data [plane] + s->data_offset[plane]; - ptrdiff_t stride = s->current_frame.f->linesize[plane]; - int plane_width = s->width >> (plane && s->chroma_x_shift); - int plane_height = s->height >> (plane && s->chroma_y_shift); - int8_t (*motion_val)[2] = s->motion_val[!!plane]; - - int sb_x, sb_y = slice << (!plane && s->chroma_y_shift); - int slice_height = sb_y + 1 + (!plane && s->chroma_y_shift); - int slice_width = plane ? s->c_superblock_width : s->y_superblock_width; - - int fragment_width = s->fragment_width[!!plane]; - int fragment_height = s->fragment_height[!!plane]; - int fragment_start = s->fragment_start[plane]; - int do_await = !plane && HAVE_THREADS && (s->avctx->active_thread_type&FF_THREAD_FRAME); - - if (!s->flipped_image) stride = -stride; + uint8_t *output_plane = s->current_frame.f->data[plane] + + s->data_offset[plane]; + uint8_t *last_plane = s->last_frame.f->data[plane] + + s->data_offset[plane]; + uint8_t *golden_plane = s->golden_frame.f->data[plane] + + s->data_offset[plane]; + ptrdiff_t stride = s->current_frame.f->linesize[plane]; + int plane_width = s->width >> (plane && s->chroma_x_shift); + int plane_height = s->height >> (plane && s->chroma_y_shift); + int8_t(*motion_val)[2] = s->motion_val[!!plane]; + + int sb_x, sb_y = slice << (!plane && s->chroma_y_shift); + int slice_height = sb_y + 1 + (!plane && s->chroma_y_shift); + int slice_width = plane ? s->c_superblock_width + : s->y_superblock_width; + + int fragment_width = s->fragment_width[!!plane]; + int fragment_height = s->fragment_height[!!plane]; + int fragment_start = s->fragment_start[plane]; + + int do_await = !plane && HAVE_THREADS && + (s->avctx->active_thread_type & FF_THREAD_FRAME); + + if (!s->flipped_image) + stride = -stride; if (CONFIG_GRAY && plane && (s->avctx->flags & CODEC_FLAG_GRAY)) continue; /* for each superblock row in the slice (both of them)... */ for (; sb_y < slice_height; sb_y++) { - /* for each superblock in a row... */ for (sb_x = 0; sb_x < slice_width; sb_x++) { - /* for each block in a superblock... */ for (j = 0; j < 16; j++) { - x = 4*sb_x + hilbert_offset[j][0]; - y = 4*sb_y + hilbert_offset[j][1]; - fragment = y*fragment_width + x; + x = 4 * sb_x + hilbert_offset[j][0]; + y = 4 * sb_y + hilbert_offset[j][1]; + fragment = y * fragment_width + x; i = fragment_start + fragment; @@ -1506,125 +1521,132 @@ static void render_slice(Vp3DecodeContext *s, int slice) if (x >= fragment_width || y >= fragment_height) continue; - first_pixel = 8*y*stride + 8*x; - - if (do_await && s->all_fragments[i].coding_method != MODE_INTRA) - await_reference_row(s, &s->all_fragments[i], motion_val[fragment][1], (16*y) >> s->chroma_y_shift); - - /* transform if this block was coded */ - if (s->all_fragments[i].coding_method != MODE_COPY) { - if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) || - (s->all_fragments[i].coding_method == MODE_GOLDEN_MV)) - motion_source= golden_plane; - else - motion_source= last_plane; - - motion_source += first_pixel; - motion_halfpel_index = 0; - - /* sort out the motion vector if this fragment is coded - * using a motion vector method */ - if ((s->all_fragments[i].coding_method > MODE_INTRA) && - (s->all_fragments[i].coding_method != MODE_USING_GOLDEN)) { - int src_x, src_y; - motion_x = motion_val[fragment][0]; - motion_y = motion_val[fragment][1]; - - src_x= (motion_x>>1) + 8*x; - src_y= (motion_y>>1) + 8*y; - - motion_halfpel_index = motion_x & 0x01; - motion_source += (motion_x >> 1); - - motion_halfpel_index |= (motion_y & 0x01) << 1; - motion_source += ((motion_y >> 1) * stride); - - if(src_x<0 || src_y<0 || src_x + 9 >= plane_width || src_y + 9 >= plane_height){ - uint8_t *temp= s->edge_emu_buffer; - if(stride<0) temp -= 8*stride; - - s->vdsp.emulated_edge_mc(temp, motion_source, - stride, stride, - 9, 9, src_x, src_y, - plane_width, - plane_height); - motion_source= temp; + first_pixel = 8 * y * stride + 8 * x; + + if (do_await && + s->all_fragments[i].coding_method != MODE_INTRA) + await_reference_row(s, &s->all_fragments[i], + motion_val[fragment][1], + (16 * y) >> s->chroma_y_shift); + + /* transform if this block was coded */ + if (s->all_fragments[i].coding_method != MODE_COPY) { + if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) || + (s->all_fragments[i].coding_method == MODE_GOLDEN_MV)) + motion_source = golden_plane; + else + motion_source = last_plane; + + motion_source += first_pixel; + motion_halfpel_index = 0; + + /* sort out the motion vector if this fragment is coded + * using a motion vector method */ + if ((s->all_fragments[i].coding_method > MODE_INTRA) && + (s->all_fragments[i].coding_method != MODE_USING_GOLDEN)) { + int src_x, src_y; + motion_x = motion_val[fragment][0]; + motion_y = motion_val[fragment][1]; + + src_x = (motion_x >> 1) + 8 * x; + src_y = (motion_y >> 1) + 8 * y; + + motion_halfpel_index = motion_x & 0x01; + motion_source += (motion_x >> 1); + + motion_halfpel_index |= (motion_y & 0x01) << 1; + motion_source += ((motion_y >> 1) * stride); + + if (src_x < 0 || src_y < 0 || + src_x + 9 >= plane_width || + src_y + 9 >= plane_height) { + uint8_t *temp = s->edge_emu_buffer; + if (stride < 0) + temp -= 8 * stride; + + s->vdsp.emulated_edge_mc(temp, motion_source, + stride, stride, + 9, 9, src_x, src_y, + plane_width, + plane_height); + motion_source = temp; + } } - } - - /* first, take care of copying a block from either the - * previous or the golden frame */ - if (s->all_fragments[i].coding_method != MODE_INTRA) { - /* Note, it is possible to implement all MC cases with - put_no_rnd_pixels_l2 which would look more like the - VP3 source but this would be slower as - put_no_rnd_pixels_tab is better optimzed */ - if(motion_halfpel_index != 3){ - s->hdsp.put_no_rnd_pixels_tab[1][motion_halfpel_index]( - output_plane + first_pixel, - motion_source, stride, 8); - }else{ - int d= (motion_x ^ motion_y)>>31; // d is 0 if motion_x and _y have the same sign, else -1 - s->vp3dsp.put_no_rnd_pixels_l2( - output_plane + first_pixel, - motion_source - d, - motion_source + stride + 1 + d, - stride, 8); + /* first, take care of copying a block from either the + * previous or the golden frame */ + if (s->all_fragments[i].coding_method != MODE_INTRA) { + /* Note, it is possible to implement all MC cases + * with put_no_rnd_pixels_l2 which would look more + * like the VP3 source but this would be slower as + * put_no_rnd_pixels_tab is better optimzed */ + if (motion_halfpel_index != 3) { + s->hdsp.put_no_rnd_pixels_tab[1][motion_halfpel_index]( + output_plane + first_pixel, + motion_source, stride, 8); + } else { + /* d is 0 if motion_x and _y have the same sign, + * else -1 */ + int d = (motion_x ^ motion_y) >> 31; + s->vp3dsp.put_no_rnd_pixels_l2(output_plane + first_pixel, + motion_source - d, + motion_source + stride + 1 + d, + stride, 8); + } } - } - - /* invert DCT and place (or add) in final output */ - if (s->all_fragments[i].coding_method == MODE_INTRA) { - int index; - index = vp3_dequant(s, s->all_fragments + i, plane, 0, block); - if (index > 63) - continue; - s->vp3dsp.idct_put( - output_plane + first_pixel, - stride, - block); - } else { - int index = vp3_dequant(s, s->all_fragments + i, plane, 1, block); - if (index > 63) - continue; - if (index > 0) { - s->vp3dsp.idct_add( - output_plane + first_pixel, - stride, - block); + /* invert DCT and place (or add) in final output */ + + if (s->all_fragments[i].coding_method == MODE_INTRA) { + int index; + index = vp3_dequant(s, s->all_fragments + i, + plane, 0, block); + if (index > 63) + continue; + s->vp3dsp.idct_put(output_plane + first_pixel, + stride, + block); } else { - s->vp3dsp.idct_dc_add(output_plane + first_pixel, stride, block); + int index = vp3_dequant(s, s->all_fragments + i, + plane, 1, block); + if (index > 63) + continue; + if (index > 0) { + s->vp3dsp.idct_add(output_plane + first_pixel, + stride, + block); + } else { + s->vp3dsp.idct_dc_add(output_plane + first_pixel, + stride, block); + } } + } else { + /* copy directly from the previous frame */ + s->hdsp.put_pixels_tab[1][0]( + output_plane + first_pixel, + last_plane + first_pixel, + stride, 8); } - } else { - - /* copy directly from the previous frame */ - s->hdsp.put_pixels_tab[1][0]( - output_plane + first_pixel, - last_plane + first_pixel, - stride, 8); - - } } } // Filter up to the last row in the superblock row if (!s->skip_loop_filter) - apply_loop_filter(s, plane, 4*sb_y - !!sb_y, FFMIN(4*sb_y+3, fragment_height-1)); + apply_loop_filter(s, plane, 4 * sb_y - !!sb_y, + FFMIN(4 * sb_y + 3, fragment_height - 1)); } } - /* this looks like a good place for slice dispatch... */ - /* algorithm: - * if (slice == s->macroblock_height - 1) - * dispatch (both last slice & 2nd-to-last slice); - * else if (slice > 0) - * dispatch (slice - 1); - */ + /* this looks like a good place for slice dispatch... */ + /* algorithm: + * if (slice == s->macroblock_height - 1) + * dispatch (both last slice & 2nd-to-last slice); + * else if (slice > 0) + * dispatch (slice - 1); + */ - vp3_draw_horiz_band(s, FFMIN((32 << s->chroma_y_shift) * (slice + 1) -16, s->height-16)); + vp3_draw_horiz_band(s, FFMIN((32 << s->chroma_y_shift) * (slice + 1) - 16, + s->height - 16)); } /// Allocate tables for per-frame data in Vp3DecodeContext @@ -1637,19 +1659,23 @@ static av_cold int allocate_tables(AVCodecContext *avctx) c_fragment_count = s->fragment_width[1] * s->fragment_height[1]; s->superblock_coding = av_malloc(s->superblock_count); - s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment)); + s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment)); + s->coded_fragment_list[0] = av_malloc(s->fragment_count * sizeof(int)); - s->dct_tokens_base = av_malloc(64*s->fragment_count * sizeof(*s->dct_tokens_base)); + + s->dct_tokens_base = av_malloc(64 * s->fragment_count * + sizeof(*s->dct_tokens_base)); s->motion_val[0] = av_malloc(y_fragment_count * sizeof(*s->motion_val[0])); s->motion_val[1] = av_malloc(c_fragment_count * sizeof(*s->motion_val[1])); /* work out the block mapping tables */ s->superblock_fragments = av_malloc(s->superblock_count * 16 * sizeof(int)); - s->macroblock_coding = av_malloc(s->macroblock_count + 1); + s->macroblock_coding = av_malloc(s->macroblock_count + 1); - if (!s->superblock_coding || !s->all_fragments || !s->dct_tokens_base || - !s->coded_fragment_list[0] || !s->superblock_fragments || !s->macroblock_coding || - !s->motion_val[0] || !s->motion_val[1]) { + if (!s->superblock_coding || !s->all_fragments || + !s->dct_tokens_base || !s->coded_fragment_list[0] || + !s->superblock_fragments || !s->macroblock_coding || + !s->motion_val[0] || !s->motion_val[1]) { vp3_decode_end(avctx); return -1; } @@ -1689,13 +1715,13 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) avctx->internal->allocate_progress = 1; - if (avctx->codec_tag == MKTAG('V','P','3','0')) + if (avctx->codec_tag == MKTAG('V', 'P', '3', '0')) s->version = 0; else s->version = 1; - s->avctx = avctx; - s->width = FFALIGN(avctx->width, 16); + s->avctx = avctx; + s->width = FFALIGN(avctx->width, 16); s->height = FFALIGN(avctx->height, 16); if (avctx->pix_fmt == AV_PIX_FMT_NONE) avctx->pix_fmt = AV_PIX_FMT_YUV420P; @@ -1719,135 +1745,132 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_x_shift, &s->chroma_y_shift); - s->y_superblock_width = (s->width + 31) / 32; + s->y_superblock_width = (s->width + 31) / 32; s->y_superblock_height = (s->height + 31) / 32; - s->y_superblock_count = s->y_superblock_width * s->y_superblock_height; + s->y_superblock_count = s->y_superblock_width * s->y_superblock_height; /* work out the dimensions for the C planes */ - c_width = s->width >> s->chroma_x_shift; - c_height = s->height >> s->chroma_y_shift; - s->c_superblock_width = (c_width + 31) / 32; + c_width = s->width >> s->chroma_x_shift; + c_height = s->height >> s->chroma_y_shift; + s->c_superblock_width = (c_width + 31) / 32; s->c_superblock_height = (c_height + 31) / 32; - s->c_superblock_count = s->c_superblock_width * s->c_superblock_height; + s->c_superblock_count = s->c_superblock_width * s->c_superblock_height; - s->superblock_count = s->y_superblock_count + (s->c_superblock_count * 2); + s->superblock_count = s->y_superblock_count + (s->c_superblock_count * 2); s->u_superblock_start = s->y_superblock_count; s->v_superblock_start = s->u_superblock_start + s->c_superblock_count; - s->macroblock_width = (s->width + 15) / 16; + s->macroblock_width = (s->width + 15) / 16; s->macroblock_height = (s->height + 15) / 16; - s->macroblock_count = s->macroblock_width * s->macroblock_height; + s->macroblock_count = s->macroblock_width * s->macroblock_height; - s->fragment_width[0] = s->width / FRAGMENT_PIXELS; + s->fragment_width[0] = s->width / FRAGMENT_PIXELS; s->fragment_height[0] = s->height / FRAGMENT_PIXELS; - s->fragment_width[1] = s->fragment_width[0] >> s->chroma_x_shift; + s->fragment_width[1] = s->fragment_width[0] >> s->chroma_x_shift; s->fragment_height[1] = s->fragment_height[0] >> s->chroma_y_shift; /* fragment count covers all 8x8 blocks for all 3 planes */ y_fragment_count = s->fragment_width[0] * s->fragment_height[0]; c_fragment_count = s->fragment_width[1] * s->fragment_height[1]; - s->fragment_count = y_fragment_count + 2*c_fragment_count; + s->fragment_count = y_fragment_count + 2 * c_fragment_count; s->fragment_start[1] = y_fragment_count; s->fragment_start[2] = y_fragment_count + c_fragment_count; - if (!s->theora_tables) - { + if (!s->theora_tables) { for (i = 0; i < 64; i++) { s->coded_dc_scale_factor[i] = vp31_dc_scale_factor[i]; s->coded_ac_scale_factor[i] = vp31_ac_scale_factor[i]; - s->base_matrix[0][i] = vp31_intra_y_dequant[i]; - s->base_matrix[1][i] = vp31_intra_c_dequant[i]; - s->base_matrix[2][i] = vp31_inter_dequant[i]; - s->filter_limit_values[i] = vp31_filter_limit_values[i]; + s->base_matrix[0][i] = vp31_intra_y_dequant[i]; + s->base_matrix[1][i] = vp31_intra_c_dequant[i]; + s->base_matrix[2][i] = vp31_inter_dequant[i]; + s->filter_limit_values[i] = vp31_filter_limit_values[i]; } - for(inter=0; inter<2; inter++){ - for(plane=0; plane<3; plane++){ - s->qr_count[inter][plane]= 1; - s->qr_size [inter][plane][0]= 63; - s->qr_base [inter][plane][0]= - s->qr_base [inter][plane][1]= 2*inter + (!!plane)*!inter; + for (inter = 0; inter < 2; inter++) { + for (plane = 0; plane < 3; plane++) { + s->qr_count[inter][plane] = 1; + s->qr_size[inter][plane][0] = 63; + s->qr_base[inter][plane][0] = + s->qr_base[inter][plane][1] = 2 * inter + (!!plane) * !inter; } } /* init VLC tables */ for (i = 0; i < 16; i++) { - /* DC histograms */ init_vlc(&s->dc_vlc[i], 11, 32, - &dc_bias[i][0][1], 4, 2, - &dc_bias[i][0][0], 4, 2, 0); + &dc_bias[i][0][1], 4, 2, + &dc_bias[i][0][0], 4, 2, 0); /* group 1 AC histograms */ init_vlc(&s->ac_vlc_1[i], 11, 32, - &ac_bias_0[i][0][1], 4, 2, - &ac_bias_0[i][0][0], 4, 2, 0); + &ac_bias_0[i][0][1], 4, 2, + &ac_bias_0[i][0][0], 4, 2, 0); /* group 2 AC histograms */ init_vlc(&s->ac_vlc_2[i], 11, 32, - &ac_bias_1[i][0][1], 4, 2, - &ac_bias_1[i][0][0], 4, 2, 0); + &ac_bias_1[i][0][1], 4, 2, + &ac_bias_1[i][0][0], 4, 2, 0); /* group 3 AC histograms */ init_vlc(&s->ac_vlc_3[i], 11, 32, - &ac_bias_2[i][0][1], 4, 2, - &ac_bias_2[i][0][0], 4, 2, 0); + &ac_bias_2[i][0][1], 4, 2, + &ac_bias_2[i][0][0], 4, 2, 0); /* group 4 AC histograms */ init_vlc(&s->ac_vlc_4[i], 11, 32, - &ac_bias_3[i][0][1], 4, 2, - &ac_bias_3[i][0][0], 4, 2, 0); + &ac_bias_3[i][0][1], 4, 2, + &ac_bias_3[i][0][0], 4, 2, 0); } } else { - for (i = 0; i < 16; i++) { /* DC histograms */ if (init_vlc(&s->dc_vlc[i], 11, 32, - &s->huffman_table[i][0][1], 8, 4, - &s->huffman_table[i][0][0], 8, 4, 0) < 0) + &s->huffman_table[i][0][1], 8, 4, + &s->huffman_table[i][0][0], 8, 4, 0) < 0) goto vlc_fail; /* group 1 AC histograms */ if (init_vlc(&s->ac_vlc_1[i], 11, 32, - &s->huffman_table[i+16][0][1], 8, 4, - &s->huffman_table[i+16][0][0], 8, 4, 0) < 0) + &s->huffman_table[i + 16][0][1], 8, 4, + &s->huffman_table[i + 16][0][0], 8, 4, 0) < 0) goto vlc_fail; /* group 2 AC histograms */ if (init_vlc(&s->ac_vlc_2[i], 11, 32, - &s->huffman_table[i+16*2][0][1], 8, 4, - &s->huffman_table[i+16*2][0][0], 8, 4, 0) < 0) + &s->huffman_table[i + 16 * 2][0][1], 8, 4, + &s->huffman_table[i + 16 * 2][0][0], 8, 4, 0) < 0) goto vlc_fail; /* group 3 AC histograms */ if (init_vlc(&s->ac_vlc_3[i], 11, 32, - &s->huffman_table[i+16*3][0][1], 8, 4, - &s->huffman_table[i+16*3][0][0], 8, 4, 0) < 0) + &s->huffman_table[i + 16 * 3][0][1], 8, 4, + &s->huffman_table[i + 16 * 3][0][0], 8, 4, 0) < 0) goto vlc_fail; /* group 4 AC histograms */ if (init_vlc(&s->ac_vlc_4[i], 11, 32, - &s->huffman_table[i+16*4][0][1], 8, 4, - &s->huffman_table[i+16*4][0][0], 8, 4, 0) < 0) + &s->huffman_table[i + 16 * 4][0][1], 8, 4, + &s->huffman_table[i + 16 * 4][0][0], 8, 4, 0) < 0) goto vlc_fail; } } init_vlc(&s->superblock_run_length_vlc, 6, 34, - &superblock_run_length_vlc_table[0][1], 4, 2, - &superblock_run_length_vlc_table[0][0], 4, 2, 0); + &superblock_run_length_vlc_table[0][1], 4, 2, + &superblock_run_length_vlc_table[0][0], 4, 2, 0); init_vlc(&s->fragment_run_length_vlc, 5, 30, - &fragment_run_length_vlc_table[0][1], 4, 2, - &fragment_run_length_vlc_table[0][0], 4, 2, 0); + &fragment_run_length_vlc_table[0][1], 4, 2, + &fragment_run_length_vlc_table[0][0], 4, 2, 0); init_vlc(&s->mode_code_vlc, 3, 8, - &mode_code_vlc_table[0][1], 2, 1, - &mode_code_vlc_table[0][0], 2, 1, 0); + &mode_code_vlc_table[0][1], 2, 1, + &mode_code_vlc_table[0][0], 2, 1, 0); init_vlc(&s->motion_vector_vlc, 6, 63, - &motion_vector_vlc_table[0][1], 2, 1, - &motion_vector_vlc_table[0][0], 2, 1, 0); + &motion_vector_vlc_table[0][1], 2, 1, + &motion_vector_vlc_table[0][0], 2, 1, 0); return allocate_tables(avctx); @@ -1862,7 +1885,6 @@ static int update_frames(AVCodecContext *avctx) Vp3DecodeContext *s = avctx->priv_data; int ret = 0; - /* shuffle frames (last = current) */ ff_thread_release_buffer(avctx, &s->last_frame); ret = ff_thread_ref_frame(&s->last_frame, &s->current_frame); @@ -1902,11 +1924,12 @@ static int vp3_update_thread_context(AVCodecContext *dst, const AVCodecContext * Vp3DecodeContext *s = dst->priv_data, *s1 = src->priv_data; int qps_changed = 0, i, err; -#define copy_fields(to, from, start_field, end_field) memcpy(&to->start_field, &from->start_field, (char*)&to->end_field - (char*)&to->start_field) +#define copy_fields(to, from, start_field, end_field) \ + memcpy(&to->start_field, &from->start_field, \ + (char *) &to->end_field - (char *) &to->start_field) - if (!s1->current_frame.f->data[0] - ||s->width != s1->width - ||s->height!= s1->height) { + if (!s1->current_frame.f->data[0] || + s->width != s1->width || s->height != s1->height) { if (s != s1) ref_frames(s, s1); return -1; @@ -1922,8 +1945,10 @@ static int vp3_update_thread_context(AVCodecContext *dst, const AVCodecContext * return err; y_fragment_count = s->fragment_width[0] * s->fragment_height[0]; c_fragment_count = s->fragment_width[1] * s->fragment_height[1]; - memcpy(s->motion_val[0], s1->motion_val[0], y_fragment_count * sizeof(*s->motion_val[0])); - memcpy(s->motion_val[1], s1->motion_val[1], c_fragment_count * sizeof(*s->motion_val[1])); + memcpy(s->motion_val[0], s1->motion_val[0], + y_fragment_count * sizeof(*s->motion_val[0])); + memcpy(s->motion_val[1], s1->motion_val[1], + c_fragment_count * sizeof(*s->motion_val[1])); } // copy previous frame data @@ -1941,7 +1966,8 @@ static int vp3_update_thread_context(AVCodecContext *dst, const AVCodecContext * } if (s->qps[0] != s1->qps[0]) - memcpy(&s->bounding_values_array, &s1->bounding_values_array, sizeof(s->bounding_values_array)); + memcpy(&s->bounding_values_array, &s1->bounding_values_array, + sizeof(s->bounding_values_array)); if (qps_changed) copy_fields(s, s1, qps, superblock_count); @@ -1955,17 +1981,17 @@ static int vp3_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; Vp3DecodeContext *s = avctx->priv_data; GetBitContext gb; int i, ret; init_get_bits(&gb, buf, buf_size * 8); - if (s->theora && get_bits1(&gb)) - { - av_log(avctx, AV_LOG_ERROR, "Header packet passed to frame decoder, skipping\n"); + if (s->theora && get_bits1(&gb)) { + av_log(avctx, AV_LOG_ERROR, + "Header packet passed to frame decoder, skipping\n"); return -1; } @@ -1975,19 +2001,20 @@ static int vp3_decode_frame(AVCodecContext *avctx, for (i = 0; i < 3; i++) s->last_qps[i] = s->qps[i]; - s->nqps=0; - do{ - s->qps[s->nqps++]= get_bits(&gb, 6); - } while(s->theora >= 0x030200 && s->nqps<3 && get_bits1(&gb)); + s->nqps = 0; + do { + s->qps[s->nqps++] = get_bits(&gb, 6); + } while (s->theora >= 0x030200 && s->nqps < 3 && get_bits1(&gb)); for (i = s->nqps; i < 3; i++) s->qps[i] = -1; if (s->avctx->debug & FF_DEBUG_PICT_INFO) av_log(s->avctx, AV_LOG_INFO, " VP3 %sframe #%d: Q index = %d\n", - s->keyframe?"key":"", avctx->frame_number+1, s->qps[0]); + s->keyframe ? "key" : "", avctx->frame_number + 1, s->qps[0]); s->skip_loop_filter = !s->filter_limit_values[s->qps[0]] || - avctx->skip_loop_filter >= (s->keyframe ? AVDISCARD_ALL : AVDISCARD_NONKEY); + avctx->skip_loop_filter >= (s->keyframe ? AVDISCARD_ALL + : AVDISCARD_NONKEY); if (s->qps[0] != s->last_qps[0]) init_loop_filter(s); @@ -2001,44 +2028,47 @@ static int vp3_decode_frame(AVCodecContext *avctx, if (avctx->skip_frame >= AVDISCARD_NONKEY && !s->keyframe) return buf_size; - s->current_frame.f->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; + s->current_frame.f->pict_type = s->keyframe ? AV_PICTURE_TYPE_I + : AV_PICTURE_TYPE_P; if (ff_thread_get_buffer(avctx, &s->current_frame, AV_GET_BUFFER_FLAG_REF) < 0) { av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); goto error; } if (!s->edge_emu_buffer) - s->edge_emu_buffer = av_malloc(9*FFABS(s->current_frame.f->linesize[0])); + s->edge_emu_buffer = av_malloc(9 * FFABS(s->current_frame.f->linesize[0])); if (s->keyframe) { - if (!s->theora) - { + if (!s->theora) { skip_bits(&gb, 4); /* width code */ skip_bits(&gb, 4); /* height code */ - if (s->version) - { + if (s->version) { s->version = get_bits(&gb, 5); if (avctx->frame_number == 0) - av_log(s->avctx, AV_LOG_DEBUG, "VP version: %d\n", s->version); + av_log(s->avctx, AV_LOG_DEBUG, + "VP version: %d\n", s->version); } } - if (s->version || s->theora) - { - if (get_bits1(&gb)) - av_log(s->avctx, AV_LOG_ERROR, "Warning, unsupported keyframe coding type?!\n"); + if (s->version || s->theora) { + if (get_bits1(&gb)) + av_log(s->avctx, AV_LOG_ERROR, + "Warning, unsupported keyframe coding type?!\n"); skip_bits(&gb, 2); /* reserved? */ } } else { if (!s->golden_frame.f->data[0]) { - av_log(s->avctx, AV_LOG_WARNING, "vp3: first frame not a keyframe\n"); + av_log(s->avctx, AV_LOG_WARNING, + "vp3: first frame not a keyframe\n"); s->golden_frame.f->pict_type = AV_PICTURE_TYPE_I; - if (ff_thread_get_buffer(avctx, &s->golden_frame, AV_GET_BUFFER_FLAG_REF) < 0) { + if (ff_thread_get_buffer(avctx, &s->golden_frame, + AV_GET_BUFFER_FLAG_REF) < 0) { av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); goto error; } ff_thread_release_buffer(avctx, &s->last_frame); - if ((ret = ff_thread_ref_frame(&s->last_frame, &s->golden_frame)) < 0) + if ((ret = ff_thread_ref_frame(&s->last_frame, + &s->golden_frame)) < 0) goto error; ff_thread_report_progress(&s->last_frame, INT_MAX, 0); } @@ -2047,23 +2077,23 @@ static int vp3_decode_frame(AVCodecContext *avctx, memset(s->all_fragments, 0, s->fragment_count * sizeof(Vp3Fragment)); ff_thread_finish_setup(avctx); - if (unpack_superblocks(s, &gb)){ + if (unpack_superblocks(s, &gb)) { av_log(s->avctx, AV_LOG_ERROR, "error in unpack_superblocks\n"); goto error; } - if (unpack_modes(s, &gb)){ + if (unpack_modes(s, &gb)) { av_log(s->avctx, AV_LOG_ERROR, "error in unpack_modes\n"); goto error; } - if (unpack_vectors(s, &gb)){ + if (unpack_vectors(s, &gb)) { av_log(s->avctx, AV_LOG_ERROR, "error in unpack_vectors\n"); goto error; } - if (unpack_block_qpis(s, &gb)){ + if (unpack_block_qpis(s, &gb)) { av_log(s->avctx, AV_LOG_ERROR, "error in unpack_block_qpis\n"); goto error; } - if (unpack_dct_coeffs(s, &gb)){ + if (unpack_dct_coeffs(s, &gb)) { av_log(s->avctx, AV_LOG_ERROR, "error in unpack_dct_coeffs\n"); goto error; } @@ -2073,7 +2103,7 @@ static int vp3_decode_frame(AVCodecContext *avctx, if (s->flipped_image) s->data_offset[i] = 0; else - s->data_offset[i] = (height-1) * s->current_frame.f->linesize[i]; + s->data_offset[i] = (height - 1) * s->current_frame.f->linesize[i]; } s->last_slice_end = 0; @@ -2082,8 +2112,8 @@ static int vp3_decode_frame(AVCodecContext *avctx, // filter the last row for (i = 0; i < 3; i++) { - int row = (s->height >> (3+(i && s->chroma_y_shift))) - 1; - apply_loop_filter(s, i, row, row+1); + int row = (s->height >> (3 + (i && s->chroma_y_shift))) - 1; + apply_loop_filter(s, i, row, row + 1); } vp3_draw_horiz_band(s, s->avctx->height); @@ -2091,7 +2121,7 @@ static int vp3_decode_frame(AVCodecContext *avctx, return ret; *got_frame = 1; - if (!HAVE_THREADS || !(s->avctx->active_thread_type&FF_THREAD_FRAME)) { + if (!HAVE_THREADS || !(s->avctx->active_thread_type & FF_THREAD_FRAME)) { ret = update_frames(avctx); if (ret < 0) return ret; @@ -2102,7 +2132,7 @@ static int vp3_decode_frame(AVCodecContext *avctx, error: ff_thread_report_progress(&s->current_frame, INT_MAX, 0); - if (!HAVE_THREADS || !(s->avctx->active_thread_type&FF_THREAD_FRAME)) + if (!HAVE_THREADS || !(s->avctx->active_thread_type & FF_THREAD_FRAME)) av_frame_unref(s->current_frame.f); return -1; @@ -2124,9 +2154,8 @@ static int read_huffman_tree(AVCodecContext *avctx, GetBitContext *gb) s->huffman_table[s->hti][token][0] = s->hbits; s->huffman_table[s->hti][token][1] = s->huff_code_size; s->entries++; - } - else { - if (s->huff_code_size >= 32) {/* overflow */ + } else { + if (s->huff_code_size >= 32) { /* overflow */ av_log(avctx, AV_LOG_ERROR, "huffman tree overflow\n"); return -1; } @@ -2176,16 +2205,18 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) s->theora = get_bits_long(gb, 24); av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora); - /* 3.2.0 aka alpha3 has the same frame orientation as original vp3 */ - /* but previous versions have the image flipped relative to vp3 */ - if (s->theora < 0x030200) - { + /* 3.2.0 aka alpha3 has the same frame orientation as original vp3 + * but previous versions have the image flipped relative to vp3 */ + if (s->theora < 0x030200) { s->flipped_image = 1; - av_log(avctx, AV_LOG_DEBUG, "Old (<alpha3) Theora bitstream, flipped image\n"); + av_log(avctx, AV_LOG_DEBUG, + "Old (<alpha3) Theora bitstream, flipped image\n"); } - visible_width = s->width = get_bits(gb, 16) << 4; - visible_height = s->height = get_bits(gb, 16) << 4; + visible_width = + s->width = get_bits(gb, 16) << 4; + visible_height = + s->height = get_bits(gb, 16) << 4; if (s->theora >= 0x030200) { visible_width = get_bits_long(gb, 24); @@ -2203,7 +2234,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) return AVERROR_INVALIDDATA; } av_reduce(&avctx->time_base.num, &avctx->time_base.den, - fps.den, fps.num, 1<<30); + fps.den, fps.num, 1 << 30); } aspect.num = get_bits_long(gb, 24); @@ -2211,7 +2242,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) if (aspect.num && aspect.den) { av_reduce(&avctx->sample_aspect_ratio.num, &avctx->sample_aspect_ratio.den, - aspect.num, aspect.den, 1<<30); + aspect.num, aspect.den, 1 << 30); } if (s->theora < 0x030200) @@ -2221,8 +2252,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) skip_bits(gb, 6); /* quality hint */ - if (s->theora >= 0x030200) - { + if (s->theora >= 0x030200) { skip_bits(gb, 5); /* keyframe frequency force */ avctx->pix_fmt = theora_pix_fmts[get_bits(gb, 2)]; skip_bits(gb, 3); /* reserved */ @@ -2230,20 +2260,20 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) // align_get_bits(gb); - if ( visible_width <= s->width && visible_width > s->width-16 - && visible_height <= s->height && visible_height > s->height-16 - && !offset_x && (offset_y == s->height - visible_height)) + if (visible_width <= s->width && visible_width > s->width - 16 && + visible_height <= s->height && visible_height > s->height - 16 && + !offset_x && (offset_y == s->height - visible_height)) ret = ff_set_dimensions(avctx, visible_width, visible_height); else ret = ff_set_dimensions(avctx, s->width, s->height); if (ret < 0) return ret; - if (colorspace == 1) { + if (colorspace == 1) avctx->color_primaries = AVCOL_PRI_BT470M; - } else if (colorspace == 2) { + else if (colorspace == 2) avctx->color_primaries = AVCOL_PRI_BT470BG; - } + if (colorspace == 1 || colorspace == 2) { avctx->colorspace = AVCOL_SPC_BT470BG; avctx->color_trc = AVCOL_TRC_BT709; @@ -2286,48 +2316,50 @@ static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb) else matrices = 3; - if(matrices > 384){ + if (matrices > 384) { av_log(avctx, AV_LOG_ERROR, "invalid number of base matrixes\n"); return -1; } - for(n=0; n<matrices; n++){ + for (n = 0; n < matrices; n++) for (i = 0; i < 64; i++) - s->base_matrix[n][i]= get_bits(gb, 8); - } + s->base_matrix[n][i] = get_bits(gb, 8); for (inter = 0; inter <= 1; inter++) { for (plane = 0; plane <= 2; plane++) { - int newqr= 1; + int newqr = 1; if (inter || plane > 0) newqr = get_bits1(gb); if (!newqr) { int qtj, plj; - if(inter && get_bits1(gb)){ + if (inter && get_bits1(gb)) { qtj = 0; plj = plane; - }else{ - qtj= (3*inter + plane - 1) / 3; - plj= (plane + 2) % 3; + } else { + qtj = (3 * inter + plane - 1) / 3; + plj = (plane + 2) % 3; } - s->qr_count[inter][plane]= s->qr_count[qtj][plj]; - memcpy(s->qr_size[inter][plane], s->qr_size[qtj][plj], sizeof(s->qr_size[0][0])); - memcpy(s->qr_base[inter][plane], s->qr_base[qtj][plj], sizeof(s->qr_base[0][0])); + s->qr_count[inter][plane] = s->qr_count[qtj][plj]; + memcpy(s->qr_size[inter][plane], s->qr_size[qtj][plj], + sizeof(s->qr_size[0][0])); + memcpy(s->qr_base[inter][plane], s->qr_base[qtj][plj], + sizeof(s->qr_base[0][0])); } else { - int qri= 0; - int qi = 0; - - for(;;){ - i= get_bits(gb, av_log2(matrices-1)+1); - if(i>= matrices){ - av_log(avctx, AV_LOG_ERROR, "invalid base matrix index\n"); + int qri = 0; + int qi = 0; + + for (;;) { + i = get_bits(gb, av_log2(matrices - 1) + 1); + if (i >= matrices) { + av_log(avctx, AV_LOG_ERROR, + "invalid base matrix index\n"); return -1; } - s->qr_base[inter][plane][qri]= i; - if(qi >= 63) + s->qr_base[inter][plane][qri] = i; + if (qi >= 63) break; - i = get_bits(gb, av_log2(63-qi)+1) + 1; - s->qr_size[inter][plane][qri++]= i; + i = get_bits(gb, av_log2(63 - qi) + 1) + 1; + s->qr_size[inter][plane][qri++] = i; qi += i; } @@ -2335,21 +2367,21 @@ static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb) av_log(avctx, AV_LOG_ERROR, "invalid qi %d > 63\n", qi); return -1; } - s->qr_count[inter][plane]= qri; + s->qr_count[inter][plane] = qri; } } } /* Huffman tables */ for (s->hti = 0; s->hti < 80; s->hti++) { - s->entries = 0; + s->entries = 0; s->huff_code_size = 1; if (!get_bits1(gb)) { s->hbits = 0; - if(read_huffman_tree(avctx, gb)) + if (read_huffman_tree(avctx, gb)) return -1; s->hbits = 1; - if(read_huffman_tree(avctx, gb)) + if (read_huffman_tree(avctx, gb)) return -1; } } @@ -2370,39 +2402,36 @@ static av_cold int theora_decode_init(AVCodecContext *avctx) s->theora = 1; - if (!avctx->extradata_size) - { + if (!avctx->extradata_size) { av_log(avctx, AV_LOG_ERROR, "Missing extradata!\n"); return -1; } if (avpriv_split_xiph_headers(avctx->extradata, avctx->extradata_size, - 42, header_start, header_len) < 0) { + 42, header_start, header_len) < 0) { av_log(avctx, AV_LOG_ERROR, "Corrupt extradata\n"); return -1; } - for(i=0;i<3;i++) { - if (header_len[i] <= 0) - continue; - init_get_bits(&gb, header_start[i], header_len[i] * 8); + for (i = 0; i < 3; i++) { + if (header_len[i] <= 0) + continue; + init_get_bits(&gb, header_start[i], header_len[i] * 8); - ptype = get_bits(&gb, 8); + ptype = get_bits(&gb, 8); - if (!(ptype & 0x80)) - { - av_log(avctx, AV_LOG_ERROR, "Invalid extradata!\n"); -// return -1; - } + if (!(ptype & 0x80)) { + av_log(avctx, AV_LOG_ERROR, "Invalid extradata!\n"); +// return -1; + } - // FIXME: Check for this as well. - skip_bits_long(&gb, 6*8); /* "theora" */ + // FIXME: Check for this as well. + skip_bits_long(&gb, 6 * 8); /* "theora" */ - switch(ptype) - { + switch (ptype) { case 0x80: theora_decode_header(avctx, &gb); - break; + break; case 0x81: // FIXME: is this needed? it breaks sometimes // theora_decode_comments(avctx, gb); @@ -2412,14 +2441,17 @@ static av_cold int theora_decode_init(AVCodecContext *avctx) return -1; break; default: - av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80); + av_log(avctx, AV_LOG_ERROR, + "Unknown Theora config packet: %d\n", ptype & ~0x80); + break; + } + if (ptype != 0x81 && 8 * header_len[i] != get_bits_count(&gb)) + av_log(avctx, AV_LOG_WARNING, + "%d bits left in packet %X\n", + 8 * header_len[i] - get_bits_count(&gb), ptype); + if (s->theora < 0x030200) break; } - if(ptype != 0x81 && 8*header_len[i] != get_bits_count(&gb)) - av_log(avctx, AV_LOG_WARNING, "%d bits left in packet %X\n", 8*header_len[i] - get_bits_count(&gb), ptype); - if (s->theora < 0x030200) - break; - } return vp3_decode_init(avctx); } |