libvpx: Pull from upstream

source/libvpx/vp8/encoder/denoising.c

 /*
  *  Copyright (c) 2012 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 356 matching lines @@
 
 void vp8_denoiser_set_parameters(VP8_DENOISER *denoiser, int mode) {
   assert(mode > 0);  // Denoiser is allocated only if mode > 0.
   if (mode == 1) {
     denoiser->denoiser_mode = kDenoiserOnYOnly;
   } else if (mode == 2) {
     denoiser->denoiser_mode = kDenoiserOnYUV;
   } else if (mode == 3) {
     denoiser->denoiser_mode = kDenoiserOnYUVAggressive;
   } else {
-    denoiser->denoiser_mode = kDenoiserOnAdaptive;
+    denoiser->denoiser_mode = kDenoiserOnYUV;
   }
   if (denoiser->denoiser_mode != kDenoiserOnYUVAggressive) {
     denoiser->denoise_pars.scale_sse_thresh = 1;
     denoiser->denoise_pars.scale_motion_thresh = 8;
     denoiser->denoise_pars.scale_increase_filter = 0;
     denoiser->denoise_pars.denoise_mv_bias = 95;
     denoiser->denoise_pars.pickmode_mv_bias = 100;
     denoiser->denoise_pars.qp_thresh = 0;
     denoiser->denoise_pars.consec_zerolast = UINT_MAX;
     denoiser->denoise_pars.spatial_blur = 0;
   } else {
     denoiser->denoise_pars.scale_sse_thresh = 2;
     denoiser->denoise_pars.scale_motion_thresh = 16;
     denoiser->denoise_pars.scale_increase_filter = 1;
     denoiser->denoise_pars.denoise_mv_bias = 60;
     denoiser->denoise_pars.pickmode_mv_bias = 75;
     denoiser->denoise_pars.qp_thresh = 85;
     denoiser->denoise_pars.consec_zerolast = 15;
-    denoiser->denoise_pars.spatial_blur = 20;
+    denoiser->denoise_pars.spatial_blur = 0;
   }
 }
 
 int vp8_denoiser_allocate(VP8_DENOISER *denoiser, int width, int height,
                           int num_mb_rows, int num_mb_cols, int mode)
 {
     int i;
     assert(denoiser);
     denoiser->num_mb_cols = num_mb_cols;
 
@@ skipping 39 matching lines @@
     denoiser->nmse_source_diff_count = 0;
     denoiser->qp_avg = 0;
     // QP threshold below which we can go up to aggressive mode.
     denoiser->qp_threshold_up = 80;
     // QP threshold above which we can go back down to normal mode.
     // For now keep this second threshold high, so not used currently.
     denoiser->qp_threshold_down = 128;
     // Bitrate thresholds and noise metric (nmse) thresholds for switching to
     // aggressive mode.
     // TODO(marpan): Adjust thresholds, including effect on resolution.
-    denoiser->bitrate_threshold = 300000;  // (bits/sec).
-    denoiser->threshold_aggressive_mode = 35;
+    denoiser->bitrate_threshold = 400000;  // (bits/sec).
+    denoiser->threshold_aggressive_mode = 80;
     if (width * height > 1280 * 720) {
-      denoiser->bitrate_threshold = 2000000;
-      denoiser->threshold_aggressive_mode = 1400;
+      denoiser->bitrate_threshold = 2500000;
+      denoiser->threshold_aggressive_mode = 180;
     } else if (width * height > 960 * 540) {
-      denoiser->bitrate_threshold = 800000;
-      denoiser->threshold_aggressive_mode = 150;
+      denoiser->bitrate_threshold = 1000000;
+      denoiser->threshold_aggressive_mode = 120;
     } else if (width * height > 640 * 480) {
-      denoiser->bitrate_threshold = 500000;
+      denoiser->bitrate_threshold = 600000;
       denoiser->threshold_aggressive_mode = 100;
     }
     return 0;
 }
 
 
 void vp8_denoiser_free(VP8_DENOISER *denoiser)
 {
     int i;
     assert(denoiser);
@@ skipping 253 matching lines @@
       }
       if (apply_filter) {
         // Update the signal block |x|. Pixel changes are only to top and/or
         // left boundary pixels: can we avoid full block copy here.
         vp8_copy_mem16x16(
             denoiser->yv12_running_avg[INTRA_FRAME].y_buffer + recon_yoffset,
             y_stride, x->thismb, 16);
       }
     }
 }