generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix failure with libvpx__unit_tests-multi-target"

Browse Source
This commit is contained in:
Marco Paniconi 2016-01-29 18:55:13 +00:00 committed by Gerrit Code Review
commit 432136ef56
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/encoder/vp9_encodeframe.c
View File

@ -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,
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];