Mercurial > libavcodec.hg
diff rv10.c @ 1639:3e2b774edce4 libavcodec
rv20 decoder
author | michael |
---|---|
date | Sun, 30 Nov 2003 14:35:35 +0000 |
parents | 932d306bf1dc |
children | 3bc71266e644 |
line wrap: on
line diff
--- a/rv10.c Sat Nov 29 08:44:33 2003 +0000 +++ b/rv10.c Sun Nov 30 14:35:35 2003 +0000 @@ -337,6 +337,55 @@ return mb_count; } +static int rv20_decode_picture_header(MpegEncContext *s) +{ + int pb_frame, seq, mb_pos; + int i; + + if (get_bits(&s->gb, 1)) + s->pict_type = P_TYPE; + else + s->pict_type = I_TYPE; + + pb_frame = get_bits(&s->gb, 2); + + if (pb_frame){ + av_log(s->avctx, AV_LOG_ERROR, "pb frame not supported\n"); + return -1; + } + + s->qscale = get_bits(&s->gb, 5); + if(s->qscale==0){ + av_log(s->avctx, AV_LOG_ERROR, "error, qscale:0\n"); + return -1; + } + + seq= get_bits(&s->gb, 8); + + for(i=0; i<6; i++){ + if(s->mb_width*s->mb_height < ff_mba_max[i]) break; + } + mb_pos= get_bits(&s->gb, ff_mba_length[i]); + s->mb_x= mb_pos % s->mb_width; + s->mb_y= mb_pos / s->mb_width; + s->no_rounding= get_bits1(&s->gb); + + s->f_code = 1; + s->unrestricted_mv = 1; + s->h263_aic= s->pict_type == I_TYPE; +// s->alt_inter_vlc=1; +// s->obmc=1; +// s->umvplus=1; +// s->modified_quant=1; + + if(s->avctx->debug & FF_DEBUG_PICT_INFO){ + av_log(s->avctx, AV_LOG_INFO, "num:%3d x:%2d y:%2d type:%d qscale:%2d rnd:%d\n", + seq, s->mb_x, s->mb_y, s->pict_type, s->qscale, s->no_rounding); + } + + return s->mb_width*s->mb_height - mb_pos; +} + static int rv10_decode_init(AVCodecContext *avctx) { MpegEncContext *s = avctx->priv_data; @@ -348,20 +397,26 @@ s->width = avctx->width; s->height = avctx->height; - s->h263_rv10 = 1; switch(avctx->sub_id){ case 0x10000000: s->rv10_version= 0; s->h263_long_vectors=0; + s->h263_rv10 = 1; break; case 0x10003000: s->rv10_version= 3; s->h263_long_vectors=1; + s->h263_rv10 = 1; break; case 0x10003001: s->rv10_version= 3; s->h263_long_vectors=0; + s->h263_rv10 = 1; break; + case 0x20001000: + case 0x20100001: + case 0x20200002: + case 0x20101001: //added default: av_log(s->avctx, AV_LOG_ERROR, "unknown header %X\n", avctx->sub_id); } @@ -373,8 +428,6 @@ h263_decode_init_vlc(s); - s->y_dc_scale_table= - s->c_dc_scale_table= ff_mpeg1_dc_scale_table; s->progressive_sequence=1; /* init rv vlc */ @@ -408,8 +461,16 @@ int i, mb_count, mb_pos, left; init_get_bits(&s->gb, buf, buf_size*8); - - mb_count = rv10_decode_picture_header(s); +#if 0 + for(i=0; i<buf_size*8 && i<100; i++) + printf("%d", get_bits1(&s->gb)); + printf("\n"); + return 0; +#endif + if(s->codec_id ==CODEC_ID_RV10) + mb_count = rv10_decode_picture_header(s); + else + mb_count = rv20_decode_picture_header(s); if (mb_count < 0) { av_log(s->avctx, AV_LOG_ERROR, "HEADER ERROR\n"); return -1; @@ -426,6 +487,7 @@ av_log(s->avctx, AV_LOG_ERROR, "COUNT ERROR\n"); return -1; } +//if(s->pict_type == P_TYPE) return 0; if (s->mb_x == 0 && s->mb_y == 0) { if(MPV_frame_start(s, avctx) < 0) @@ -437,14 +499,27 @@ #endif /* default quantization values */ - s->y_dc_scale = 8; - s->c_dc_scale = 8; + if(s->codec_id== CODEC_ID_RV10){ + if(s->mb_y==0) s->first_slice_line=1; + }else{ + s->first_slice_line=1; + s->resync_mb_x= s->mb_x; + s->resync_mb_y= s->mb_y; + } + if(s->h263_aic){ + s->y_dc_scale_table= + s->c_dc_scale_table= ff_aic_dc_scale_table; + }else{ + s->y_dc_scale_table= + s->c_dc_scale_table= ff_mpeg1_dc_scale_table; + } + s->y_dc_scale= s->y_dc_scale_table[ s->qscale ]; + s->c_dc_scale= s->c_dc_scale_table[ s->qscale ]; + s->rv10_first_dc_coded[0] = 0; s->rv10_first_dc_coded[1] = 0; s->rv10_first_dc_coded[2] = 0; - if(s->mb_y==0) s->first_slice_line=1; - s->block_wrap[0]= s->block_wrap[1]= s->block_wrap[2]= @@ -454,6 +529,7 @@ ff_init_block_index(s); /* decode each macroblock */ for(i=0;i<mb_count;i++) { + int ret; ff_update_block_index(s); #ifdef DEBUG printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y); @@ -462,7 +538,9 @@ s->dsp.clear_blocks(s->block[0]); s->mv_dir = MV_DIR_FORWARD; s->mv_type = MV_TYPE_16X16; - if (ff_h263_decode_mb(s, s->block) == SLICE_ERROR) { + ret=ff_h263_decode_mb(s, s->block); + + if (ret == SLICE_ERROR) { av_log(s->avctx, AV_LOG_ERROR, "ERROR at MB %d %d\n", s->mb_x, s->mb_y); return -1; } @@ -472,8 +550,10 @@ s->mb_x = 0; s->mb_y++; ff_init_block_index(s); + } + if(s->mb_x == s->resync_mb_x) s->first_slice_line=0; - } + if(ret == SLICE_END) break; } return buf_size; @@ -539,3 +619,15 @@ rv10_decode_frame, CODEC_CAP_DR1 }; + +AVCodec rv20_decoder = { + "rv20", + CODEC_TYPE_VIDEO, + CODEC_ID_RV20, + sizeof(MpegEncContext), + rv10_decode_init, + NULL, + rv10_decode_end, + rv10_decode_frame, + CODEC_CAP_DR1 +};