Merge "RD costing fix in loop-restoration expt" into nextgenv2

vp10/encoder/pickrst.c

@@ -77,7 +77,7 @@ static int search_bilateral_level(const YV12_BUFFER_CONFIG *sd,
   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 @@ static int search_bilateral_level(const YV12_BUFFER_CONFIG *sd,
     // 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 @@ static int search_wiener_filter(const YV12_BUFFER_CONFIG *src,
   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 @@ static int search_wiener_filter(const YV12_BUFFER_CONFIG *src,
   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);