comparison ratecontrol.c @ 847:f3c369b8ddca libavcodec

reversing header game MIN/MAX -> FFMIN/FFMAX
author michaelni
date Sun, 10 Nov 2002 11:46:59 +0000
parents 07e58dc635a5
children 22ee74da2cd3
comparison
equal deleted inserted replaced
846:ade627a74709 847:f3c369b8ddca
403 double d= 2*(buffer_size - expected_size)/buffer_size; 403 double d= 2*(buffer_size - expected_size)/buffer_size;
404 if(d>1.0) d=1.0; 404 if(d>1.0) d=1.0;
405 else if(d<0.0001) d=0.0001; 405 else if(d<0.0001) d=0.0001;
406 q*= pow(d, 1.0/s->avctx->rc_buffer_aggressivity); 406 q*= pow(d, 1.0/s->avctx->rc_buffer_aggressivity);
407 407
408 q= MIN(q, bits2qp(rce, MAX((min_rate - buffer_size + rcc->buffer_index)*2, 1))); 408 q= FFMIN(q, bits2qp(rce, FFMAX((min_rate - buffer_size + rcc->buffer_index)*2, 1)));
409 } 409 }
410 410
411 if(max_rate){ 411 if(max_rate){
412 double d= 2*expected_size/buffer_size; 412 double d= 2*expected_size/buffer_size;
413 if(d>1.0) d=1.0; 413 if(d>1.0) d=1.0;
414 else if(d<0.0001) d=0.0001; 414 else if(d<0.0001) d=0.0001;
415 q/= pow(d, 1.0/s->avctx->rc_buffer_aggressivity); 415 q/= pow(d, 1.0/s->avctx->rc_buffer_aggressivity);
416 416
417 q= MAX(q, bits2qp(rce, MAX(rcc->buffer_index/2, 1))); 417 q= FFMAX(q, bits2qp(rce, FFMAX(rcc->buffer_index/2, 1)));
418 } 418 }
419 } 419 }
420 //printf("q:%f max:%f min:%f size:%f index:%d bits:%f agr:%f\n", q,max_rate, min_rate, buffer_size, rcc->buffer_index, bits, s->avctx->rc_buffer_aggressivity); 420 //printf("q:%f max:%f min:%f size:%f index:%d bits:%f agr:%f\n", q,max_rate, min_rate, buffer_size, rcc->buffer_index, bits, s->avctx->rc_buffer_aggressivity);
421 if(s->avctx->rc_qsquish==0.0 || qmin==qmax){ 421 if(s->avctx->rc_qsquish==0.0 || qmin==qmax){
422 if (q<qmin) q=qmin; 422 if (q<qmin) q=qmin;