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

Change-Id: Ie80b7a14e3505c40b5742793f84aa6fb9d21dab5

diff --git a/vp9/encoder/vp9_noise_estimate.c b/vp9/encoder/vp9_noise_estimate.c
index a17b3ee3ee7c6db41dd66e8b01590a3ed3ae2807..a96b912d8cd6328a08436f5ba187d5e458da3e2e 100644 (file)
--- a/vp9/encoder/vp9_noise_estimate.c
+++ b/vp9/encoder/vp9_noise_estimate.c
@@ -174,14 +174,17 @@ void vp9_update_noise_estimate(VP9_COMP *const cpi) {
                                      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 &&