Mercurial > libavcodec.hg
diff rv10.c @ 10017:988e20e4da2f libavcodec
Split RV20 encoder into its own file.
author | diego |
---|---|
date | Mon, 03 Aug 2009 23:07:08 +0000 |
parents | fef7b43f0d22 |
children | 46f8d58fbdfb |
line wrap: on
line diff
--- a/rv10.c Mon Aug 03 22:05:31 2009 +0000 +++ b/rv10.c Mon Aug 03 23:07:08 2009 +0000 @@ -230,7 +230,7 @@ } -#if CONFIG_RV10_ENCODER || CONFIG_RV20_ENCODER +#if CONFIG_RV10_ENCODER /* write RV 1.0 compatible frame header */ void rv10_encode_picture_header(MpegEncContext *s, int picture_number) { @@ -259,36 +259,7 @@ 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_sbits(&s->pb, 8, picture_number); //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->alt_inter_vlc == 0); - assert(s->umvplus == 0); - assert(s->modified_quant==1); - assert(s->loop_filter==1); - - s->h263_aic= s->pict_type == FF_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; - } -} - -#endif /* CONFIG_RV10_ENCODER || CONFIG_RV20_ENCODER */ +#endif /* CONFIG_RV10_ENCODER */ /* read RV 1.0 compatible frame header */ static int rv10_decode_picture_header(MpegEncContext *s) @@ -792,15 +763,3 @@ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("RealVideo 1.0"), }; - -AVCodec rv20_encoder = { - "rv20", - CODEC_TYPE_VIDEO, - CODEC_ID_RV20, - sizeof(MpegEncContext), - MPV_encode_init, - MPV_encode_picture, - MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("RealVideo 2.0"), -};