*/
/**
- * @file libavcodec/4xm.c
+ * @file
* 4XM codec.
*/
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
#include "bytestream.h"
//#undef NDEBUG
int mv[256];
VLC pre_vlc;
int last_dc;
- DECLARE_ALIGNED_8(DCTELEM, block[6][64]);
- uint8_t *bitstream_buffer;
+ DECLARE_ALIGNED(16, DCTELEM, block)[6][64];
+ void *bitstream_buffer;
unsigned int bitstream_buffer_size;
int version;
CFrameBuffer cfrm[CFRAME_BUFFER_COUNT];
}
static av_cold void init_vlcs(FourXContext *f){
+ static VLC_TYPE table[8][32][2];
int i;
for(i=0; i<8; i++){
+ block_type_vlc[0][i].table= table[i];
+ block_type_vlc[0][i].table_allocated= 32;
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);
+ &block_type_tab[0][i][0][0], 2, 1, INIT_VLC_USE_NEW_STATIC);
}
}
av_log(f->avctx, AV_LOG_ERROR, "mv out of pic\n");
return;
}
- mcdc(dst, src, log2w, h, stride, 1, le2me_16(*f->wordstream++));
+ mcdc(dst, src, log2w, h, stride, 1, av_le2ne16(*f->wordstream++));
}else if(code == 5){
- mcdc(dst, src, log2w, h, stride, 0, le2me_16(*f->wordstream++));
+ mcdc(dst, src, log2w, h, stride, 0, av_le2ne16(*f->wordstream++));
}else if(code == 6){
if(log2w){
- dst[0] = le2me_16(*f->wordstream++);
- dst[1] = le2me_16(*f->wordstream++);
+ dst[0] = av_le2ne16(*f->wordstream++);
+ dst[1] = av_le2ne16(*f->wordstream++);
}else{
- dst[0 ] = le2me_16(*f->wordstream++);
- dst[stride] = le2me_16(*f->wordstream++);
+ dst[0 ] = av_le2ne16(*f->wordstream++);
+ dst[stride] = av_le2ne16(*f->wordstream++);
}
}
}
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, (const uint32_t*)(buf + extra), bitstream_size/4);
+ av_fast_malloc(&f->bitstream_buffer, &f->bitstream_buffer_size, bitstream_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!f->bitstream_buffer)
+ return AVERROR(ENOMEM);
+ f->dsp.bswap_buf(f->bitstream_buffer, (const uint32_t*)(buf + extra), bitstream_size/4);
init_get_bits(&f->gb, f->bitstream_buffer, 8*bitstream_size);
f->wordstream= (const uint16_t*)(buf + extra + bitstream_size);
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, (const uint32_t*)prestream, prestream_size/4);
+ av_fast_malloc(&f->bitstream_buffer, &f->bitstream_buffer_size, prestream_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!f->bitstream_buffer)
+ return AVERROR(ENOMEM);
+ f->dsp.bswap_buf(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;
init_vlcs(f);
if(f->version>2) avctx->pix_fmt= PIX_FMT_RGB565;
- else avctx->pix_fmt= PIX_FMT_RGB555;
+ else avctx->pix_fmt= PIX_FMT_BGR555;
return 0;
}
f->cfrm[i].allocated_size= 0;
}
free_vlc(&f->pre_vlc);
+ if(f->current_picture.data[0])
+ avctx->release_buffer(avctx, &f->current_picture);
+ if(f->last_picture.data[0])
+ avctx->release_buffer(avctx, &f->last_picture);
return 0;
}
AVCodec fourxm_decoder = {
"4xm",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_4XM,
sizeof(FourXContext),
decode_init,
NULL,
decode_end,
decode_frame,
- /*CODEC_CAP_DR1,*/
+ CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("4X Movie"),
};