summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_rdopt.c
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2014-02-11 10:19:59 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-02-11 10:19:59 -0800
commit28f46aa633f10a1dd7fb1b48f79b4696d08baec5 (patch)
tree90326814041965bed4532767ed5d3510f1e63340 /vp9/encoder/vp9_rdopt.c
parentc6574f4daf2dc31ceab6aa715cc92e23c34efc8c (diff)
parent71b7cb2006b26ba1d7c9d07bc427d28dbde06fb8 (diff)
downloadlibvpx-28f46aa633f10a1dd7fb1b48f79b4696d08baec5.tar
libvpx-28f46aa633f10a1dd7fb1b48f79b4696d08baec5.tar.gz
libvpx-28f46aa633f10a1dd7fb1b48f79b4696d08baec5.tar.bz2
libvpx-28f46aa633f10a1dd7fb1b48f79b4696d08baec5.zip
Merge "Fixing errorperbit calculation."
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
-rw-r--r--vp9/encoder/vp9_rdopt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index eddf27c83..4408353ab 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -285,7 +285,8 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi) {
cpi->RDDIV = RDDIV_BITS; // in bits (to multiply D by 128)
cpi->RDMULT = vp9_compute_rd_mult(cpi, qindex);
- x->errorperbit = cpi->RDMULT / RD_MULT_EPB_RATIO + (x->errorperbit == 0);
+ x->errorperbit = cpi->RDMULT / RD_MULT_EPB_RATIO;
+ x->errorperbit += (x->errorperbit == 0);
vp9_set_speed_features(cpi);