shithub: libvpx

Download patch

ref: 80ed9e4f5c4c0216ac3de9595672754899e03450
parent: 2c8338f982f4974174964c2cf82ccbea8e8c6caf
author: Marco <marpan@google.com>
date: Fri Apr 22 06:35:29 EDT 2016

vp9-noise estimation: Add check on whether skin detection is enabled.

Change-Id: Ie80b7a14e3505c40b5742793f84aa6fb9d21dab5

--- a/vp9/encoder/vp9_noise_estimate.c
+++ b/vp9/encoder/vp9_noise_estimate.c
@@ -174,14 +174,17 @@
                                      VPXMIN(cpi->consec_zero_mv[bl_index1],
                                      VPXMIN(cpi->consec_zero_mv[bl_index2],
                                      cpi->consec_zero_mv[bl_index3])));
-          int is_skin = vp9_compute_skin_block(src_y,
-                                               src_u,
-                                               src_v,
-                                               src_ystride,
-                                               src_uvstride,
-                                               bsize,
-                                               consec_zeromv,
-                                               0);
+          int is_skin = 0;
+          if (cpi->use_skin_detection) {
+            is_skin = vp9_compute_skin_block(src_y,
+                                             src_u,
+                                             src_v,
+                                             src_ystride,
+                                             src_uvstride,
+                                             bsize,
+                                             consec_zeromv,
+                                             0);
+          }
           if (frame_low_motion &&
               cpi->consec_zero_mv[bl_index] > thresh_consec_zeromv &&
               cpi->consec_zero_mv[bl_index1] > thresh_consec_zeromv &&