From: Marco <marpan@google.com>
Date: Fri, 29 Jan 2016 18:00:21 +0000 (-0800)
Subject: Fix failure with libvpx__unit_tests-multi-target
X-Git-Tag: v1.6.0~403^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72e3b5b2c50d86a63a18dda7fee8c5a29ffacd83;p=libvpx

Fix failure with libvpx__unit_tests-multi-target

Introduced in: https://chromium-review.googlesource.com/#/c/323215/
For now exclude the computation of vp_compute_skin_block for highbitdepth.

Change-Id: I18107a862c17ba869438ec3616a787bf173736c4
---

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index f6951bfbe..53c9510bd 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -777,6 +777,7 @@ static int choose_partitioning(VP9_COMP *cpi,
     // Note superblock may still pick 64X64 if y_sad is very small
     // (i.e., y_sad < cpi->vbp_threshold_sad) below. For now leave this as is.
     x->sb_is_skin = 0;
+#if !CONFIG_VP9_HIGHBITDEPTH
     if (cpi->oxcf.content != VP9E_CONTENT_SCREEN && (low_res || (mi_col >= 8 &&
         mi_col + 8 < cm->mi_cols && mi_row >= 8 && mi_row + 8 < cm->mi_rows))) {
       int num_16x16_skin = 0;
@@ -813,6 +814,7 @@ static int choose_partitioning(VP9_COMP *cpi,
         force_split[0] = 1;
       }
     }
+#endif
     for (i = 1; i <= 2; ++i) {
       struct macroblock_plane  *p = &x->plane[i];
       struct macroblockd_plane *pd = &xd->plane[i];