X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavcodec%2F4xm.c;h=0fc7a2e6d8c5ce7e4d79e99401968de03496eea4;hb=78acb9e74b399588f7321ff87acd6dbeef6e387a;hp=682143340c8bc423362e777520467a7569b7096e;hpb=e4e70d2e2db9d47d6e85a5136aad0147eb8c5809;p=ffmpeg diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 682143340c8..0fc7a2e6d8c 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -2,29 +2,32 @@ * 4XM codec * Copyright (c) 2003 Michael Niedermayer * - * This library is free software; you can redistribute it and/or + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - + /** * @file 4xm.c * 4XM codec. */ - + #include "avcodec.h" #include "dsputil.h" -#include "mpegvideo.h" +#include "bitstream.h" +#include "bytestream.h" //#undef NDEBUG //#include @@ -34,7 +37,8 @@ #define CFRAME_BUFFER_COUNT 100 -static const uint8_t block_type_tab[4][8][2]={ +static const uint8_t block_type_tab[2][4][8][2]={ + { { //{8,4,2}x{8,4,2} { 0,1}, { 2,2}, { 6,3}, {14,4}, {30,5}, {31,5}, { 0,0} },{ //{8,4}x1 @@ -44,6 +48,17 @@ static const uint8_t block_type_tab[4][8][2]={ },{ //1x2, 2x1 { 0,1}, { 0,0}, { 0,0}, { 2,2}, { 6,3}, {14,4}, {15,4} } + },{ + { //{8,4,2}x{8,4,2} + { 1,2}, { 4,3}, { 5,3}, {0,2}, {6,3}, {7,3}, {0,0} + },{//{8,4}x1 + { 1,2}, { 0,0}, { 2,2}, {0,2}, {6,3}, {7,3}, {0,0} + },{//1x{8,4} + { 1,2}, { 2,2}, { 0,0}, {0,2}, {6,3}, {7,3}, {0,0} + },{//1x2, 2x1 + { 1,2}, { 0,0}, { 0,0}, {0,2}, {2,2}, {6,3}, {7,3} + } + } }; static const uint8_t size2index[4][4]={ @@ -100,12 +115,12 @@ static const uint8_t dequant_table[64]={ 20, 35, 34, 32, 31, 22, 15, 8, }; -static VLC block_type_vlc[4]; +static VLC block_type_vlc[2][4]; typedef struct CFrameBuffer{ - int allocated_size; - int size; + unsigned int allocated_size; + unsigned int size; int id; uint8_t *data; }CFrameBuffer; @@ -116,14 +131,15 @@ typedef struct FourXContext{ AVFrame current_picture, last_picture; GetBitContext pre_gb; ///< ac/dc prefix GetBitContext gb; - uint8_t *bytestream; - uint16_t *wordstream; + const uint8_t *bytestream; + const uint16_t *wordstream; int mv[256]; VLC pre_vlc; int last_dc; - DCTELEM __align8 block[6][64]; + DECLARE_ALIGNED_8(DCTELEM, block[6][64]); uint8_t *bitstream_buffer; - int bitstream_buffer_size; + unsigned int bitstream_buffer_size; + int version; CFrameBuffer cfrm[CFRAME_BUFFER_COUNT]; } FourXContext; @@ -141,7 +157,7 @@ static void idct(DCTELEM block[64]){ int z5, z10, z11, z12, z13; int i; int temp[64]; - + for(i=0; i<8; i++){ tmp10 = block[8*0 + i] + block[8*4 + i]; tmp11 = block[8*0 + i] - block[8*4 + i]; @@ -153,7 +169,7 @@ static void idct(DCTELEM block[64]){ tmp3 = tmp10 - tmp13; tmp1 = tmp11 + tmp12; tmp2 = tmp11 - tmp12; - + z13 = block[8*5 + i] + block[8*3 + i]; z10 = block[8*5 + i] - block[8*3 + i]; z11 = block[8*1 + i] + block[8*7 + i]; @@ -179,7 +195,7 @@ static void idct(DCTELEM block[64]){ temp[8*4 + i] = tmp3 + tmp4; temp[8*3 + i] = tmp3 - tmp4; } - + for(i=0; i<8*8; i+=8){ tmp10 = temp[0 + i] + temp[4 + i]; tmp11 = temp[0 + i] - temp[4 + i]; @@ -219,18 +235,13 @@ static void idct(DCTELEM block[64]){ } } -static void init_vlcs(FourXContext *f){ - static int done = 0; +static av_cold void init_vlcs(FourXContext *f){ int i; - if (!done) { - done = 1; - - for(i=0; i<4; i++){ - init_vlc(&block_type_vlc[i], BLOCK_TYPE_VLC_BITS, 7, - &block_type_tab[i][0][1], 2, 1, - &block_type_tab[i][0][0], 2, 1); - } + for(i=0; i<8; i++){ + init_vlc(&block_type_vlc[0][i], BLOCK_TYPE_VLC_BITS, 7, + &block_type_tab[0][i][0][1], 2, 1, + &block_type_tab[0][i][0][0], 2, 1, 1); } } @@ -238,7 +249,10 @@ static void init_mv(FourXContext *f){ int i; for(i=0; i<256; i++){ - f->mv[i] = mv[i][0] + mv[i][1]*f->current_picture.linesize[0]/2; + if(f->version>1) + f->mv[i] = mv[i][0] + mv[i][1] *f->current_picture.linesize[0]/2; + else + f->mv[i] = (i&15) - 8 + ((i>>4)-8)*f->current_picture.linesize[0]/2; } } @@ -286,12 +300,18 @@ static inline void mcdc(uint16_t *dst, uint16_t *src, int log2w, int h, int stri static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src, int log2w, int log2h, int stride){ const int index= size2index[log2h][log2w]; const int h= 1<gb, block_type_vlc[index].table, BLOCK_TYPE_VLC_BITS, 1); - + int code= get_vlc2(&f->gb, block_type_vlc[1-(f->version>1)][index].table, BLOCK_TYPE_VLC_BITS, 1); + uint16_t *start= (uint16_t*)f->last_picture.data[0]; + uint16_t *end= start + stride*(f->avctx->height-h+1) - (1<=0 && code<=6); if(code == 0){ src += f->mv[ *f->bytestream++ ]; + if(start > src || src > end){ + av_log(f->avctx, AV_LOG_ERROR, "mv out of pic\n"); + return; + } mcdc(dst, src, log2w, h, stride, 1, 0); }else if(code == 1){ log2h--; @@ -301,8 +321,14 @@ static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src, int lo log2w--; decode_p_block(f, dst , src , log2w, log2h, stride); decode_p_block(f, dst + (1<version<2){ + mcdc(dst, src, log2w, h, stride, 1, 0); }else if(code == 4){ src += f->mv[ *f->bytestream++ ]; + if(start > src || src > end){ + av_log(f->avctx, AV_LOG_ERROR, "mv out of pic\n"); + return; + } mcdc(dst, src, log2w, h, stride, 1, le2me_16(*f->wordstream++)); }else if(code == 5){ mcdc(dst, src, log2w, h, stride, 0, le2me_16(*f->wordstream++)); @@ -317,55 +343,69 @@ static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src, int lo } } -static int get32(void *p){ - return le2me_32(*(uint32_t*)p); -} - -static int decode_p_frame(FourXContext *f, uint8_t *buf, int length){ +static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length){ int x, y; const int width= f->avctx->width; const int height= f->avctx->height; uint16_t *src= (uint16_t*)f->last_picture.data[0]; uint16_t *dst= (uint16_t*)f->current_picture.data[0]; const int stride= f->current_picture.linesize[0]>>1; - const int bitstream_size= get32(buf+8); - const int bytestream_size= get32(buf+16); - const int wordstream_size= get32(buf+12); - - if(bitstream_size+ bytestream_size+ wordstream_size + 20 != length) - printf("lengths %d %d %d %d\n", bitstream_size, bytestream_size, wordstream_size, + unsigned int bitstream_size, bytestream_size, wordstream_size, extra; + + if(f->version>1){ + extra=20; + bitstream_size= AV_RL32(buf+8); + wordstream_size= AV_RL32(buf+12); + bytestream_size= AV_RL32(buf+16); + }else{ + extra=0; + bitstream_size = AV_RL16(buf-4); + wordstream_size= AV_RL16(buf-2); + bytestream_size= FFMAX(length - bitstream_size - wordstream_size, 0); + } + + if(bitstream_size+ bytestream_size+ wordstream_size + extra != length + || bitstream_size > (1<<26) + || bytestream_size > (1<<26) + || wordstream_size > (1<<26) + ){ + av_log(f->avctx, AV_LOG_ERROR, "lengths %d %d %d %d\n", bitstream_size, bytestream_size, wordstream_size, bitstream_size+ bytestream_size+ wordstream_size - length); - + return -1; + } + f->bitstream_buffer= av_fast_realloc(f->bitstream_buffer, &f->bitstream_buffer_size, bitstream_size + FF_INPUT_BUFFER_PADDING_SIZE); - f->dsp.bswap_buf((uint32_t*)f->bitstream_buffer, (uint32_t*)(buf + 20), bitstream_size/4); + f->dsp.bswap_buf((uint32_t*)f->bitstream_buffer, (const uint32_t*)(buf + extra), bitstream_size/4); init_get_bits(&f->gb, f->bitstream_buffer, 8*bitstream_size); - f->wordstream= (uint16_t*)(buf + 20 + bitstream_size); - f->bytestream= buf + 20 + bitstream_size + wordstream_size; - + f->wordstream= (const uint16_t*)(buf + extra + bitstream_size); + f->bytestream= buf + extra + bitstream_size + wordstream_size; + init_mv(f); - + for(y=0; ygb)+31)/32*4) - printf(" %d %d %d bytes left\n", - bitstream_size - (get_bits_count(&f->gb)+31)/32*4, - bytestream_size - (f->bytestream - (buf + 20 + bitstream_size + wordstream_size)), - wordstream_size - (((uint8_t*)f->wordstream) - (buf + 20 + bitstream_size)) + + if( bitstream_size != (get_bits_count(&f->gb)+31)/32*4 + || (((const char*)f->wordstream - (const char*)buf + 2)&~2) != extra + bitstream_size + wordstream_size + || (((const char*)f->bytestream - (const char*)buf + 3)&~3) != extra + bitstream_size + wordstream_size + bytestream_size) + av_log(f->avctx, AV_LOG_ERROR, " %d %td %td bytes left\n", + bitstream_size - (get_bits_count(&f->gb)+31)/32*4, + -(((const char*)f->bytestream - (const char*)buf + 3)&~3) + (extra + bitstream_size + wordstream_size + bytestream_size), + -(((const char*)f->wordstream - (const char*)buf + 2)&~2) + (extra + bitstream_size + wordstream_size) ); - + return 0; } /** * decode block and dequantize. - * Note this is allmost identical to mjpeg + * Note this is almost identical to MJPEG. */ static int decode_i_block(FourXContext *f, DCTELEM *block){ int code, i, j, level, val; @@ -373,7 +413,7 @@ static int decode_i_block(FourXContext *f, DCTELEM *block){ /* DC coef */ val = get_vlc2(&f->pre_gb, f->pre_vlc.table, ACDC_VLC_BITS, 3); if (val>>4){ - printf("error dc run != 0\n"); + av_log(f->avctx, AV_LOG_ERROR, "error dc run != 0\n"); } if(val) @@ -386,7 +426,7 @@ static int decode_i_block(FourXContext *f, DCTELEM *block){ i = 1; for(;;) { code = get_vlc2(&f->pre_gb, f->pre_vlc.table, ACDC_VLC_BITS, 3); - + /* EOB */ if (code == 0) break; @@ -396,7 +436,7 @@ static int decode_i_block(FourXContext *f, DCTELEM *block){ level = get_xbits(&f->gb, code & 0xf); i += code >> 4; if (i >= 64) { - printf("run %d oveflow\n", i); + av_log(f->avctx, AV_LOG_ERROR, "run %d oveflow\n", i); return 0; } @@ -416,7 +456,7 @@ static inline void idct_put(FourXContext *f, int x, int y){ int stride= f->current_picture.linesize[0]>>1; int i; uint16_t *dst = ((uint16_t*)f->current_picture.data[0]) + y * stride + x; - + for(i=0; i<4; i++){ block[i][0] += 0x80*8*8; idct(block[i]); @@ -426,6 +466,11 @@ static inline void idct_put(FourXContext *f, int x, int y){ for(i=4; i<6; i++) idct(block[i]); } +/* Note transform is: +y= ( 1b + 4g + 2r)/14 +cb=( 3b - 2g - 1r)/14 +cr=(-1b - 4g + 5r)/14 +*/ for(y=0; y<8; y++){ for(x=0; x<8; x++){ DCTELEM *temp= block[(x>>2) + 2*(y>>2)] + 2*(x&3) + 2*8*(y&3); //FIXME optimize @@ -433,9 +478,9 @@ static inline void idct_put(FourXContext *f, int x, int y){ int cr= block[5][x + 8*y]; int cg= (cb + cr)>>1; int y; - + cb+=cb; - + y = temp[0]; dst[0 ]= ((y+cb)>>3) + (((y-cg)&0xFC)<<3) + (((y+cr)&0xF8)<<8); y = temp[1]; @@ -452,27 +497,27 @@ static inline void idct_put(FourXContext *f, int x, int y){ static int decode_i_mb(FourXContext *f){ int i; - + f->dsp.clear_blocks(f->block[0]); - + for(i=0; i<6; i++){ if(decode_i_block(f, f->block[i]) < 0) return -1; } - + return 0; } -static uint8_t *read_huffman_tables(FourXContext *f, uint8_t * const buf){ +static const uint8_t *read_huffman_tables(FourXContext *f, const uint8_t * const buf){ int frequency[512]; uint8_t flag[512]; int up[512]; uint8_t len_tab[257]; int bits_tab[257]; int start, end; - uint8_t *ptr= buf; + const uint8_t *ptr= buf; int j; - + memset(frequency, 0, sizeof(frequency)); memset(up, -1, sizeof(up)); @@ -480,23 +525,19 @@ static uint8_t *read_huffman_tables(FourXContext *f, uint8_t * const buf){ end= *ptr++; for(;;){ int i; - + for(i=start; i<=end; i++){ frequency[i]= *ptr++; -// printf("%d %d %d\n", start, end, frequency[i]); } start= *ptr++; if(start==0) break; - + end= *ptr++; } frequency[256]=1; - while((ptr - buf)&3) ptr++; // 4byte align + while((ptr - buf)&3) ptr++; // 4byte align -// for(j=0; j<16; j++) -// printf("%2X", ptr[j]); - for(j=257; j<512; j++){ int min_freq[2]= {256*256, 256*256}; int smallest[2]= {0, 0}; @@ -513,11 +554,11 @@ static uint8_t *read_huffman_tables(FourXContext *f, uint8_t * const buf){ } } if(min_freq[1] == 256*256) break; - + frequency[j]= min_freq[0] + min_freq[1]; flag[ smallest[0] ]= 0; flag[ smallest[1] ]= 1; - up[ smallest[0] ]= + up[ smallest[0] ]= up[ smallest[1] ]= j; frequency[ smallest[0] ]= frequency[ smallest[1] ]= 0; } @@ -530,34 +571,81 @@ static uint8_t *read_huffman_tables(FourXContext *f, uint8_t * const buf){ for(node= j; up[node] != -1; node= up[node]){ bits += flag[node]< 31) printf("vlc length overflow\n"); //can this happen at all ? + if(len > 31) av_log(f->avctx, AV_LOG_ERROR, "vlc length overflow\n"); //can this happen at all ? } - + bits_tab[j]= bits; len_tab[j]= len; } - - init_vlc(&f->pre_vlc, ACDC_VLC_BITS, 257, + + init_vlc(&f->pre_vlc, ACDC_VLC_BITS, 257, len_tab , 1, 1, - bits_tab, 4, 4); - + bits_tab, 4, 4, 0); + return ptr; } -static int decode_i_frame(FourXContext *f, uint8_t *buf, int length){ +static int mix(int c0, int c1){ + int blue = 2*(c0&0x001F) + (c1&0x001F); + int green= (2*(c0&0x03E0) + (c1&0x03E0))>>5; + int red = 2*(c0>>10) + (c1>>10); + return red/3*1024 + green/3*32 + blue/3; +} + +static int decode_i2_frame(FourXContext *f, const uint8_t *buf, int length){ + int x, y, x2, y2; + const int width= f->avctx->width; + const int height= f->avctx->height; + uint16_t *dst= (uint16_t*)f->current_picture.data[0]; + const int stride= f->current_picture.linesize[0]>>1; + + for(y=0; y>2) + 8*(y2>>2); + dst[y2*stride+x2]= color[(bits>>index)&3]; + } + } + dst+=16; + } + dst += 16*stride - width; + } + + return 0; +} + +static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length){ int x, y; const int width= f->avctx->width; const int height= f->avctx->height; uint16_t *dst= (uint16_t*)f->current_picture.data[0]; const int stride= f->current_picture.linesize[0]>>1; - const int bitstream_size= get32(buf); - const int token_count __attribute__((unused)) = get32(buf + bitstream_size + 8); - int prestream_size= 4*get32(buf + bitstream_size + 4); - uint8_t *prestream= buf + bitstream_size + 12; - - if(prestream_size + bitstream_size + 12 != length) - fprintf(stderr, "size missmatch %d %d %d\n", prestream_size, bitstream_size, length); - + const unsigned int bitstream_size= AV_RL32(buf); + const int token_count av_unused = AV_RL32(buf + bitstream_size + 8); + unsigned int prestream_size= 4*AV_RL32(buf + bitstream_size + 4); + const uint8_t *prestream= buf + bitstream_size + 12; + + if(prestream_size + bitstream_size + 12 != length + || bitstream_size > (1<<26) + || prestream_size > (1<<26)){ + av_log(f->avctx, AV_LOG_ERROR, "size mismatch %d %d %d\n", prestream_size, bitstream_size, length); + return -1; + } + prestream= read_huffman_tables(f, prestream); init_get_bits(&f->gb, buf + 4, 8*bitstream_size); @@ -565,11 +653,11 @@ static int decode_i_frame(FourXContext *f, uint8_t *buf, int length){ prestream_size= length + buf - prestream; f->bitstream_buffer= av_fast_realloc(f->bitstream_buffer, &f->bitstream_buffer_size, prestream_size + FF_INPUT_BUFFER_PADDING_SIZE); - f->dsp.bswap_buf((uint32_t*)f->bitstream_buffer, (uint32_t*)prestream, prestream_size/4); + f->dsp.bswap_buf((uint32_t*)f->bitstream_buffer, (const uint32_t*)prestream, prestream_size/4); init_get_bits(&f->pre_gb, f->bitstream_buffer, 8*prestream_size); f->last_dc= 0*128*8*8; - + for(y=0; ypre_gb, f->pre_vlc.table, ACDC_VLC_BITS, 3) != 256) - printf("end missmatch\n"); - + av_log(f->avctx, AV_LOG_ERROR, "end mismatch\n"); + return 0; } -static int decode_frame(AVCodecContext *avctx, +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { FourXContext * const f = avctx->priv_data; AVFrame *picture = data; AVFrame *p, temp; int i, frame_4cc, frame_size; - *data_size = 0; - - /* special case for last picture */ - if (buf_size == 0) { - return 0; - } - - frame_4cc= get32(buf); - if(buf_size != get32(buf+4)+8){ - fprintf(stderr, "size missmatch %d %d\n", buf_size, get32(buf+4)); + frame_4cc= AV_RL32(buf); + if(buf_size != AV_RL32(buf+4)+8 || buf_size < 20){ + av_log(f->avctx, AV_LOG_ERROR, "size mismatch %d %d\n", buf_size, AV_RL32(buf+4)); } if(frame_4cc == ff_get_fourcc("cfrm")){ int free_index=-1; const int data_size= buf_size - 20; - const int id= get32(buf+12); - const int whole_size= get32(buf+16); + const int id= AV_RL32(buf+12); + const int whole_size= AV_RL32(buf+16); CFrameBuffer *cfrm; for(i=0; icfrm[i].id && f->cfrm[i].id < avctx->frame_number) - printf("lost c frame %d\n", f->cfrm[i].id); + av_log(f->avctx, AV_LOG_ERROR, "lost c frame %d\n", f->cfrm[i].id); } - + for(i=0; icfrm[i].id == id) break; if(f->cfrm[i].size == 0 ) free_index= i; @@ -629,20 +710,24 @@ static int decode_frame(AVCodecContext *avctx, f->cfrm[i].id= id; } cfrm= &f->cfrm[i]; - + cfrm->data= av_fast_realloc(cfrm->data, &cfrm->allocated_size, cfrm->size + data_size + FF_INPUT_BUFFER_PADDING_SIZE); - + if(!cfrm->data){ //explicit check needed as memcpy below might not catch a NULL + av_log(f->avctx, AV_LOG_ERROR, "realloc falure"); + return -1; + } + memcpy(cfrm->data + cfrm->size, buf+20, data_size); cfrm->size += data_size; - + if(cfrm->size >= whole_size){ buf= cfrm->data; frame_size= cfrm->size; - + if(id != avctx->frame_number){ - printf("cframe id missmatch %d %d\n", id, avctx->frame_number); + av_log(f->avctx, AV_LOG_ERROR, "cframe id mismatch %d %d\n", id, avctx->frame_number); } - + cfrm->size= cfrm->id= 0; frame_4cc= ff_get_fourcc("pfrm"); }else @@ -650,7 +735,7 @@ static int decode_frame(AVCodecContext *avctx, }else{ buf= buf + 12; frame_size= buf_size - 12; - } + } temp= f->current_picture; f->current_picture= f->last_picture; @@ -666,37 +751,35 @@ static int decode_frame(AVCodecContext *avctx, p->reference= 1; if(avctx->get_buffer(avctx, p) < 0){ - fprintf(stderr, "get_buffer() failed\n"); + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } - if(frame_4cc == ff_get_fourcc("ifrm")){ - p->pict_type= I_TYPE; + if(frame_4cc == ff_get_fourcc("ifr2")){ + p->pict_type= FF_I_TYPE; + if(decode_i2_frame(f, buf-4, frame_size) < 0) + return -1; + }else if(frame_4cc == ff_get_fourcc("ifrm")){ + p->pict_type= FF_I_TYPE; if(decode_i_frame(f, buf, frame_size) < 0) return -1; - }else if(frame_4cc == ff_get_fourcc("pfrm")){ - p->pict_type= P_TYPE; + }else if(frame_4cc == ff_get_fourcc("pfrm") || frame_4cc == ff_get_fourcc("pfr2")){ + p->pict_type= FF_P_TYPE; if(decode_p_frame(f, buf, frame_size) < 0) return -1; }else if(frame_4cc == ff_get_fourcc("snd_")){ - printf("ignoring snd_ chunk length:%d\n", buf_size); + av_log(avctx, AV_LOG_ERROR, "ignoring snd_ chunk length:%d\n", buf_size); }else{ - printf("ignoring unknown chunk length:%d\n", buf_size); + av_log(avctx, AV_LOG_ERROR, "ignoring unknown chunk length:%d\n", buf_size); } -#if 0 -for(i=0; i<20; i++){ - printf("%2X %c ", buf[i], clip(buf[i],16,126)); -} -#endif - - p->key_frame= p->pict_type == I_TYPE; + p->key_frame= p->pict_type == FF_I_TYPE; *picture= *p; *data_size = sizeof(AVPicture); emms_c(); - + return buf_size; } @@ -709,19 +792,26 @@ static void common_init(AVCodecContext *avctx){ f->avctx= avctx; } -static int decode_init(AVCodecContext *avctx){ +static av_cold int decode_init(AVCodecContext *avctx){ FourXContext * const f = avctx->priv_data; - + + if(avctx->extradata_size != 4 || !avctx->extradata) { + av_log(avctx, AV_LOG_ERROR, "extradata wrong or missing\n"); + return 1; + } + + f->version= AV_RL32(avctx->extradata)>>16; common_init(avctx); init_vlcs(f); - avctx->pix_fmt= PIX_FMT_RGB565; + if(f->version>2) avctx->pix_fmt= PIX_FMT_RGB565; + else avctx->pix_fmt= PIX_FMT_RGB555; return 0; } -static int decode_end(AVCodecContext *avctx){ +static av_cold int decode_end(AVCodecContext *avctx){ FourXContext * const f = avctx->priv_data; int i; @@ -732,8 +822,6 @@ static int decode_end(AVCodecContext *avctx){ f->cfrm[i].allocated_size= 0; } free_vlc(&f->pre_vlc); - - avcodec_default_free_buffers(avctx); return 0; } @@ -748,5 +836,6 @@ AVCodec fourxm_decoder = { decode_end, decode_frame, /*CODEC_CAP_DR1,*/ + .long_name = NULL_IF_CONFIG_SMALL("4X Movie"), };