comparison ratecontrol.c @ 9476:2b2bac59038e libavcodec

Remove 2 useless assignments from ff_rate_control_init() found by CSA.
author michael
date Fri, 17 Apr 2009 17:52:58 +0000
parents 677b6a886768
children 421c9441c11e
comparison
equal deleted inserted replaced
9475:4faccfb98672 9476:2b2bac59038e
208 /* init stuff with the user specified complexity */ 208 /* init stuff with the user specified complexity */
209 if(s->avctx->rc_initial_cplx){ 209 if(s->avctx->rc_initial_cplx){
210 for(i=0; i<60*30; i++){ 210 for(i=0; i<60*30; i++){
211 double bits= s->avctx->rc_initial_cplx * (i/10000.0 + 1.0)*s->mb_num; 211 double bits= s->avctx->rc_initial_cplx * (i/10000.0 + 1.0)*s->mb_num;
212 RateControlEntry rce; 212 RateControlEntry rce;
213 double q;
214 213
215 if (i%((s->gop_size+3)/4)==0) rce.pict_type= FF_I_TYPE; 214 if (i%((s->gop_size+3)/4)==0) rce.pict_type= FF_I_TYPE;
216 else if(i%(s->max_b_frames+1)) rce.pict_type= FF_B_TYPE; 215 else if(i%(s->max_b_frames+1)) rce.pict_type= FF_B_TYPE;
217 else rce.pict_type= FF_P_TYPE; 216 else rce.pict_type= FF_P_TYPE;
218 217
238 rcc->i_cplx_sum [rce.pict_type] += rce.i_tex_bits*rce.qscale; 237 rcc->i_cplx_sum [rce.pict_type] += rce.i_tex_bits*rce.qscale;
239 rcc->p_cplx_sum [rce.pict_type] += rce.p_tex_bits*rce.qscale; 238 rcc->p_cplx_sum [rce.pict_type] += rce.p_tex_bits*rce.qscale;
240 rcc->mv_bits_sum[rce.pict_type] += rce.mv_bits; 239 rcc->mv_bits_sum[rce.pict_type] += rce.mv_bits;
241 rcc->frame_count[rce.pict_type] ++; 240 rcc->frame_count[rce.pict_type] ++;
242 241
243 bits= rce.i_tex_bits + rce.p_tex_bits; 242 get_qscale(s, &rce, rcc->pass1_wanted_bits/rcc->pass1_rc_eq_output_sum, i);
244
245 q= get_qscale(s, &rce, rcc->pass1_wanted_bits/rcc->pass1_rc_eq_output_sum, i);
246 rcc->pass1_wanted_bits+= s->bit_rate/(1/av_q2d(s->avctx->time_base)); //FIXME misbehaves a little for variable fps 243 rcc->pass1_wanted_bits+= s->bit_rate/(1/av_q2d(s->avctx->time_base)); //FIXME misbehaves a little for variable fps
247 } 244 }
248 } 245 }
249 246
250 } 247 }