commit 2c7b94f6ecb7c1b3a6807259dcfd23dfa471d0c4
author Deb Mukherjee <debargha@google.com> Fri Oct 03 11:37:47 2014 -0700
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Fri Oct 03 11:37:47 2014 -0700
tree 8dc4652dc40bfbe96fdef1e3a9f166307486561a
parent 00a4b20fbecc1137ff9a0421d51f4131013bb70a
parent 431cdc33eee902bbc1c4272a8551e3734fe4a16f

Merge "Prevent negative cost for highbitdepth"

vp9/encoder/vp9_rd.c

diff --git a/vp9/encoder/vp9_rd.c b/vp9/encoder/vp9_rd.c
index efb8686..75c3964 100644
--- a/vp9/encoder/vp9_rd.c
+++ b/vp9/encoder/vp9_rd.c
@@ -138,7 +138,7 @@
 int vp9_compute_rd_mult(const VP9_COMP *cpi, int qindex) {
   const int64_t q = vp9_dc_quant(qindex, 0, cpi->common.bit_depth);
 #if CONFIG_VP9_HIGHBITDEPTH
-  int rdmult = 0;
+  int64_t rdmult = 0;
   switch (cpi->common.bit_depth) {
     case VPX_BITS_8:
       rdmult = 88 * q * q / 24;
@@ -154,7 +154,7 @@
       return -1;
   }
 #else
-  int rdmult = 88 * q * q / 24;
+  int64_t rdmult = 88 * q * q / 24;
 #endif  // CONFIG_VP9_HIGHBITDEPTH
   if (cpi->oxcf.pass == 2 && (cpi->common.frame_type != KEY_FRAME)) {
     const GF_GROUP *const gf_group = &cpi->twopass.gf_group;
@@ -164,7 +164,7 @@
     rdmult = (rdmult * rd_frame_type_factor[frame_type]) >> 7;
     rdmult += ((rdmult * rd_boost_factor[boost_index]) >> 7);
   }
-  return rdmult;
+  return (int)rdmult;
 }
 
 static int compute_rd_thresh_factor(int qindex, vpx_bit_depth_t bit_depth) {