diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 13:58:29 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 14:03:12 +0200 |
commit | de31814ab07fd971d24c66a5e1ecf464b7ebe033 (patch) | |
tree | 42c68ea4d18cdfbac8051772d9853ac7d50b2f7b /libavcodec/svq1dec.c | |
parent | c4aaff8c02cecfe42b730cb922521e4b9f26df30 (diff) | |
parent | b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6 (diff) | |
download | ffmpeg-streaming-de31814ab07fd971d24c66a5e1ecf464b7ebe033.zip ffmpeg-streaming-de31814ab07fd971d24c66a5e1ecf464b7ebe033.tar.gz |
Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'
* commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6':
avio: introduce avio_closep
mpegtsenc: set muxing type notification to verbose
vc1dec: Use correct spelling of "opposite"
a64multienc: change mc_frame_counter to unsigned
arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)
svq1: Drop a bunch of useless parentheses
parseutils-test: do not print numerical error codes
svq1: K&R formatting cosmetics
Conflicts:
doc/APIchanges
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavformat/version.h
libavutil/parseutils.c
tests/ref/fate/parseutils
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq1dec.c')
-rw-r--r-- | libavcodec/svq1dec.c | 1160 |
1 files changed, 589 insertions, 571 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 3da93f1..66afdcb 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -32,12 +32,10 @@ * http://www.pcisys.net/~melanson/codecs/ */ - #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" #include "mathops.h" - #include "svq1.h" #undef NDEBUG @@ -54,655 +52,670 @@ static VLC svq1_inter_mean; /* motion vector (prediction) */ typedef struct svq1_pmv_s { - int x; - int y; + int x; + int y; } svq1_pmv; static const uint8_t string_table[256] = { - 0x00, 0xD5, 0x7F, 0xAA, 0xFE, 0x2B, 0x81, 0x54, - 0x29, 0xFC, 0x56, 0x83, 0xD7, 0x02, 0xA8, 0x7D, - 0x52, 0x87, 0x2D, 0xF8, 0xAC, 0x79, 0xD3, 0x06, - 0x7B, 0xAE, 0x04, 0xD1, 0x85, 0x50, 0xFA, 0x2F, - 0xA4, 0x71, 0xDB, 0x0E, 0x5A, 0x8F, 0x25, 0xF0, - 0x8D, 0x58, 0xF2, 0x27, 0x73, 0xA6, 0x0C, 0xD9, - 0xF6, 0x23, 0x89, 0x5C, 0x08, 0xDD, 0x77, 0xA2, - 0xDF, 0x0A, 0xA0, 0x75, 0x21, 0xF4, 0x5E, 0x8B, - 0x9D, 0x48, 0xE2, 0x37, 0x63, 0xB6, 0x1C, 0xC9, - 0xB4, 0x61, 0xCB, 0x1E, 0x4A, 0x9F, 0x35, 0xE0, - 0xCF, 0x1A, 0xB0, 0x65, 0x31, 0xE4, 0x4E, 0x9B, - 0xE6, 0x33, 0x99, 0x4C, 0x18, 0xCD, 0x67, 0xB2, - 0x39, 0xEC, 0x46, 0x93, 0xC7, 0x12, 0xB8, 0x6D, - 0x10, 0xC5, 0x6F, 0xBA, 0xEE, 0x3B, 0x91, 0x44, - 0x6B, 0xBE, 0x14, 0xC1, 0x95, 0x40, 0xEA, 0x3F, - 0x42, 0x97, 0x3D, 0xE8, 0xBC, 0x69, 0xC3, 0x16, - 0xEF, 0x3A, 0x90, 0x45, 0x11, 0xC4, 0x6E, 0xBB, - 0xC6, 0x13, 0xB9, 0x6C, 0x38, 0xED, 0x47, 0x92, - 0xBD, 0x68, 0xC2, 0x17, 0x43, 0x96, 0x3C, 0xE9, - 0x94, 0x41, 0xEB, 0x3E, 0x6A, 0xBF, 0x15, 0xC0, - 0x4B, 0x9E, 0x34, 0xE1, 0xB5, 0x60, 0xCA, 0x1F, - 0x62, 0xB7, 0x1D, 0xC8, 0x9C, 0x49, 0xE3, 0x36, - 0x19, 0xCC, 0x66, 0xB3, 0xE7, 0x32, 0x98, 0x4D, - 0x30, 0xE5, 0x4F, 0x9A, 0xCE, 0x1B, 0xB1, 0x64, - 0x72, 0xA7, 0x0D, 0xD8, 0x8C, 0x59, 0xF3, 0x26, - 0x5B, 0x8E, 0x24, 0xF1, 0xA5, 0x70, 0xDA, 0x0F, - 0x20, 0xF5, 0x5F, 0x8A, 0xDE, 0x0B, 0xA1, 0x74, - 0x09, 0xDC, 0x76, 0xA3, 0xF7, 0x22, 0x88, 0x5D, - 0xD6, 0x03, 0xA9, 0x7C, 0x28, 0xFD, 0x57, 0x82, - 0xFF, 0x2A, 0x80, 0x55, 0x01, 0xD4, 0x7E, 0xAB, - 0x84, 0x51, 0xFB, 0x2E, 0x7A, 0xAF, 0x05, 0xD0, - 0xAD, 0x78, 0xD2, 0x07, 0x53, 0x86, 0x2C, 0xF9 + 0x00, 0xD5, 0x7F, 0xAA, 0xFE, 0x2B, 0x81, 0x54, + 0x29, 0xFC, 0x56, 0x83, 0xD7, 0x02, 0xA8, 0x7D, + 0x52, 0x87, 0x2D, 0xF8, 0xAC, 0x79, 0xD3, 0x06, + 0x7B, 0xAE, 0x04, 0xD1, 0x85, 0x50, 0xFA, 0x2F, + 0xA4, 0x71, 0xDB, 0x0E, 0x5A, 0x8F, 0x25, 0xF0, + 0x8D, 0x58, 0xF2, 0x27, 0x73, 0xA6, 0x0C, 0xD9, + 0xF6, 0x23, 0x89, 0x5C, 0x08, 0xDD, 0x77, 0xA2, + 0xDF, 0x0A, 0xA0, 0x75, 0x21, 0xF4, 0x5E, 0x8B, + 0x9D, 0x48, 0xE2, 0x37, 0x63, 0xB6, 0x1C, 0xC9, + 0xB4, 0x61, 0xCB, 0x1E, 0x4A, 0x9F, 0x35, 0xE0, + 0xCF, 0x1A, 0xB0, 0x65, 0x31, 0xE4, 0x4E, 0x9B, + 0xE6, 0x33, 0x99, 0x4C, 0x18, 0xCD, 0x67, 0xB2, + 0x39, 0xEC, 0x46, 0x93, 0xC7, 0x12, 0xB8, 0x6D, + 0x10, 0xC5, 0x6F, 0xBA, 0xEE, 0x3B, 0x91, 0x44, + 0x6B, 0xBE, 0x14, 0xC1, 0x95, 0x40, 0xEA, 0x3F, + 0x42, 0x97, 0x3D, 0xE8, 0xBC, 0x69, 0xC3, 0x16, + 0xEF, 0x3A, 0x90, 0x45, 0x11, 0xC4, 0x6E, 0xBB, + 0xC6, 0x13, 0xB9, 0x6C, 0x38, 0xED, 0x47, 0x92, + 0xBD, 0x68, 0xC2, 0x17, 0x43, 0x96, 0x3C, 0xE9, + 0x94, 0x41, 0xEB, 0x3E, 0x6A, 0xBF, 0x15, 0xC0, + 0x4B, 0x9E, 0x34, 0xE1, 0xB5, 0x60, 0xCA, 0x1F, + 0x62, 0xB7, 0x1D, 0xC8, 0x9C, 0x49, 0xE3, 0x36, + 0x19, 0xCC, 0x66, 0xB3, 0xE7, 0x32, 0x98, 0x4D, + 0x30, 0xE5, 0x4F, 0x9A, 0xCE, 0x1B, 0xB1, 0x64, + 0x72, 0xA7, 0x0D, 0xD8, 0x8C, 0x59, 0xF3, 0x26, + 0x5B, 0x8E, 0x24, 0xF1, 0xA5, 0x70, 0xDA, 0x0F, + 0x20, 0xF5, 0x5F, 0x8A, 0xDE, 0x0B, 0xA1, 0x74, + 0x09, 0xDC, 0x76, 0xA3, 0xF7, 0x22, 0x88, 0x5D, + 0xD6, 0x03, 0xA9, 0x7C, 0x28, 0xFD, 0x57, 0x82, + 0xFF, 0x2A, 0x80, 0x55, 0x01, 0xD4, 0x7E, 0xAB, + 0x84, 0x51, 0xFB, 0x2E, 0x7A, 0xAF, 0x05, 0xD0, + 0xAD, 0x78, 0xD2, 0x07, 0x53, 0x86, 0x2C, 0xF9 }; -#define SVQ1_PROCESS_VECTOR()\ - for (; level > 0; i++) {\ - /* process next depth */\ - if (i == m) {\ - m = n;\ - if (--level == 0)\ - break;\ - }\ - /* divide block if next bit set */\ - if (get_bits1 (bitbuf) == 0)\ - break;\ - /* add child nodes */\ - list[n++] = list[i];\ - list[n++] = list[i] + (((level & 1) ? pitch : 1) << ((level >> 1) + 1));\ +#define SVQ1_PROCESS_VECTOR() \ + for (; level > 0; i++) { \ + /* process next depth */ \ + if (i == m) { \ + m = n; \ + if (--level == 0) \ + break; \ + } \ + /* divide block if next bit set */ \ + if (get_bits1(bitbuf) == 0) \ + break; \ + /* add child nodes */ \ + list[n++] = list[i]; \ + list[n++] = list[i] + (((level & 1) ? pitch : 1) << ((level >> 1) + 1));\ } -#define SVQ1_ADD_CODEBOOK()\ - /* add codebook entries to vector */\ - for (j=0; j < stages; j++) {\ - n3 = codebook[entries[j]] ^ 0x80808080;\ - n1 += ((n3 & 0xFF00FF00) >> 8);\ - n2 += (n3 & 0x00FF00FF);\ - }\ -\ - /* clip to [0..255] */\ - if (n1 & 0xFF00FF00) {\ - n3 = ((( n1 >> 15) & 0x00010001) | 0x01000100) - 0x00010001;\ - n1 += 0x7F007F00;\ - n1 |= (((~n1 >> 15) & 0x00010001) | 0x01000100) - 0x00010001;\ - n1 &= (n3 & 0x00FF00FF);\ - }\ -\ - if (n2 & 0xFF00FF00) {\ - n3 = ((( n2 >> 15) & 0x00010001) | 0x01000100) - 0x00010001;\ - n2 += 0x7F007F00;\ - n2 |= (((~n2 >> 15) & 0x00010001) | 0x01000100) - 0x00010001;\ - n2 &= (n3 & 0x00FF00FF);\ - } - -#define SVQ1_DO_CODEBOOK_INTRA()\ - for (y=0; y < height; y++) {\ - for (x=0; x < (width / 4); x++, codebook++) {\ - n1 = n4;\ - n2 = n4;\ - SVQ1_ADD_CODEBOOK()\ - /* store result */\ - dst[x] = (n1 << 8) | n2;\ - }\ - dst += (pitch / 4);\ - } - -#define SVQ1_DO_CODEBOOK_NONINTRA()\ - for (y=0; y < height; y++) {\ - for (x=0; x < (width / 4); x++, codebook++) {\ - n3 = dst[x];\ - /* add mean value to vector */\ - n1 = ((n3 & 0xFF00FF00) >> 8) + n4;\ - n2 = (n3 & 0x00FF00FF) + n4;\ - SVQ1_ADD_CODEBOOK()\ - /* store result */\ - dst[x] = (n1 << 8) | n2;\ - }\ - dst += (pitch / 4);\ - } - -#define SVQ1_CALC_CODEBOOK_ENTRIES(cbook)\ - codebook = (const uint32_t *) cbook[level];\ - if (stages > 0)\ - bit_cache = get_bits (bitbuf, 4*stages);\ - /* calculate codebook entries for this vector */\ - for (j=0; j < stages; j++) {\ - entries[j] = (((bit_cache >> (4*(stages - j - 1))) & 0xF) + 16*j) << (level + 1);\ - }\ - mean -= (stages * 128);\ - n4 = (mean << 16) + mean; - -static int svq1_decode_block_intra (GetBitContext *bitbuf, uint8_t *pixels, int pitch ) { - uint32_t bit_cache; - uint8_t *list[63]; - uint32_t *dst; - const uint32_t *codebook; - int entries[6]; - int i, j, m, n; - int mean, stages; - unsigned x, y, width, height, level; - uint32_t n1, n2, n3, n4; - - /* initialize list for breadth first processing of vectors */ - list[0] = pixels; - - /* recursively process vector */ - for (i=0, m=1, n=1, level=5; i < n; i++) { - SVQ1_PROCESS_VECTOR(); - - /* destination address and vector size */ - dst = (uint32_t *) list[i]; - width = 1 << ((4 + level) /2); - height = 1 << ((3 + level) /2); - - /* get number of stages (-1 skips vector, 0 for mean only) */ - stages = get_vlc2(bitbuf, svq1_intra_multistage[level].table, 3, 3) - 1; - - if (stages == -1) { - for (y=0; y < height; y++) { - memset (&dst[y*(pitch / 4)], 0, width); - } - continue; /* skip vector */ +#define SVQ1_ADD_CODEBOOK() \ + /* add codebook entries to vector */ \ + for (j = 0; j < stages; j++) { \ + n3 = codebook[entries[j]] ^ 0x80808080; \ + n1 += (n3 & 0xFF00FF00) >> 8; \ + n2 += n3 & 0x00FF00FF; \ + } \ + \ + /* clip to [0..255] */ \ + if (n1 & 0xFF00FF00) { \ + n3 = (n1 >> 15 & 0x00010001 | 0x01000100) - 0x00010001; \ + n1 += 0x7F007F00; \ + n1 |= (~n1 >> 15 & 0x00010001 | 0x01000100) - 0x00010001; \ + n1 &= n3 & 0x00FF00FF; \ + } \ + \ + if (n2 & 0xFF00FF00) { \ + n3 = (n2 >> 15 & 0x00010001 | 0x01000100) - 0x00010001; \ + n2 += 0x7F007F00; \ + n2 |= (~n2 >> 15 & 0x00010001 | 0x01000100) - 0x00010001; \ + n2 &= n3 & 0x00FF00FF; \ } - if ((stages > 0) && (level >= 4)) { - av_dlog(NULL, - "Error (svq1_decode_block_intra): invalid vector: stages=%i level=%i\n", - stages, level); - return -1; /* invalid vector */ +#define SVQ1_DO_CODEBOOK_INTRA() \ + for (y = 0; y < height; y++) { \ + for (x = 0; x < width / 4; x++, codebook++) { \ + n1 = n4; \ + n2 = n4; \ + SVQ1_ADD_CODEBOOK() \ + /* store result */ \ + dst[x] = n1 << 8 | n2; \ + } \ + dst += pitch / 4; \ } - mean = get_vlc2(bitbuf, svq1_intra_mean.table, 8, 3); +#define SVQ1_DO_CODEBOOK_NONINTRA() \ + for (y = 0; y < height; y++) { \ + for (x = 0; x < width / 4; x++, codebook++) { \ + n3 = dst[x]; \ + /* add mean value to vector */ \ + n1 = n4 + ((n3 & 0xFF00FF00) >> 8); \ + n2 = n4 + (n3 & 0x00FF00FF); \ + SVQ1_ADD_CODEBOOK() \ + /* store result */ \ + dst[x] = n1 << 8 | n2; \ + } \ + dst += pitch / 4; \ + } - if (stages == 0) { - for (y=0; y < height; y++) { - memset (&dst[y*(pitch / 4)], mean, width); - } - } else { - SVQ1_CALC_CODEBOOK_ENTRIES(ff_svq1_intra_codebooks); - SVQ1_DO_CODEBOOK_INTRA() +#define SVQ1_CALC_CODEBOOK_ENTRIES(cbook) \ + codebook = (const uint32_t *)cbook[level]; \ + if (stages > 0) \ + bit_cache = get_bits(bitbuf, 4 * stages); \ + /* calculate codebook entries for this vector */ \ + for (j = 0; j < stages; j++) { \ + entries[j] = (((bit_cache >> (4 * (stages - j - 1))) & 0xF) + \ + 16 * j) << (level + 1); \ + } \ + mean -= stages * 128; \ + n4 = (mean << 16) + mean; + +static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels, + int pitch) +{ + uint32_t bit_cache; + uint8_t *list[63]; + uint32_t *dst; + const uint32_t *codebook; + int entries[6]; + int i, j, m, n; + int mean, stages; + unsigned x, y, width, height, level; + uint32_t n1, n2, n3, n4; + + /* initialize list for breadth first processing of vectors */ + list[0] = pixels; + + /* recursively process vector */ + for (i = 0, m = 1, n = 1, level = 5; i < n; i++) { + SVQ1_PROCESS_VECTOR(); + + /* destination address and vector size */ + dst = (uint32_t *)list[i]; + width = 1 << ((4 + level) / 2); + height = 1 << ((3 + level) / 2); + + /* get number of stages (-1 skips vector, 0 for mean only) */ + stages = get_vlc2(bitbuf, svq1_intra_multistage[level].table, 3, 3) - 1; + + if (stages == -1) { + for (y = 0; y < height; y++) + memset(&dst[y * (pitch / 4)], 0, width); + continue; /* skip vector */ + } + + if (stages > 0 && level >= 4) { + av_dlog(NULL, + "Error (svq1_decode_block_intra): invalid vector: stages=%i level=%i\n", + stages, level); + return -1; /* invalid vector */ + } + + mean = get_vlc2(bitbuf, svq1_intra_mean.table, 8, 3); + + if (stages == 0) { + for (y = 0; y < height; y++) + memset(&dst[y * (pitch / 4)], mean, width); + } else { + SVQ1_CALC_CODEBOOK_ENTRIES(ff_svq1_intra_codebooks); + SVQ1_DO_CODEBOOK_INTRA() + } } - } - return 0; + return 0; } -static int svq1_decode_block_non_intra (GetBitContext *bitbuf, uint8_t *pixels, int pitch ) { - uint32_t bit_cache; - uint8_t *list[63]; - uint32_t *dst; - const uint32_t *codebook; - int entries[6]; - int i, j, m, n; - int mean, stages; - int x, y, width, height, level; - uint32_t n1, n2, n3, n4; - - /* initialize list for breadth first processing of vectors */ - list[0] = pixels; - - /* recursively process vector */ - for (i=0, m=1, n=1, level=5; i < n; i++) { - SVQ1_PROCESS_VECTOR(); - - /* destination address and vector size */ - dst = (uint32_t *) list[i]; - width = 1 << ((4 + level) /2); - height = 1 << ((3 + level) /2); - - /* get number of stages (-1 skips vector, 0 for mean only) */ - stages = get_vlc2(bitbuf, svq1_inter_multistage[level].table, 3, 2) - 1; - - if (stages == -1) continue; /* skip vector */ - - if ((stages > 0) && (level >= 4)) { - av_dlog(NULL, - "Error (svq1_decode_block_non_intra): invalid vector: stages=%i level=%i\n", - stages, level); - return -1; /* invalid vector */ - } +static int svq1_decode_block_non_intra(GetBitContext *bitbuf, uint8_t *pixels, + int pitch) +{ + uint32_t bit_cache; + uint8_t *list[63]; + uint32_t *dst; + const uint32_t *codebook; + int entries[6]; + int i, j, m, n; + int mean, stages; + int x, y, width, height, level; + uint32_t n1, n2, n3, n4; + + /* initialize list for breadth first processing of vectors */ + list[0] = pixels; + + /* recursively process vector */ + for (i = 0, m = 1, n = 1, level = 5; i < n; i++) { + SVQ1_PROCESS_VECTOR(); + + /* destination address and vector size */ + dst = (uint32_t *)list[i]; + width = 1 << ((4 + level) / 2); + height = 1 << ((3 + level) / 2); + + /* get number of stages (-1 skips vector, 0 for mean only) */ + stages = get_vlc2(bitbuf, svq1_inter_multistage[level].table, 3, 2) - 1; + + if (stages == -1) + continue; /* skip vector */ + + if ((stages > 0) && (level >= 4)) { + av_dlog(NULL, + "Error (svq1_decode_block_non_intra): invalid vector: stages=%i level=%i\n", + stages, level); + return -1; /* invalid vector */ + } - mean = get_vlc2(bitbuf, svq1_inter_mean.table, 9, 3) - 256; + mean = get_vlc2(bitbuf, svq1_inter_mean.table, 9, 3) - 256; - SVQ1_CALC_CODEBOOK_ENTRIES(ff_svq1_inter_codebooks); - SVQ1_DO_CODEBOOK_NONINTRA() - } - return 0; + SVQ1_CALC_CODEBOOK_ENTRIES(ff_svq1_inter_codebooks); + SVQ1_DO_CODEBOOK_NONINTRA() + } + return 0; } -static int svq1_decode_motion_vector (GetBitContext *bitbuf, svq1_pmv *mv, svq1_pmv **pmv) { - int diff; - int i; +static int svq1_decode_motion_vector(GetBitContext *bitbuf, svq1_pmv *mv, + svq1_pmv **pmv) +{ + int diff; + int i; - for (i=0; i < 2; i++) { + for (i = 0; i < 2; i++) { + /* get motion code */ + diff = get_vlc2(bitbuf, svq1_motion_component.table, 7, 2); + if (diff < 0) + return -1; + else if (diff) { + if (get_bits1(bitbuf)) + diff = -diff; + } - /* get motion code */ - diff = get_vlc2(bitbuf, svq1_motion_component.table, 7, 2); - if(diff<0) - return -1; - else if(diff){ - if(get_bits1(bitbuf)) diff= -diff; + /* add median of motion vector predictors and clip result */ + if (i == 1) + mv->y = sign_extend(diff + mid_pred(pmv[0]->y, pmv[1]->y, pmv[2]->y), 6); + else + mv->x = sign_extend(diff + mid_pred(pmv[0]->x, pmv[1]->x, pmv[2]->x), 6); } - /* add median of motion vector predictors and clip result */ - if (i == 1) - mv->y = sign_extend(diff + mid_pred(pmv[0]->y, pmv[1]->y, pmv[2]->y), 6); - else - mv->x = sign_extend(diff + mid_pred(pmv[0]->x, pmv[1]->x, pmv[2]->x), 6); - } - - return 0; + return 0; } -static void svq1_skip_block (uint8_t *current, uint8_t *previous, int pitch, int x, int y) { - uint8_t *src; - uint8_t *dst; - int i; +static void svq1_skip_block(uint8_t *current, uint8_t *previous, + int pitch, int x, int y) +{ + uint8_t *src; + uint8_t *dst; + int i; - src = &previous[x + y*pitch]; - dst = current; + src = &previous[x + y * pitch]; + dst = current; - for (i=0; i < 16; i++) { - memcpy (dst, src, 16); - src += pitch; - dst += pitch; - } + for (i = 0; i < 16; i++) { + memcpy(dst, src, 16); + src += pitch; + dst += pitch; + } } -static int svq1_motion_inter_block (MpegEncContext *s, GetBitContext *bitbuf, - uint8_t *current, uint8_t *previous, int pitch, - svq1_pmv *motion, int x, int y) { - uint8_t *src; - uint8_t *dst; - svq1_pmv mv; - svq1_pmv *pmv[3]; - int result; - - /* predict and decode motion vector */ - pmv[0] = &motion[0]; - if (y == 0) { - pmv[1] = - pmv[2] = pmv[0]; - } - else { - pmv[1] = &motion[(x / 8) + 2]; - pmv[2] = &motion[(x / 8) + 4]; - } - - result = svq1_decode_motion_vector (bitbuf, &mv, pmv); - - if (result != 0) - return result; +static int svq1_motion_inter_block(MpegEncContext *s, GetBitContext *bitbuf, + uint8_t *current, uint8_t *previous, + int pitch, svq1_pmv *motion, int x, int y) +{ + uint8_t *src; + uint8_t *dst; + svq1_pmv mv; + svq1_pmv *pmv[3]; + int result; + + /* predict and decode motion vector */ + pmv[0] = &motion[0]; + if (y == 0) { + pmv[1] = + pmv[2] = pmv[0]; + } else { + pmv[1] = &motion[x / 8 + 2]; + pmv[2] = &motion[x / 8 + 4]; + } - motion[0].x = - motion[(x / 8) + 2].x = - motion[(x / 8) + 3].x = mv.x; - motion[0].y = - motion[(x / 8) + 2].y = - motion[(x / 8) + 3].y = mv.y; + result = svq1_decode_motion_vector(bitbuf, &mv, pmv); - if(y + (mv.y >> 1)<0) - mv.y= 0; - if(x + (mv.x >> 1)<0) - mv.x= 0; + if (result != 0) + return result; + + motion[0].x = + motion[x / 8 + 2].x = + motion[x / 8 + 3].x = mv.x; + motion[0].y = + motion[x / 8 + 2].y = + motion[x / 8 + 3].y = mv.y; + + if (y + (mv.y >> 1) < 0) + mv.y = 0; + if (x + (mv.x >> 1) < 0) + mv.x = 0; - src = &previous[(x + (mv.x >> 1)) + (y + (mv.y >> 1))*pitch]; - dst = current; + src = &previous[(x + (mv.x >> 1)) + (y + (mv.y >> 1)) * pitch]; + dst = current; - s->dsp.put_pixels_tab[0][((mv.y & 1) << 1) | (mv.x & 1)](dst,src,pitch,16); + s->dsp.put_pixels_tab[0][(mv.y & 1) << 1 | (mv.x & 1)](dst, src, pitch, 16); - return 0; + return 0; } -static int svq1_motion_inter_4v_block (MpegEncContext *s, GetBitContext *bitbuf, - uint8_t *current, uint8_t *previous, int pitch, - svq1_pmv *motion,int x, int y) { - uint8_t *src; - uint8_t *dst; - svq1_pmv mv; - svq1_pmv *pmv[4]; - int i, result; - - /* predict and decode motion vector (0) */ - pmv[0] = &motion[0]; - if (y == 0) { - pmv[1] = - pmv[2] = pmv[0]; - } - else { - pmv[1] = &motion[(x / 8) + 2]; - pmv[2] = &motion[(x / 8) + 4]; - } - - result = svq1_decode_motion_vector (bitbuf, &mv, pmv); - - if (result != 0) - return result; +static int svq1_motion_inter_4v_block(MpegEncContext *s, GetBitContext *bitbuf, + uint8_t *current, uint8_t *previous, + int pitch, svq1_pmv *motion, int x, int y) +{ + uint8_t *src; + uint8_t *dst; + svq1_pmv mv; + svq1_pmv *pmv[4]; + int i, result; + + /* predict and decode motion vector (0) */ + pmv[0] = &motion[0]; + if (y == 0) { + pmv[1] = + pmv[2] = pmv[0]; + } else { + pmv[1] = &motion[(x / 8) + 2]; + pmv[2] = &motion[(x / 8) + 4]; + } - /* predict and decode motion vector (1) */ - pmv[0] = &mv; - if (y == 0) { - pmv[1] = - pmv[2] = pmv[0]; - } - else { - pmv[1] = &motion[(x / 8) + 3]; - } - result = svq1_decode_motion_vector (bitbuf, &motion[0], pmv); - - if (result != 0) - return result; + result = svq1_decode_motion_vector(bitbuf, &mv, pmv); - /* predict and decode motion vector (2) */ - pmv[1] = &motion[0]; - pmv[2] = &motion[(x / 8) + 1]; + if (result != 0) + return result; - result = svq1_decode_motion_vector (bitbuf, &motion[(x / 8) + 2], pmv); + /* predict and decode motion vector (1) */ + pmv[0] = &mv; + if (y == 0) { + pmv[1] = + pmv[2] = pmv[0]; + } else { + pmv[1] = &motion[(x / 8) + 3]; + } + result = svq1_decode_motion_vector(bitbuf, &motion[0], pmv); - if (result != 0) - return result; + if (result != 0) + return result; - /* predict and decode motion vector (3) */ - pmv[2] = &motion[(x / 8) + 2]; - pmv[3] = &motion[(x / 8) + 3]; + /* predict and decode motion vector (2) */ + pmv[1] = &motion[0]; + pmv[2] = &motion[(x / 8) + 1]; - result = svq1_decode_motion_vector (bitbuf, pmv[3], pmv); + result = svq1_decode_motion_vector(bitbuf, &motion[(x / 8) + 2], pmv); - if (result != 0) - return result; + if (result != 0) + return result; - /* form predictions */ - for (i=0; i < 4; i++) { - int mvx= pmv[i]->x + (i&1)*16; - int mvy= pmv[i]->y + (i>>1)*16; + /* predict and decode motion vector (3) */ + pmv[2] = &motion[(x / 8) + 2]; + pmv[3] = &motion[(x / 8) + 3]; - ///XXX /FIXME clipping or padding? - if(y + (mvy >> 1)<0) - mvy= 0; - if(x + (mvx >> 1)<0) - mvx= 0; + result = svq1_decode_motion_vector(bitbuf, pmv[3], pmv); - src = &previous[(x + (mvx >> 1)) + (y + (mvy >> 1))*pitch]; - dst = current; + if (result != 0) + return result; - s->dsp.put_pixels_tab[1][((mvy & 1) << 1) | (mvx & 1)](dst,src,pitch,8); + /* form predictions */ + for (i = 0; i < 4; i++) { + int mvx = pmv[i]->x + (i & 1) * 16; + int mvy = pmv[i]->y + (i >> 1) * 16; - /* select next block */ - if (i & 1) { - current += 8*(pitch - 1); - } else { - current += 8; - } - } + // FIXME: clipping or padding? + if (y + (mvy >> 1) < 0) + mvy = 0; + if (x + (mvx >> 1) < 0) + mvx = 0; - return 0; -} + src = &previous[(x + (mvx >> 1)) + (y + (mvy >> 1)) * pitch]; + dst = current; -static int svq1_decode_delta_block (MpegEncContext *s, GetBitContext *bitbuf, - uint8_t *current, uint8_t *previous, int pitch, - svq1_pmv *motion, int x, int y) { - uint32_t block_type; - int result = 0; - - /* get block type */ - block_type = get_vlc2(bitbuf, svq1_block_type.table, 2, 2); - - /* reset motion vectors */ - if (block_type == SVQ1_BLOCK_SKIP || block_type == SVQ1_BLOCK_INTRA) { - motion[0].x = - motion[0].y = - motion[(x / 8) + 2].x = - motion[(x / 8) + 2].y = - motion[(x / 8) + 3].x = - motion[(x / 8) + 3].y = 0; - } - - switch (block_type) { - case SVQ1_BLOCK_SKIP: - svq1_skip_block (current, previous, pitch, x, y); - break; - - case SVQ1_BLOCK_INTER: - result = svq1_motion_inter_block (s, bitbuf, current, previous, pitch, motion, x, y); + s->dsp.put_pixels_tab[1][((mvy & 1) << 1) | (mvx & 1)](dst, src, pitch, 8); - if (result != 0) - { - av_dlog(s->avctx, "Error in svq1_motion_inter_block %i\n", result); - break; + /* select next block */ + if (i & 1) + current += 8 * (pitch - 1); + else + current += 8; } - result = svq1_decode_block_non_intra (bitbuf, current, pitch); - break; - case SVQ1_BLOCK_INTER_4V: - result = svq1_motion_inter_4v_block (s, bitbuf, current, previous, pitch, motion, x, y); + return 0; +} - if (result != 0) - { - av_dlog(s->avctx, "Error in svq1_motion_inter_4v_block %i\n", result); - break; +static int svq1_decode_delta_block(MpegEncContext *s, GetBitContext *bitbuf, + uint8_t *current, uint8_t *previous, + int pitch, svq1_pmv *motion, int x, int y) +{ + uint32_t block_type; + int result = 0; + + /* get block type */ + block_type = get_vlc2(bitbuf, svq1_block_type.table, 2, 2); + + /* reset motion vectors */ + if (block_type == SVQ1_BLOCK_SKIP || block_type == SVQ1_BLOCK_INTRA) { + motion[0].x = + motion[0].y = + motion[x / 8 + 2].x = + motion[x / 8 + 2].y = + motion[x / 8 + 3].x = + motion[x / 8 + 3].y = 0; } - result = svq1_decode_block_non_intra (bitbuf, current, pitch); - break; - case SVQ1_BLOCK_INTRA: - result = svq1_decode_block_intra (bitbuf, current, pitch); - break; - } + switch (block_type) { + case SVQ1_BLOCK_SKIP: + svq1_skip_block(current, previous, pitch, x, y); + break; - return result; -} + case SVQ1_BLOCK_INTER: + result = svq1_motion_inter_block(s, bitbuf, current, previous, + pitch, motion, x, y); -static void svq1_parse_string (GetBitContext *bitbuf, uint8_t *out) { - uint8_t seed; - int i; + if (result != 0) { + av_dlog(s->avctx, "Error in svq1_motion_inter_block %i\n", result); + break; + } + result = svq1_decode_block_non_intra(bitbuf, current, pitch); + break; - out[0] = get_bits (bitbuf, 8); + case SVQ1_BLOCK_INTER_4V: + result = svq1_motion_inter_4v_block(s, bitbuf, current, previous, + pitch, motion, x, y); - seed = string_table[out[0]]; + if (result != 0) { + av_dlog(s->avctx, + "Error in svq1_motion_inter_4v_block %i\n", result); + break; + } + result = svq1_decode_block_non_intra(bitbuf, current, pitch); + break; - for (i=1; i <= out[0]; i++) { - out[i] = get_bits (bitbuf, 8) ^ seed; - seed = string_table[out[i] ^ seed]; - } + case SVQ1_BLOCK_INTRA: + result = svq1_decode_block_intra(bitbuf, current, pitch); + break; + } + + return result; } -static int svq1_decode_frame_header (GetBitContext *bitbuf,MpegEncContext *s) { - int frame_size_code; +static void svq1_parse_string(GetBitContext *bitbuf, uint8_t *out) +{ + uint8_t seed; + int i; + + out[0] = get_bits(bitbuf, 8); + seed = string_table[out[0]]; - skip_bits(bitbuf, 8); /* temporal_reference */ + for (i = 1; i <= out[0]; i++) { + out[i] = get_bits(bitbuf, 8) ^ seed; + seed = string_table[out[i] ^ seed]; + } +} - /* frame type */ - s->pict_type= get_bits (bitbuf, 2)+1; - if(s->pict_type==4) - return -1; +static int svq1_decode_frame_header(GetBitContext *bitbuf, MpegEncContext *s) +{ + int frame_size_code; - if (s->pict_type == AV_PICTURE_TYPE_I) { + skip_bits(bitbuf, 8); /* temporal_reference */ - /* unknown fields */ - if (s->f_code == 0x50 || s->f_code == 0x60) { - int csum = get_bits (bitbuf, 16); + /* frame type */ + s->pict_type = get_bits(bitbuf, 2) + 1; + if (s->pict_type == 4) + return -1; - csum = ff_svq1_packet_checksum (bitbuf->buffer, bitbuf->size_in_bits>>3, csum); + if (s->pict_type == AV_PICTURE_TYPE_I) { + /* unknown fields */ + if (s->f_code == 0x50 || s->f_code == 0x60) { + int csum = get_bits(bitbuf, 16); - av_dlog(s->avctx, "%s checksum (%02x) for packet data\n", - (csum == 0) ? "correct" : "incorrect", csum); - } + csum = ff_svq1_packet_checksum(bitbuf->buffer, + bitbuf->size_in_bits >> 3, + csum); - if ((s->f_code ^ 0x10) >= 0x50) { - uint8_t msg[256]; + av_dlog(s->avctx, "%s checksum (%02x) for packet data\n", + (csum == 0) ? "correct" : "incorrect", csum); + } - svq1_parse_string (bitbuf, msg); + if ((s->f_code ^ 0x10) >= 0x50) { + uint8_t msg[256]; - av_log(s->avctx, AV_LOG_INFO, "embedded message: \"%s\"\n", (char *) msg); - } + svq1_parse_string(bitbuf, msg); - skip_bits (bitbuf, 2); - skip_bits (bitbuf, 2); - skip_bits1 (bitbuf); + av_log(s->avctx, AV_LOG_ERROR, + "embedded message: \"%s\"\n", (char *)msg); + } - /* load frame size */ - frame_size_code = get_bits (bitbuf, 3); + skip_bits(bitbuf, 2); + skip_bits(bitbuf, 2); + skip_bits1(bitbuf); - if (frame_size_code == 7) { - /* load width, height (12 bits each) */ - s->width = get_bits (bitbuf, 12); - s->height = get_bits (bitbuf, 12); + /* load frame size */ + frame_size_code = get_bits(bitbuf, 3); - if (!s->width || !s->height) - return -1; - } else { - /* get width, height from table */ - s->width = ff_svq1_frame_size_table[frame_size_code].width; - s->height = ff_svq1_frame_size_table[frame_size_code].height; + if (frame_size_code == 7) { + /* load width, height (12 bits each) */ + s->width = get_bits(bitbuf, 12); + s->height = get_bits(bitbuf, 12); + + if (!s->width || !s->height) + return -1; + } else { + /* get width, height from table */ + s->width = ff_svq1_frame_size_table[frame_size_code].width; + s->height = ff_svq1_frame_size_table[frame_size_code].height; + } } - } - /* unknown fields */ - if (get_bits1 (bitbuf) == 1) { - skip_bits1 (bitbuf); /* use packet checksum if (1) */ - skip_bits1 (bitbuf); /* component checksums after image data if (1) */ + /* unknown fields */ + if (get_bits1(bitbuf) == 1) { + skip_bits1(bitbuf); /* use packet checksum if (1) */ + skip_bits1(bitbuf); /* component checksums after image data if (1) */ - if (get_bits (bitbuf, 2) != 0) - return -1; - } + if (get_bits(bitbuf, 2) != 0) + return -1; + } - if (get_bits1 (bitbuf) == 1) { - skip_bits1 (bitbuf); - skip_bits (bitbuf, 4); - skip_bits1 (bitbuf); - skip_bits (bitbuf, 2); + if (get_bits1(bitbuf) == 1) { + skip_bits1(bitbuf); + skip_bits(bitbuf, 4); + skip_bits1(bitbuf); + skip_bits(bitbuf, 2); - while (get_bits1 (bitbuf) == 1) { - skip_bits (bitbuf, 8); + while (get_bits1(bitbuf) == 1) + skip_bits(bitbuf, 8); } - } - return 0; + return 0; } -static int svq1_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, - AVPacket *avpkt) +static int svq1_decode_frame(AVCodecContext *avctx, void *data, + int *data_size, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; - MpegEncContext *s=avctx->priv_data; - uint8_t *current, *previous; - int result, i, x, y, width, height; - AVFrame *pict = data; - svq1_pmv *pmv; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + MpegEncContext *s = avctx->priv_data; + uint8_t *current, *previous; + int result, i, x, y, width, height; + AVFrame *pict = data; + svq1_pmv *pmv; - /* initialize bit buffer */ - init_get_bits(&s->gb,buf,buf_size*8); + /* initialize bit buffer */ + init_get_bits(&s->gb, buf, buf_size * 8); - /* decode frame header */ - s->f_code = get_bits (&s->gb, 22); + /* decode frame header */ + s->f_code = get_bits(&s->gb, 22); - if ((s->f_code & ~0x70) || !(s->f_code & 0x60)) - return -1; + if ((s->f_code & ~0x70) || !(s->f_code & 0x60)) + return -1; - /* swap some header bytes (why?) */ - if (s->f_code != 0x20) { - uint32_t *src = (uint32_t *) (buf + 4); + /* swap some header bytes (why?) */ + if (s->f_code != 0x20) { + uint32_t *src = (uint32_t *)(buf + 4); - if (buf_size < 36) - return AVERROR_INVALIDDATA; + if (buf_size < 36) + return AVERROR_INVALIDDATA; - for (i=0; i < 4; i++) { - src[i] = ((src[i] << 16) | (src[i] >> 16)) ^ src[7 - i]; + for (i = 0; i < 4; i++) + src[i] = ((src[i] << 16) | (src[i] >> 16)) ^ src[7 - i]; } - } - result = svq1_decode_frame_header (&s->gb, s); + result = svq1_decode_frame_header(&s->gb, s); - if (result != 0) - { - av_dlog(s->avctx, "Error in svq1_decode_frame_header %i\n",result); - return result; - } - avcodec_set_dimensions(avctx, s->width, s->height); - - //FIXME this avoids some confusion for "B frames" without 2 references - //this should be removed after libavcodec can handle more flexible picture types & ordering - if(s->pict_type==AV_PICTURE_TYPE_B && s->last_picture_ptr==NULL) return buf_size; - - if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==AV_PICTURE_TYPE_B) - ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=AV_PICTURE_TYPE_I) - || avctx->skip_frame >= AVDISCARD_ALL) - return buf_size; - - if(ff_MPV_frame_start(s, avctx) < 0) - return -1; - - pmv = av_malloc((FFALIGN(s->width, 16)/8 + 3) * sizeof(*pmv)); - if (!pmv) - return -1; - - /* decode y, u and v components */ - for (i=0; i < 3; i++) { - int linesize; - if (i == 0) { - width = FFALIGN(s->width, 16); - height = FFALIGN(s->height, 16); - linesize= s->linesize; - } else { - if(s->flags&CODEC_FLAG_GRAY) break; - width = FFALIGN(s->width/4, 16); - height = FFALIGN(s->height/4, 16); - linesize= s->uvlinesize; + if (result != 0) { + av_dlog(s->avctx, "Error in svq1_decode_frame_header %i\n", result); + return result; } + avcodec_set_dimensions(avctx, s->width, s->height); + + /* FIXME: This avoids some confusion for "B frames" without 2 references. + * This should be removed after libavcodec can handle more flexible + * picture types & ordering */ + if (s->pict_type == AV_PICTURE_TYPE_B && s->last_picture_ptr == NULL) + return buf_size; + + if ((avctx->skip_frame >= AVDISCARD_NONREF && + s->pict_type == AV_PICTURE_TYPE_B) || + (avctx->skip_frame >= AVDISCARD_NONKEY && + s->pict_type != AV_PICTURE_TYPE_I) || + avctx->skip_frame >= AVDISCARD_ALL) + return buf_size; + + if (ff_MPV_frame_start(s, avctx) < 0) + return -1; - current = s->current_picture.f.data[i]; - - if(s->pict_type==AV_PICTURE_TYPE_B){ - previous = s->next_picture.f.data[i]; - }else{ - previous = s->last_picture.f.data[i]; - } + pmv = av_malloc((FFALIGN(s->width, 16) / 8 + 3) * sizeof(*pmv)); + if (!pmv) + return -1; - if (s->pict_type == AV_PICTURE_TYPE_I) { - /* keyframe */ - for (y=0; y < height; y+=16) { - for (x=0; x < width; x+=16) { - result = svq1_decode_block_intra (&s->gb, ¤t[x], linesize); - if (result != 0) - { - av_log(s->avctx, AV_LOG_ERROR, "Error in svq1_decode_block %i (keyframe)\n",result); - goto err; - } - } - current += 16*linesize; - } - } else { - /* delta frame */ - memset (pmv, 0, ((width / 8) + 3) * sizeof(svq1_pmv)); - - for (y=0; y < height; y+=16) { - for (x=0; x < width; x+=16) { - result = svq1_decode_delta_block (s, &s->gb, ¤t[x], previous, - linesize, pmv, x, y); - if (result != 0) - { - av_dlog(s->avctx, "Error in svq1_decode_delta_block %i\n",result); - goto err; - } + /* decode y, u and v components */ + for (i = 0; i < 3; i++) { + int linesize; + if (i == 0) { + width = FFALIGN(s->width, 16); + height = FFALIGN(s->height, 16); + linesize = s->linesize; + } else { + if (s->flags & CODEC_FLAG_GRAY) + break; + width = FFALIGN(s->width / 4, 16); + height = FFALIGN(s->height / 4, 16); + linesize = s->uvlinesize; } - pmv[0].x = - pmv[0].y = 0; - - current += 16*linesize; - } + current = s->current_picture.f.data[i]; + + if (s->pict_type == AV_PICTURE_TYPE_B) + previous = s->next_picture.f.data[i]; + else + previous = s->last_picture.f.data[i]; + + if (s->pict_type == AV_PICTURE_TYPE_I) { + /* keyframe */ + for (y = 0; y < height; y += 16) { + for (x = 0; x < width; x += 16) { + result = svq1_decode_block_intra(&s->gb, ¤t[x], + linesize); + if (result != 0) { + av_log(s->avctx, AV_LOG_INFO, + "Error in svq1_decode_block %i (keyframe)\n", + result); + goto err; + } + } + current += 16 * linesize; + } + } else { + /* delta frame */ + memset(pmv, 0, ((width / 8) + 3) * sizeof(svq1_pmv)); + + for (y = 0; y < height; y += 16) { + for (x = 0; x < width; x += 16) { + result = svq1_decode_delta_block(s, &s->gb, ¤t[x], + previous, linesize, + pmv, x, y); + if (result != 0) { + av_dlog(s->avctx, + "Error in svq1_decode_delta_block %i\n", + result); + goto err; + } + } + + pmv[0].x = + pmv[0].y = 0; + + current += 16 * linesize; + } + } } - } - *pict = s->current_picture.f; + *pict = s->current_picture.f; + ff_MPV_frame_end(s); - ff_MPV_frame_end(s); + *data_size = sizeof(AVFrame); + result = buf_size; - *data_size=sizeof(AVFrame); - result = buf_size; err: - av_free(pmv); - return result; + av_free(pmv); + return result; } static av_cold int svq1_decode_init(AVCodecContext *avctx) @@ -713,47 +726,52 @@ static av_cold int svq1_decode_init(AVCodecContext *avctx) ff_MPV_decode_defaults(s); - s->avctx = avctx; - s->width = (avctx->width+3)&~3; - s->height = (avctx->height+3)&~3; - s->codec_id= avctx->codec->id; - avctx->pix_fmt = AV_PIX_FMT_YUV410P; - avctx->has_b_frames= 1; // not true, but DP frames and these behave like unidirectional b frames - s->flags= avctx->flags; - if (ff_MPV_common_init(s) < 0) return -1; + s->avctx = avctx; + s->width = avctx->width + 3 & ~3; + s->height = avctx->height + 3 & ~3; + s->codec_id = avctx->codec->id; + avctx->pix_fmt = AV_PIX_FMT_YUV410P; + /* Not true, but DP frames and these behave like unidirectional B-frames. */ + avctx->has_b_frames = 1; + s->flags = avctx->flags; + if (ff_MPV_common_init(s) < 0) + return -1; INIT_VLC_STATIC(&svq1_block_type, 2, 4, - &ff_svq1_block_type_vlc[0][1], 2, 1, - &ff_svq1_block_type_vlc[0][0], 2, 1, 6); + &ff_svq1_block_type_vlc[0][1], 2, 1, + &ff_svq1_block_type_vlc[0][0], 2, 1, 6); INIT_VLC_STATIC(&svq1_motion_component, 7, 33, - &ff_mvtab[0][1], 2, 1, - &ff_mvtab[0][0], 2, 1, 176); + &ff_mvtab[0][1], 2, 1, + &ff_mvtab[0][0], 2, 1, 176); for (i = 0; i < 6; i++) { - static const uint8_t sizes[2][6] = {{14, 10, 14, 18, 16, 18}, {10, 10, 14, 14, 14, 16}}; + static const uint8_t sizes[2][6] = { { 14, 10, 14, 18, 16, 18 }, + { 10, 10, 14, 14, 14, 16 } }; static VLC_TYPE table[168][2]; - svq1_intra_multistage[i].table = &table[offset]; + svq1_intra_multistage[i].table = &table[offset]; svq1_intra_multistage[i].table_allocated = sizes[0][i]; - offset += sizes[0][i]; + offset += sizes[0][i]; init_vlc(&svq1_intra_multistage[i], 3, 8, - &ff_svq1_intra_multistage_vlc[i][0][1], 2, 1, - &ff_svq1_intra_multistage_vlc[i][0][0], 2, 1, INIT_VLC_USE_NEW_STATIC); - svq1_inter_multistage[i].table = &table[offset]; + &ff_svq1_intra_multistage_vlc[i][0][1], 2, 1, + &ff_svq1_intra_multistage_vlc[i][0][0], 2, 1, + INIT_VLC_USE_NEW_STATIC); + svq1_inter_multistage[i].table = &table[offset]; svq1_inter_multistage[i].table_allocated = sizes[1][i]; - offset += sizes[1][i]; + offset += sizes[1][i]; init_vlc(&svq1_inter_multistage[i], 3, 8, - &ff_svq1_inter_multistage_vlc[i][0][1], 2, 1, - &ff_svq1_inter_multistage_vlc[i][0][0], 2, 1, INIT_VLC_USE_NEW_STATIC); + &ff_svq1_inter_multistage_vlc[i][0][1], 2, 1, + &ff_svq1_inter_multistage_vlc[i][0][0], 2, 1, + INIT_VLC_USE_NEW_STATIC); } INIT_VLC_STATIC(&svq1_intra_mean, 8, 256, - &ff_svq1_intra_mean_vlc[0][1], 4, 2, - &ff_svq1_intra_mean_vlc[0][0], 4, 2, 632); + &ff_svq1_intra_mean_vlc[0][1], 4, 2, + &ff_svq1_intra_mean_vlc[0][0], 4, 2, 632); INIT_VLC_STATIC(&svq1_inter_mean, 9, 512, - &ff_svq1_inter_mean_vlc[0][1], 4, 2, - &ff_svq1_inter_mean_vlc[0][0], 4, 2, 1434); + &ff_svq1_inter_mean_vlc[0][1], 4, 2, + &ff_svq1_inter_mean_vlc[0][0], 4, 2, 1434); return 0; } @@ -766,7 +784,6 @@ static av_cold int svq1_decode_end(AVCodecContext *avctx) return 0; } - AVCodec ff_svq1_decoder = { .name = "svq1", .type = AVMEDIA_TYPE_VIDEO, @@ -777,6 +794,7 @@ AVCodec ff_svq1_decoder = { .decode = svq1_decode_frame, .capabilities = CODEC_CAP_DR1, .flush = ff_mpeg_flush, - .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV410P, AV_PIX_FMT_NONE }, + .pix_fmts = (const enum PixelFormat[]) { AV_PIX_FMT_YUV410P, + AV_PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), }; |