libvpx: Pull from upstream

source/libvpx/vp8/encoder/rdopt.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 2493 matching lines @@
                     x->rd_thresh_mult[best_mode_index] - best_adjustment :
                     MIN_THRESHMULT;
         x->rd_threshes[best_mode_index] =
             (cpi->rd_baseline_thresh[best_mode_index] >> 7) *
                 x->rd_thresh_mult[best_mode_index];
     }
 
 #if CONFIG_TEMPORAL_DENOISING
     if (cpi->oxcf.noise_sensitivity)
     {
-        int uv_denoise = (cpi->oxcf.noise_sensitivity == 2) ? 1 : 0;
         int block_index = mb_row * cpi->common.mb_cols + mb_col;
         if (x->best_sse_inter_mode == DC_PRED)
         {
             /* No best MV found. */
             x->best_sse_inter_mode = best_mode.mbmode.mode;
             x->best_sse_mv = best_mode.mbmode.mv;
             x->need_to_clamp_best_mvs = best_mode.mbmode.need_to_clamp_mvs;
             x->best_reference_frame = best_mode.mbmode.ref_frame;
             best_sse = best_rd_sse;
         }
         vp8_denoiser_denoise_mb(&cpi->denoiser, x, best_sse, zero_mv_sse,
                                 recon_yoffset, recon_uvoffset,
                                 &cpi->common.lf_info, mb_row, mb_col,
-                                block_index, uv_denoise);
-
+                                block_index);
 
         /* Reevaluate ZEROMV after denoising. */
         if (best_mode.mbmode.ref_frame == INTRA_FRAME &&
             x->best_zeromv_reference_frame != INTRA_FRAME)
         {
             int this_rd = INT_MAX;
             int disable_skip = 0;
             int other_cost = 0;
             int this_ref_frame = x->best_zeromv_reference_frame;
             rd.rate2 = x->ref_frame_cost[this_ref_frame] +
@@ skipping 94 matching lines @@
         x->e_mbd.mode_info_context->mbmi.mode = B_PRED;
         rate += rate4x4;
     }
     else
     {
         rate += rate16x16;
     }
 
     *rate_ = rate;
 }