commit 72e3b5b2c50d86a63a18dda7fee8c5a29ffacd83
author Marco <marpan@google.com> Fri Jan 29 10:00:21 2016 -0800
committer Marco <marpan@google.com> Fri Jan 29 10:05:08 2016 -0800
tree 0821a2a6d6173204fd9326b4d56a3261148a2234
parent bca1a350c9fbeb55e42ed57c3ef31a8b65e90228

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

vp9/encoder/vp9_encodeframe.c

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index f6951bf..53c9510 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -777,6 +777,7 @@
     // 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 @@
         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];