From: Marco <marpan@google.com>
Date: Thu, 22 Jun 2017 00:30:53 +0000 (-0700)
Subject: vp9: Put skin detection usage around cpi flag.
X-Git-Tag: v1.7.0~380
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21afafa31a5756f88a141665cc84931d897b7662;p=libvpx

vp9: Put skin detection usage around cpi flag.

Skin detection usage in choose_partitioning should be
around the cpi->use_skin_detection.

Change-Id: I6986179af9ce94c60c0974d66c311fc07cc04cfe
---

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 6215e198c..4b7e0ca77 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1197,7 +1197,9 @@ static int choose_partitioning(VP9_COMP *cpi, const TileInfo *const tile,
     set_ref_ptrs(cm, xd, mi->ref_frame[0], mi->ref_frame[1]);
     vp9_build_inter_predictors_sb(xd, mi_row, mi_col, BLOCK_64X64);
 
-    x->sb_is_skin = skin_sb_split(cpi, x, low_res, mi_row, mi_col, force_split);
+    if (cpi->use_skin_detection)
+      x->sb_is_skin =
+          skin_sb_split(cpi, x, low_res, mi_row, mi_col, force_split);
 
     d = xd->plane[0].dst.buf;
     dp = xd->plane[0].dst.stride;