diff options
| author | Marco <marpan@google.com> | 2016-01-29 10:00:21 -0800 |
|---|---|---|
| committer | Marco <marpan@google.com> | 2016-01-29 10:05:08 -0800 |
| commit | 72e3b5b2c50d86a63a18dda7fee8c5a29ffacd83 (patch) | |
| tree | 0821a2a6d6173204fd9326b4d56a3261148a2234 /vp9/encoder | |
| parent | bca1a350c9fbeb55e42ed57c3ef31a8b65e90228 (diff) | |
| download | libvpx-72e3b5b2c50d86a63a18dda7fee8c5a29ffacd83.tar libvpx-72e3b5b2c50d86a63a18dda7fee8c5a29ffacd83.tar.gz libvpx-72e3b5b2c50d86a63a18dda7fee8c5a29ffacd83.tar.bz2 libvpx-72e3b5b2c50d86a63a18dda7fee8c5a29ffacd83.zip | |
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
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 2 insertions, 0 deletions
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]; |