Skip to content
GitLab
Commit 432136ef authored by Marco Paniconi's avatar Marco Paniconi Committed by Gerrit Code Review
Browse files

Merge "Fix failure with libvpx__unit_tests-multi-target"

parents b9723c4b 72e3b5b2
Show whitespace changes
Inline Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @ 432136ef
...@@ -777,6 +777,7 @@ static int choose_partitioning(VP9_COMP *cpi, ...@@ -777,6 +777,7 @@ static int choose_partitioning(VP9_COMP *cpi,
// Note superblock may still pick 64X64 if y_sad is very small // 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. // (i.e., y_sad < cpi->vbp_threshold_sad) below. For now leave this as is.
x->sb_is_skin = 0; x->sb_is_skin = 0;
#if !CONFIG_VP9_HIGHBITDEPTH
if (cpi->oxcf.content != VP9E_CONTENT_SCREEN && (low_res || (mi_col >= 8 && 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))) { mi_col + 8 < cm->mi_cols && mi_row >= 8 && mi_row + 8 < cm->mi_rows))) {
int num_16x16_skin = 0; int num_16x16_skin = 0;
...@@ -813,6 +814,7 @@ static int choose_partitioning(VP9_COMP *cpi, ...@@ -813,6 +814,7 @@ static int choose_partitioning(VP9_COMP *cpi,
force_split[0] = 1; force_split[0] = 1;
} }
} }
#endif
for (i = 1; i <= 2; ++i) { for (i = 1; i <= 2; ++i) {
struct macroblock_plane *p = &x->plane[i]; struct macroblock_plane *p = &x->plane[i];
struct macroblockd_plane *pd = &xd->plane[i]; struct macroblockd_plane *pd = &xd->plane[i];
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment