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.
  */
 
 
 #include <stdio.h>
 #include <math.h>
 #include <limits.h>
 #include <assert.h>
 #include "vpx_config.h"
 #include "vp8_rtcd.h"
-#include "vp8/common/pragmas.h"
 #include "tokenize.h"
 #include "treewriter.h"
 #include "onyx_int.h"
 #include "modecosts.h"
 #include "encodeintra.h"
 #include "pickinter.h"
 #include "vp8/common/entropymode.h"
 #include "vp8/common/reconinter.h"
 #include "vp8/common/reconintra4x4.h"
 #include "vp8/common/findnearmv.h"
@@ skipping 1900 matching lines @@
         int i;
         for (i = 0; i < 16; i++)
         {
             best_mode->bmodes[i] = x->e_mbd.block[i].bmi;
         }
     }
 }
 
 void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
                             int recon_uvoffset, int *returnrate,
-                            int *returndistortion, int *returnintra)
+                            int *returndistortion, int *returnintra,
+                            int mb_row, int mb_col)
 {
     BLOCK *b = &x->block[0];
     BLOCKD *d = &x->e_mbd.block[0];
     MACROBLOCKD *xd = &x->e_mbd;
     int_mv best_ref_mv_sb[2];
     int_mv mode_mv_sb[2][MB_MODE_COUNT];
     int_mv best_ref_mv;
     int_mv *mode_mv;
     MB_PREDICTION_MODE this_mode;
     int num00;
@@ skipping 17 matching lines @@
     int sr=0;
 
     unsigned char *plane[4][3];
     int ref_frame_map[4];
     int sign_bias = 0;
 
     int intra_rd_penalty =  10* vp8_dc_quant(cpi->common.base_qindex,
                                              cpi->common.y1dc_delta_q);
 
 #if CONFIG_TEMPORAL_DENOISING
-    unsigned int zero_mv_sse = INT_MAX, best_sse = INT_MAX,
-            best_rd_sse = INT_MAX;
+    unsigned int zero_mv_sse = UINT_MAX, best_sse = UINT_MAX,
+            best_rd_sse = UINT_MAX;
 #endif
 
     mode_mv = mode_mv_sb[sign_bias];
     best_ref_mv.as_int = 0;
     best_mode.rd = INT_MAX;
     best_mode.yrd = INT_MAX;
     best_mode.intra_rd = INT_MAX;
     vpx_memset(mode_mv_sb, 0, sizeof(mode_mv_sb));
     vpx_memset(&best_mode.mbmode, 0, sizeof(best_mode.mbmode));
     vpx_memset(&best_mode.bmodes, 0, sizeof(best_mode.bmodes));
@@ skipping 515 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 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);
+                                recon_yoffset, recon_uvoffset,
+                                &cpi->common.lf_info, mb_row, mb_col,
+                                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;
@@ skipping 95 matching lines @@
         x->e_mbd.mode_info_context->mbmi.mode = B_PRED;
         rate += rate4x4;
     }
     else
     {
         rate += rate16x16;
     }
 
     *rate_ = rate;
 }