diff options
| author | Marco <marpan@google.com> | 2016-04-22 10:35:29 -0700 |
|---|---|---|
| committer | Marco <marpan@google.com> | 2016-04-22 10:37:00 -0700 |
| commit | 80ed9e4f5c4c0216ac3de9595672754899e03450 (patch) | |
| tree | 8911850ba8749e08780f25737a70a604eb469dea /vp9/encoder | |
| parent | 2c8338f982f4974174964c2cf82ccbea8e8c6caf (diff) | |
| download | libvpx-80ed9e4f5c4c0216ac3de9595672754899e03450.tar libvpx-80ed9e4f5c4c0216ac3de9595672754899e03450.tar.gz libvpx-80ed9e4f5c4c0216ac3de9595672754899e03450.tar.bz2 libvpx-80ed9e4f5c4c0216ac3de9595672754899e03450.zip | |
vp9-noise estimation: Add check on whether skin detection is enabled.
Change-Id: Ie80b7a14e3505c40b5742793f84aa6fb9d21dab5
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_noise_estimate.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/vp9/encoder/vp9_noise_estimate.c b/vp9/encoder/vp9_noise_estimate.c index a17b3ee3e..a96b912d8 100644 --- 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 && |