*/
/**
- * @file 4xm.c
+ * @file libavcodec/4xm.c
* 4XM codec.
*/
+#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "dsputil.h"
-#include "mpegvideo.h"
+#include "bitstream.h"
+#include "bytestream.h"
//#undef NDEBUG
//#include <assert.h>
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;
}
}
-static void init_vlcs(FourXContext *f){
+static av_cold void init_vlcs(FourXContext *f){
int i;
for(i=0; i<8; i++){
int i;
for(i=0; i<256; i++){
- if(f->version)
+ 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;
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<<log2h;
- int code= get_vlc2(&f->gb, block_type_vlc[1-f->version][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<<log2w);
assert(code>=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--;
log2w--;
decode_p_block(f, dst , src , log2w, log2h, stride);
decode_p_block(f, dst + (1<<log2w), src + (1<<log2w), log2w, log2h, stride);
- }else if(code == 3 && f->version==0){
+ }else if(code == 3 && f->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++));
}
}
-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;
const int stride= f->current_picture.linesize[0]>>1;
unsigned int bitstream_size, bytestream_size, wordstream_size, extra;
- if(f->version){
+ if(f->version>1){
extra=20;
- bitstream_size= get32(buf+8);
- wordstream_size= get32(buf+12);
- bytestream_size= get32(buf+16);
+ 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);
}
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 + extra), 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 + extra + bitstream_size);
+ f->wordstream= (const uint16_t*)(buf + extra + bitstream_size);
f->bytestream= buf + extra + bitstream_size + wordstream_size;
init_mv(f);
}
if( bitstream_size != (get_bits_count(&f->gb)+31)/32*4
- || (((char*)f->wordstream - (char*)buf + 2)&~2) != extra + bitstream_size + wordstream_size
- || (((char*)f->bytestream - (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
+ || (((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,
- -(((char*)f->bytestream - (char*)buf + 3)&~3) + (extra + bitstream_size + wordstream_size + bytestream_size),
- -(((char*)f->wordstream - (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),
+ -(((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;
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));
return red/3*1024 + green/3*32 + blue/3;
}
-static int decode_i2_frame(FourXContext *f, uint8_t *buf, int length){
+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;
unsigned int color[4], bits;
memset(color, 0, sizeof(color));
//warning following is purely guessed ...
- color[0]= AV_RN16(buf); buf+=2; //FIXME use bytestream
- color[1]= AV_RN16(buf); buf+=2;
+ color[0]= bytestream_get_le16(&buf);
+ color[1]= bytestream_get_le16(&buf);
if(color[0]&0x8000) av_log(NULL, AV_LOG_ERROR, "unk bit 1\n");
if(color[1]&0x8000) av_log(NULL, AV_LOG_ERROR, "unk bit 2\n");
color[2]= mix(color[0], color[1]);
color[3]= mix(color[1], color[0]);
- bits= AV_RL32(buf); buf+= 4;
+ bits= bytestream_get_le32(&buf);
for(y2=0; y2<16; y2++){
for(x2=0; x2<16; x2++){
int index= 2*(x2>>2) + 8*(y2>>2);
return 0;
}
-static int decode_i_frame(FourXContext *f, uint8_t *buf, int length){
+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 unsigned int bitstream_size= get32(buf);
- const int token_count av_unused = get32(buf + bitstream_size + 8);
- unsigned int prestream_size= 4*get32(buf + bitstream_size + 4);
- uint8_t *prestream= buf + bitstream_size + 12;
+ 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= 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;
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;
- frame_4cc= get32(buf);
- if(buf_size != get32(buf+4)+8 || buf_size < 20){
- av_log(f->avctx, AV_LOG_ERROR, "size mismatch %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")){
+ if(frame_4cc == AV_RL32("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; i<CFRAME_BUFFER_COUNT; i++){
}
cfrm->size= cfrm->id= 0;
- frame_4cc= ff_get_fourcc("pfrm");
+ frame_4cc= AV_RL32("pfrm");
}else
return buf_size;
}else{
return -1;
}
- if(frame_4cc == ff_get_fourcc("ifr2")){
- p->pict_type= I_TYPE;
+ if(frame_4cc == AV_RL32("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= I_TYPE;
+ }else if(frame_4cc == AV_RL32("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") || frame_4cc == ff_get_fourcc("pfr2")){
- p->pict_type= P_TYPE;
+ }else if(frame_4cc == AV_RL32("pfrm") || frame_4cc == AV_RL32("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_")){
+ }else if(frame_4cc == AV_RL32("snd_")){
av_log(avctx, AV_LOG_ERROR, "ignoring snd_ chunk length:%d\n", buf_size);
}else{
av_log(avctx, AV_LOG_ERROR, "ignoring unknown chunk length:%d\n", buf_size);
}
- p->key_frame= p->pict_type == I_TYPE;
+ p->key_frame= p->pict_type == FF_I_TYPE;
*picture= *p;
*data_size = sizeof(AVPicture);
f->avctx= avctx;
}
-static int decode_init(AVCodecContext *avctx){
+static av_cold int decode_init(AVCodecContext *avctx){
FourXContext * const f = avctx->priv_data;
- f->version= avctx->codec_tag == 0x40000;
+ 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);
- if(f->version) avctx->pix_fmt= PIX_FMT_RGB565;
- else avctx->pix_fmt= PIX_FMT_RGB555;
+ 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;
decode_end,
decode_frame,
/*CODEC_CAP_DR1,*/
+ .long_name = NULL_IF_CONFIG_SMALL("4X Movie"),
};
projects / ffmpeg / blobdiff