virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

better f_code guessing in 2nd pass

Browse Source 
Originally committed as revision 4766 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-12-22 22:48:09 +00:00
parent 50c6f6cd4c
commit 82b019cefd
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpegvideo.c
View File

@ -5298,9 +5298,10 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->no_rounding ^= 1; s->no_rounding ^= 1;
} }
if(s->flags & CODEC_FLAG_PASS2) if(s->flags & CODEC_FLAG_PASS2){
estimate_qp(s, 1); estimate_qp(s, 1);
else if(!(s->flags & CODEC_FLAG_QSCALE)){ ff_get_2pass_fcode(s);
}else if(!(s->flags & CODEC_FLAG_QSCALE)){
RateControlContext *rcc= &s->rc_context; RateControlContext *rcc= &s->rc_context;
if(s->pict_type==B_TYPE) if(s->pict_type==B_TYPE)

2
libavcodec/mpegvideo.h
View File

@ -980,6 +980,6 @@ double ff_eval(char *s, double *const_value, const char **const_name,
double (**func2)(void *, double, double), char **func2_name, double (**func2)(void *, double, double), char **func2_name,
void *opaque); void *opaque);
int ff_vbv_update(MpegEncContext *s, int frame_size); int ff_vbv_update(MpegEncContext *s, int frame_size);
void ff_get_2pass_fcode(MpegEncContext *s);
#endif /* AVCODEC_MPEGVIDEO_H */ #endif /* AVCODEC_MPEGVIDEO_H */

11
libavcodec/ratecontrol.c
View File

@ -607,6 +607,17 @@ static void adaptive_quantization(MpegEncContext *s, double q){
s->lambda_table[mb_xy]= intq; s->lambda_table[mb_xy]= intq;
} }
} }
void ff_get_2pass_fcode(MpegEncContext *s){
RateControlContext *rcc= &s->rc_context;
int picture_number= s->picture_number;
RateControlEntry *rce;
rce= &rcc->entry[picture_number];
s->f_code= rce->f_code;
s->b_code= rce->b_code;
}
//FIXME rd or at least approx for dquant //FIXME rd or at least approx for dquant
float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)