X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Frv10.c;h=daec2b85bc91989973c55b8118c1c567516d0464;hb=474176bf927870168a20413f2a9c28f09b6b1afa;hp=4907c2347865f4745d3b5e0fdcdc3f45ee1f424a;hpb=492cd3a9203779380cea24f23190b92af2b48007;p=ffmpeg diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 4907c234786..daec2b85bc9 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -1,6 +1,7 @@ /* * RV10 codec * Copyright (c) 2000,2001 Fabrice Bellard. + * Copyright (c) 2002-2004 Michael Niedermayer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,14 @@ * * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +/** + * @file rv10.c + * RV10 codec. + */ + #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" @@ -24,7 +31,7 @@ #define DC_VLC_BITS 14 //FIXME find a better solution -static const UINT16 rv_lum_code[256] = +static const uint16_t rv_lum_code[256] = { 0x3e7f, 0x0f00, 0x0f01, 0x0f02, 0x0f03, 0x0f04, 0x0f05, 0x0f06, 0x0f07, 0x0f08, 0x0f09, 0x0f0a, 0x0f0b, 0x0f0c, 0x0f0d, 0x0f0e, @@ -60,7 +67,7 @@ static const UINT16 rv_lum_code[256] = 0x0f78, 0x0f79, 0x0f7a, 0x0f7b, 0x0f7c, 0x0f7d, 0x0f7e, 0x0f7f, }; -static const UINT8 rv_lum_bits[256] = +static const uint8_t rv_lum_bits[256] = { 14, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, @@ -96,7 +103,7 @@ static const UINT8 rv_lum_bits[256] = 12, 12, 12, 12, 12, 12, 12, 12, }; -static const UINT16 rv_chrom_code[256] = +static const uint16_t rv_chrom_code[256] = { 0xfe7f, 0x3f00, 0x3f01, 0x3f02, 0x3f03, 0x3f04, 0x3f05, 0x3f06, 0x3f07, 0x3f08, 0x3f09, 0x3f0a, 0x3f0b, 0x3f0c, 0x3f0d, 0x3f0e, @@ -132,7 +139,7 @@ static const UINT16 rv_chrom_code[256] = 0x3f78, 0x3f79, 0x3f7a, 0x3f7b, 0x3f7c, 0x3f7d, 0x3f7e, 0x3f7f, }; -static const UINT8 rv_chrom_bits[256] = +static const uint8_t rv_chrom_bits[256] = { 16, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, @@ -182,14 +189,14 @@ int rv_decode_dc(MpegEncContext *s, int n) if they had thought about it !!! */ code = get_bits(&s->gb, 7); if (code == 0x7c) { - code = (INT8)(get_bits(&s->gb, 7) + 1); + code = (int8_t)(get_bits(&s->gb, 7) + 1); } else if (code == 0x7d) { code = -128 + get_bits(&s->gb, 7); } else if (code == 0x7e) { if (get_bits(&s->gb, 1) == 0) - code = (INT8)(get_bits(&s->gb, 8) + 1); + code = (int8_t)(get_bits(&s->gb, 8) + 1); else - code = (INT8)(get_bits(&s->gb, 8)); + code = (int8_t)(get_bits(&s->gb, 8)); } else if (code == 0x7f) { get_bits(&s->gb, 11); code = 1; @@ -203,14 +210,14 @@ int rv_decode_dc(MpegEncContext *s, int n) if (code < 0) { code = get_bits(&s->gb, 9); if (code == 0x1fc) { - code = (INT8)(get_bits(&s->gb, 7) + 1); + code = (int8_t)(get_bits(&s->gb, 7) + 1); } else if (code == 0x1fd) { code = -128 + get_bits(&s->gb, 7); } else if (code == 0x1fe) { get_bits(&s->gb, 9); code = 1; } else { - fprintf(stderr, "chroma dc error\n"); + av_log(s->avctx, AV_LOG_ERROR, "chroma dc error\n"); return 0xffff; } } else { @@ -220,35 +227,67 @@ int rv_decode_dc(MpegEncContext *s, int n) return -code; } +#ifdef CONFIG_ENCODERS + /* write RV 1.0 compatible frame header */ void rv10_encode_picture_header(MpegEncContext *s, int picture_number) { int full_frame= 0; align_put_bits(&s->pb); - - put_bits(&s->pb, 1, 1); /* marker */ + + put_bits(&s->pb, 1, 1); /* marker */ put_bits(&s->pb, 1, (s->pict_type == P_TYPE)); - put_bits(&s->pb, 1, 0); /* not PB frame */ + put_bits(&s->pb, 1, 0); /* not PB frame */ put_bits(&s->pb, 5, s->qscale); if (s->pict_type == I_TYPE) { - /* specific MPEG like DC coding not used */ + /* specific MPEG like DC coding not used */ } /* if multiple packets per frame are sent, the position at which to display the macro blocks is coded here */ if(!full_frame){ - put_bits(&s->pb, 6, 0); /* mb_x */ - put_bits(&s->pb, 6, 0); /* mb_y */ + put_bits(&s->pb, 6, 0); /* mb_x */ + put_bits(&s->pb, 6, 0); /* mb_y */ put_bits(&s->pb, 12, s->mb_width * s->mb_height); } - put_bits(&s->pb, 3, 0); /* ignored */ + put_bits(&s->pb, 3, 0); /* ignored */ } +void rv20_encode_picture_header(MpegEncContext *s, int picture_number){ + put_bits(&s->pb, 2, s->pict_type); //I 0 vs. 1 ? + put_bits(&s->pb, 1, 0); /* unknown bit */ + put_bits(&s->pb, 5, s->qscale); + + put_bits(&s->pb, 8, picture_number&0xFF); //FIXME wrong, but correct is not known + s->mb_x= s->mb_y= 0; + ff_h263_encode_mba(s); + + put_bits(&s->pb, 1, s->no_rounding); + + assert(s->f_code == 1); + assert(s->unrestricted_mv == 1); +// assert(s->h263_aic== (s->pict_type == I_TYPE)); + assert(s->alt_inter_vlc == 0); + assert(s->umvplus == 0); + assert(s->modified_quant==1); + assert(s->loop_filter==1); + + s->h263_aic= s->pict_type == I_TYPE; + 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; + } +} + +#if 0 /* unused, remove? */ static int get_num(GetBitContext *gb) { int n, n1; @@ -261,13 +300,15 @@ static int get_num(GetBitContext *gb) return (n << 16) | n1; } } +#endif + +#endif //CONFIG_ENCODERS /* read RV 1.0 compatible frame header */ static int rv10_decode_picture_header(MpegEncContext *s) { - int mb_count, pb_frame, marker, full_frame, unk; - - full_frame= s->avctx->slice_count==1; + int mb_count, pb_frame, marker, unk, mb_xy; + //printf("ff:%d\n", full_frame); marker = get_bits(&s->gb, 1); @@ -276,21 +317,21 @@ static int rv10_decode_picture_header(MpegEncContext *s) else s->pict_type = I_TYPE; //printf("h:%X ver:%d\n",h,s->rv10_version); - if(!marker) printf("marker missing\n"); + if(!marker) av_log(s->avctx, AV_LOG_ERROR, "marker missing\n"); pb_frame = get_bits(&s->gb, 1); #ifdef DEBUG - printf("pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame); + av_log(s->avctx, AV_LOG_DEBUG, "pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame); #endif - + if (pb_frame){ - fprintf(stderr, "pb frame not supported\n"); + 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){ - fprintf(stderr, "error, qscale:0\n"); + av_log(s->avctx, AV_LOG_ERROR, "error, qscale:0\n"); return -1; } @@ -301,7 +342,7 @@ static int rv10_decode_picture_header(MpegEncContext *s) s->last_dc[1] = get_bits(&s->gb, 8); s->last_dc[2] = get_bits(&s->gb, 8); #ifdef DEBUG - printf("DC:%d %d %d\n", + av_log(s->avctx, AV_LOG_DEBUG, "DC:%d %d %d\n", s->last_dc[0], s->last_dc[1], s->last_dc[2]); @@ -310,16 +351,18 @@ static int rv10_decode_picture_header(MpegEncContext *s) } /* if multiple packets per frame are sent, the position at which to display the macro blocks is coded here */ - if ((!full_frame) || show_bits(&s->gb, 12)==0) { - s->mb_x = get_bits(&s->gb, 6); /* mb_x */ - s->mb_y = get_bits(&s->gb, 6); /* mb_y */ + + mb_xy= s->mb_x + s->mb_y*s->mb_width; + if(show_bits(&s->gb, 12)==0 || (mb_xy && mb_xy < s->mb_num)){ + s->mb_x = get_bits(&s->gb, 6); /* mb_x */ + s->mb_y = get_bits(&s->gb, 6); /* mb_y */ mb_count = get_bits(&s->gb, 12); } else { s->mb_x = 0; s->mb_y = 0; mb_count = s->mb_width * s->mb_height; } - unk= get_bits(&s->gb, 3); /* ignored */ + unk= get_bits(&s->gb, 3); /* ignored */ //printf("%d\n", unk); s->f_code = 1; s->unrestricted_mv = 1; @@ -327,54 +370,212 @@ static int rv10_decode_picture_header(MpegEncContext *s) return mb_count; } +static int rv20_decode_picture_header(MpegEncContext *s) +{ + int seq, mb_pos, i; + +#if 0 + GetBitContext gb= s->gb; + for(i=0; i<64; i++){ + av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&gb)); + if(i%4==3) av_log(s->avctx, AV_LOG_DEBUG, " "); + } + av_log(s->avctx, AV_LOG_DEBUG, "\n"); +#endif +#if 0 + for(i=0; iavctx->extradata_size; i++){ + av_log(s->avctx, AV_LOG_DEBUG, "%2X ", ((uint8_t*)s->avctx->extradata)[i]); + if(i%4==3) av_log(s->avctx, AV_LOG_DEBUG, " "); + } + av_log(s->avctx, AV_LOG_DEBUG, "\n"); +#endif + + if(s->avctx->sub_id == 0x30202002 || s->avctx->sub_id == 0x30203002){ + if (get_bits(&s->gb, 3)){ + av_log(s->avctx, AV_LOG_ERROR, "unknown triplet set\n"); + return -1; + } + } + + i= get_bits(&s->gb, 2); + switch(i){ + case 0: s->pict_type= I_TYPE; break; + case 1: s->pict_type= I_TYPE; break; //hmm ... + case 2: s->pict_type= P_TYPE; break; + case 3: s->pict_type= B_TYPE; break; + default: + av_log(s->avctx, AV_LOG_ERROR, "unknown frame type\n"); + return -1; + } + + if(s->last_picture_ptr==NULL && s->pict_type==B_TYPE){ + av_log(s->avctx, AV_LOG_ERROR, "early B pix\n"); + return -1; + } + + if (get_bits(&s->gb, 1)){ + av_log(s->avctx, AV_LOG_ERROR, "unknown bit set\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; + } + if(s->avctx->sub_id == 0x30203002){ + if (get_bits(&s->gb, 1)){ + av_log(s->avctx, AV_LOG_ERROR, "unknown bit2 set\n"); + return -1; + } + } + + if(s->avctx->has_b_frames){ + int f=9; + int v= s->avctx->extradata_size >= 4 ? ((uint8_t*)s->avctx->extradata)[1] : 0; + + if (get_bits(&s->gb, 1)){ + av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n"); +// return -1; + } + seq= get_bits(&s->gb, 14)<<1; + + if(v) + f= get_bits(&s->gb, av_log2(v)); + + if(s->avctx->debug & FF_DEBUG_PICT_INFO){ + av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, v); + } + }else{ + seq= get_bits(&s->gb, 8)*128; + } + +// if(s->avctx->sub_id <= 0x20201002){ //0x20201002 definitely needs this + mb_pos= ff_h263_decode_mba(s); +/* }else{ + mb_pos= get_bits(&s->gb, av_log2(s->mb_num-1)+1); + s->mb_x= mb_pos % s->mb_width; + s->mb_y= mb_pos / s->mb_width; + }*/ +//av_log(s->avctx, AV_LOG_DEBUG, "%d\n", seq); + seq |= s->time &~0x7FFF; + if(seq - s->time > 0x4000) seq -= 0x8000; + if(seq - s->time < -0x4000) seq += 0x8000; + if(seq != s->time){ + if(s->pict_type!=B_TYPE){ + s->time= seq; + s->pp_time= s->time - s->last_non_b_time; + s->last_non_b_time= s->time; + }else{ + s->time= seq; + s->pb_time= s->pp_time - (s->last_non_b_time - s->time); + if(s->pp_time <=s->pb_time || s->pp_time <= s->pp_time - s->pb_time || s->pp_time<=0){ + av_log(s->avctx, AV_LOG_DEBUG, "messed up order, possible from seeking? skipping current b frame\n"); + return FRAME_SKIPPED; + } + } + } +// printf("%d %d %d %d %d\n", seq, (int)s->time, (int)s->last_non_b_time, s->pp_time, s->pb_time); +/*for(i=0; i<32; i++){ + av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->gb)); +} +av_log(s->avctx, AV_LOG_DEBUG, "\n");*/ + 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; + s->loop_filter=1; + + if(s->avctx->debug & FF_DEBUG_PICT_INFO){ + av_log(s->avctx, AV_LOG_INFO, "num:%5d 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); + } + + assert(s->pict_type != B_TYPE || !s->low_delay); + + return s->mb_width*s->mb_height - mb_pos; +} + static int rv10_decode_init(AVCodecContext *avctx) { MpegEncContext *s = avctx->priv_data; - static int done; + static int done=0; + + MPV_decode_defaults(s); s->avctx= avctx; s->out_format = FMT_H263; + s->codec_id= avctx->codec_id; 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->low_delay=1; + break; + case 0x10002000: + s->rv10_version= 3; + s->h263_long_vectors=1; + s->low_delay=1; + s->obmc=1; break; case 0x10003000: s->rv10_version= 3; s->h263_long_vectors=1; + s->low_delay=1; break; case 0x10003001: s->rv10_version= 3; s->h263_long_vectors=0; + s->low_delay=1; + break; + case 0x20001000: /* real rv20 decoder fail on this id */ + /*case 0x20100001: + case 0x20101001: + case 0x20103001:*/ + case 0x20100000 ... 0x2019ffff: + s->low_delay=1; + break; + /*case 0x20200002: + case 0x20201002: + case 0x20203002:*/ + case 0x20200002 ... 0x202fffff: + case 0x30202002: + case 0x30203002: + s->low_delay=0; + s->avctx->has_b_frames=1; break; default: - fprintf(stderr, "unknown header %X\n", avctx->sub_id); + av_log(s->avctx, AV_LOG_ERROR, "unknown header %X\n", avctx->sub_id); } -//printf("ver:%X\n", avctx->sub_id); - s->flags= avctx->flags; + + if(avctx->debug & FF_DEBUG_PICT_INFO){ + av_log(avctx, AV_LOG_DEBUG, "ver:%X ver0:%X\n", avctx->sub_id, avctx->extradata_size >= 4 ? ((uint32_t*)avctx->extradata)[0] : -1); + } + + avctx->pix_fmt = PIX_FMT_YUV420P; if (MPV_common_init(s) < 0) return -1; 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 */ if (!done) { - init_vlc(&rv_dc_lum, DC_VLC_BITS, 256, + init_vlc(&rv_dc_lum, DC_VLC_BITS, 256, rv_lum_bits, 1, 1, - rv_lum_code, 2, 2); - init_vlc(&rv_dc_chrom, DC_VLC_BITS, 256, + rv_lum_code, 2, 2, 1); + init_vlc(&rv_dc_chrom, DC_VLC_BITS, 256, rv_chrom_bits, 1, 1, - rv_chrom_code, 2, 2); + rv_chrom_code, 2, 2, 1); done = 1; } @@ -389,127 +590,168 @@ static int rv10_decode_end(AVCodecContext *avctx) return 0; } -static int rv10_decode_packet(AVCodecContext *avctx, - UINT8 *buf, int buf_size) +static int rv10_decode_packet(AVCodecContext *avctx, + uint8_t *buf, int buf_size) { MpegEncContext *s = avctx->priv_data; - int i, mb_count, mb_pos, left; + int mb_count, mb_pos, left; - init_get_bits(&s->gb, buf, buf_size); - - mb_count = rv10_decode_picture_header(s); + init_get_bits(&s->gb, buf, buf_size*8); + 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) { - fprintf(stderr, "HEADER ERROR\n"); + av_log(s->avctx, AV_LOG_ERROR, "HEADER ERROR\n"); return -1; } - + if (s->mb_x >= s->mb_width || s->mb_y >= s->mb_height) { - fprintf(stderr, "POS ERROR %d %d\n", s->mb_x, s->mb_y); + av_log(s->avctx, AV_LOG_ERROR, "POS ERROR %d %d\n", s->mb_x, s->mb_y); return -1; } mb_pos = s->mb_y * s->mb_width + s->mb_x; left = s->mb_width * s->mb_height - mb_pos; if (mb_count > left) { - fprintf(stderr, "COUNT ERROR\n"); + 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 ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) { + if(s->current_picture_ptr){ //FIXME write parser so we always have complete frames? + ff_er_frame_end(s); + MPV_frame_end(s); + s->mb_x= s->mb_y = s->resync_mb_x = s->resync_mb_y= 0; + } if(MPV_frame_start(s, avctx) < 0) return -1; + ff_er_frame_start(s); } #ifdef DEBUG - printf("qscale=%d\n", s->qscale); + av_log(avctx, AV_LOG_DEBUG, "qscale=%d\n", s->qscale); #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; + } + + if(s->modified_quant) + s->chroma_qscale_table= ff_h263_chroma_qscale_table; + + ff_set_qscale(s, 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; - +//printf("%d %X %X\n", s->pict_type, s->current_picture.motion_val[0], s->current_picture.motion_val[1]); s->block_wrap[0]= s->block_wrap[1]= s->block_wrap[2]= - s->block_wrap[3]= s->mb_width*2 + 2; + s->block_wrap[3]= s->b8_stride; s->block_wrap[4]= - s->block_wrap[5]= s->mb_width + 2; + s->block_wrap[5]= s->mb_stride; ff_init_block_index(s); /* decode each macroblock */ - for(i=0;imb_num_left= mb_count; s->mb_num_left>0; s->mb_num_left--) { + int ret; ff_update_block_index(s); #ifdef DEBUG - printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y); + av_log(avctx, AV_LOG_DEBUG, "**mb x=%d y=%d\n", s->mb_x, s->mb_y); #endif - - 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) { - fprintf(stderr, "ERROR at MB %d %d\n", s->mb_x, s->mb_y); + s->mv_type = MV_TYPE_16X16; + ret=ff_h263_decode_mb(s, s->block); + + if (ret == SLICE_ERROR || s->gb.size_in_bits < get_bits_count(&s->gb)) { + av_log(s->avctx, AV_LOG_ERROR, "ERROR at MB %d %d\n", s->mb_x, s->mb_y); return -1; } + if(s->pict_type != B_TYPE) + ff_h263_update_motion_val(s); MPV_decode_mb(s, s->block); + if(s->loop_filter) + ff_h263_loop_filter(s); + if (++s->mb_x == s->mb_width) { s->mb_x = 0; s->mb_y++; ff_init_block_index(s); - s->first_slice_line=0; } + if(s->mb_x == s->resync_mb_x) + s->first_slice_line=0; + if(ret == SLICE_END) break; } + ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END); + return buf_size; } -static int rv10_decode_frame(AVCodecContext *avctx, +static int rv10_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - UINT8 *buf, int buf_size) + uint8_t *buf, int buf_size) { MpegEncContext *s = avctx->priv_data; int i; - AVFrame *pict = data; + AVFrame *pict = data; #ifdef DEBUG - printf("*****frame %d size=%d\n", avctx->frame_number, buf_size); + av_log(avctx, AV_LOG_DEBUG, "*****frame %d size=%d\n", avctx->frame_number, buf_size); #endif /* no supplementary picture */ if (buf_size == 0) { - *data_size = 0; return 0; } - + if(avctx->slice_count){ for(i=0; islice_count; i++){ int offset= avctx->slice_offset[i]; int size; - + if(i+1 == avctx->slice_count) size= buf_size - offset; else size= avctx->slice_offset[i+1] - offset; - if( rv10_decode_packet(avctx, buf+offset, size) < 0 ) - return -1; + rv10_decode_packet(avctx, buf+offset, size); } }else{ - if( rv10_decode_packet(avctx, buf, buf_size) < 0 ) - return -1; + rv10_decode_packet(avctx, buf, buf_size); } - if(s->mb_y>=s->mb_height){ + if(s->current_picture_ptr != NULL && s->mb_y>=s->mb_height){ + ff_er_frame_end(s); MPV_frame_end(s); - - *pict= *(AVFrame*)&s->current_picture; - - *data_size = sizeof(AVFrame); - }else{ - *data_size = 0; + + if (s->pict_type == B_TYPE || s->low_delay) { + *pict= *(AVFrame*)s->current_picture_ptr; + } else if (s->last_picture_ptr != NULL) { + *pict= *(AVFrame*)s->last_picture_ptr; + } + + if(s->last_picture_ptr || s->low_delay){ + *data_size = sizeof(AVFrame); + ff_print_debug_info(s, pict); + } + s->current_picture_ptr= NULL; //so we can detect if frame_end wasnt called (find some nicer solution...) } return buf_size; @@ -526,3 +768,17 @@ AVCodec rv10_decoder = { 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 | CODEC_CAP_DELAY, + .flush= ff_mpeg_flush, +}; +