comparison ratecontrol.c @ 707:c0a914cc90c0 libavcodec

renaming variable
author michaelni
date Sun, 29 Sep 2002 23:21:13 +0000
parents b6a7ff92df57
children 07e58dc635a5
comparison
equal deleted inserted replaced
706:e65798d228ea 707:c0a914cc90c0
121 if(!(s->flags&CODEC_FLAG_PASS2)){ 121 if(!(s->flags&CODEC_FLAG_PASS2)){
122 122
123 rcc->short_term_qsum=0.001; 123 rcc->short_term_qsum=0.001;
124 rcc->short_term_qcount=0.001; 124 rcc->short_term_qcount=0.001;
125 125
126 rcc->pass1_bits =0.001; 126 rcc->pass1_rc_eq_output_sum= 0.001;
127 rcc->pass1_wanted_bits=0.001; 127 rcc->pass1_wanted_bits=0.001;
128 128
129 /* init stuff with the user specified complexity */ 129 /* init stuff with the user specified complexity */
130 if(s->avctx->rc_initial_cplx){ 130 if(s->avctx->rc_initial_cplx){
131 for(i=0; i<60*30; i++){ 131 for(i=0; i<60*30; i++){
161 rcc->mv_bits_sum[rce.pict_type] += rce.mv_bits; 161 rcc->mv_bits_sum[rce.pict_type] += rce.mv_bits;
162 rcc->frame_count[rce.pict_type] ++; 162 rcc->frame_count[rce.pict_type] ++;
163 163
164 bits= rce.i_tex_bits + rce.p_tex_bits; 164 bits= rce.i_tex_bits + rce.p_tex_bits;
165 165
166 q= get_qscale(s, &rce, rcc->pass1_wanted_bits/rcc->pass1_bits, i); 166 q= get_qscale(s, &rce, rcc->pass1_wanted_bits/rcc->pass1_rc_eq_output_sum, i);
167 rcc->pass1_wanted_bits+= s->bit_rate/(s->frame_rate / (double)FRAME_RATE_BASE); 167 rcc->pass1_wanted_bits+= s->bit_rate/(s->frame_rate / (double)FRAME_RATE_BASE);
168 } 168 }
169 } 169 }
170 170
171 } 171 }
294 NULL 294 NULL
295 }; 295 };
296 296
297 bits= ff_eval(s->avctx->rc_eq, const_values, const_names, func1, func1_names, NULL, NULL, rce); 297 bits= ff_eval(s->avctx->rc_eq, const_values, const_names, func1, func1_names, NULL, NULL, rce);
298 298
299 rcc->pass1_bits+= bits; 299 rcc->pass1_rc_eq_output_sum+= bits;
300 bits*=rate_factor; 300 bits*=rate_factor;
301 if(bits<0.0) bits=0.0; 301 if(bits<0.0) bits=0.0;
302 bits+= 1.0; //avoid 1/0 issues 302 bits+= 1.0; //avoid 1/0 issues
303 303
304 /* user override */ 304 /* user override */
626 rcc->p_cplx_sum [pict_type] += rce->p_tex_bits*rce->qscale; 626 rcc->p_cplx_sum [pict_type] += rce->p_tex_bits*rce->qscale;
627 rcc->mv_bits_sum[pict_type] += rce->mv_bits; 627 rcc->mv_bits_sum[pict_type] += rce->mv_bits;
628 rcc->frame_count[pict_type] ++; 628 rcc->frame_count[pict_type] ++;
629 629
630 bits= rce->i_tex_bits + rce->p_tex_bits; 630 bits= rce->i_tex_bits + rce->p_tex_bits;
631 rate_factor= rcc->pass1_wanted_bits/rcc->pass1_bits * br_compensation; 631 rate_factor= rcc->pass1_wanted_bits/rcc->pass1_rc_eq_output_sum * br_compensation;
632 632
633 q= get_qscale(s, rce, rate_factor, picture_number); 633 q= get_qscale(s, rce, rate_factor, picture_number);
634 634
635 assert(q>0.0); 635 assert(q>0.0);
636 //printf("%f ", q); 636 //printf("%f ", q);