Merge "Fixing errorperbit calculation."

28f46aa6 · Dmitry Kovalev · Gerrit Code Review · c6574f4d · 71b7cb20 · 28f46aa6
Commit 28f46aa6 authored Feb 11, 2014 by Dmitry Kovalev Committed by Gerrit Code Review Feb 11, 2014
--- 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);