diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-06-21 09:47:42 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-06-21 09:47:42 -0700 |
| commit | 76495617e05d7192f887c688fa177fea77b9469b (patch) | |
| tree | e639c7870952819ad94c400ed016a55d6a31f965 /vp8/encoder | |
| parent | 55c3963c8828552b16473f0c8df370d501f27922 (diff) | |
| parent | 10ed60dc718aa6133508c2fb5183cfc7dc67e920 (diff) | |
| download | libvpx-76495617e05d7192f887c688fa177fea77b9469b.tar libvpx-76495617e05d7192f887c688fa177fea77b9469b.tar.gz libvpx-76495617e05d7192f887c688fa177fea77b9469b.tar.bz2 libvpx-76495617e05d7192f887c688fa177fea77b9469b.zip | |
Merge "adjusting the calculation of errorperbit"
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 7 | ||||
| -rw-r--r-- | vp8/encoder/rdopt.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 892284ed2..132e50858 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -335,7 +335,8 @@ void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x) { #if USE_ACT_INDEX 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 INT64 a; INT64 b; @@ -346,8 +347,8 @@ void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x) b = (2*act) + cpi->activity_avg; 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 // Activity based Zbin adjustment diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 5ce61a04e..e05ffdb1a 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -238,7 +238,7 @@ void vp8_initialize_rd_consts(VP8_COMP *cpi, int Qvalue) (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); vp8_set_speed_features(cpi); |