Commit 76495617 authored by Yaowu Xu's avatar Yaowu Xu Committed by Code Review
Browse files

Merge "adjusting the calculation of errorperbit"

parents 55c3963c 10ed60dc
...@@ -335,7 +335,8 @@ void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x) ...@@ -335,7 +335,8 @@ void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x)
{ {
#if USE_ACT_INDEX #if USE_ACT_INDEX
x->rdmult += *(x->mb_activity_ptr) * (x->rdmult >> 2); x->rdmult += *(x->mb_activity_ptr) * (x->rdmult >> 2);
x->errorperbit = x->rdmult/x->rddiv; x->errorperbit = x->rdmult * 100 /(110 * x->rddiv);
x->errorperbit += (x->errorperbit==0);
#else #else
INT64 a; INT64 a;
INT64 b; INT64 b;
...@@ -346,8 +347,8 @@ void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x) ...@@ -346,8 +347,8 @@ void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x)
b = (2*act) + cpi->activity_avg; b = (2*act) + cpi->activity_avg;
x->rdmult = (unsigned int)(((INT64)x->rdmult*b + (a>>1))/a); x->rdmult = (unsigned int)(((INT64)x->rdmult*b + (a>>1))/a);
x->errorperbit = x->rdmult/x->rddiv; x->errorperbit = x->rdmult * 100 /(110 * x->rddiv);
x->errorperbit += (x->errorperbit==0);
#endif #endif
// Activity based Zbin adjustment // Activity based Zbin adjustment
......
...@@ -238,7 +238,7 @@ void vp8_initialize_rd_consts(VP8_COMP *cpi, int Qvalue) ...@@ -238,7 +238,7 @@ void vp8_initialize_rd_consts(VP8_COMP *cpi, int Qvalue)
(cpi->RDMULT * rd_iifactor[cpi->twopass.next_iiratio]) >> 4; (cpi->RDMULT * rd_iifactor[cpi->twopass.next_iiratio]) >> 4;
} }
cpi->mb.errorperbit = (cpi->RDMULT / 100); cpi->mb.errorperbit = (cpi->RDMULT / 110);
cpi->mb.errorperbit += (cpi->mb.errorperbit==0); cpi->mb.errorperbit += (cpi->mb.errorperbit==0);
vp8_set_speed_features(cpi); vp8_set_speed_features(cpi);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment