commit aab64cdddc2ae5fb922a903b7e6eaed0bd37e4b6
author Debargha Mukherjee <debargha@google.com> Thu Jul 07 12:54:54 2016 -0700
committer Debargha Mukherjee <debargha@google.com> Thu Jul 07 12:54:54 2016 -0700
tree 53b746371fa19f8cd2c1fd4d710fa7bac0eb7d9f
parent fabc0ed7ad50cc327243653e20ae4e5538de23d4

RD costing fix in loop-restoration expt

Change-Id: I8dbc1002f5d6bf8f2409db8c6be4346f1df0590c

vp10/encoder/pickrst.c

diff --git a/vp10/encoder/pickrst.c b/vp10/encoder/pickrst.c
index 0002714..6e4f590 100644
--- a/vp10/encoder/pickrst.c
+++ b/vp10/encoder/pickrst.c
@@ -77,7 +77,7 @@
   err = try_restoration_frame(sd, cpi, &rsi, partial_frame);
   bits = 0;
   best_cost = RDCOST_DBL(x->rdmult, x->rddiv,
-                         (bits << (VP9_PROB_COST_SHIFT - 6)), err);
+                         (bits << (VP9_PROB_COST_SHIFT - 4)), err);
   for (i = 0; i < restoration_levels; ++i) {
     rsi.restoration_type = RESTORE_BILATERAL;
     rsi.restoration_level = i;
@@ -87,7 +87,7 @@
     // ratios appropriately but not exactly by these values.
     bits = restoration_level_bits;
     cost = RDCOST_DBL(x->rdmult, x->rddiv,
-                      (bits << (VP9_PROB_COST_SHIFT - 6)), err);
+                      (bits << (VP9_PROB_COST_SHIFT - 4)), err);
     if (cost < best_cost) {
       restoration_best = i;
       best_cost = cost;
@@ -536,7 +536,7 @@
   err = try_restoration_frame(src, cpi, &rsi, partial_frame);
   bits = 0;
   cost_norestore = RDCOST_DBL(x->rdmult, x->rddiv,
-                              (bits << (VP9_PROB_COST_SHIFT - 6)), err);
+                              (bits << (VP9_PROB_COST_SHIFT - 4)), err);
 
 #if CONFIG_VP9_HIGHBITDEPTH
   if (cm->use_highbitdepth)
@@ -574,7 +574,7 @@
   err = try_restoration_frame(src, cpi, &rsi, partial_frame);
   bits = WIENER_FILT_BITS;
   cost_wiener = RDCOST_DBL(x->rdmult, x->rddiv,
-                           (bits << (VP9_PROB_COST_SHIFT - 6)), err);
+                           (bits << (VP9_PROB_COST_SHIFT - 4)), err);
 
   vpx_yv12_copy_y(&cpi->last_frame_uf, cm->frame_to_show);