ref: f51dd8c2ac7dcdbc269918b0d0fe30920f5641f7
parent: dc2e97c900752c4305031a93a3b4755f2e59ff80
parent: 924868964520d62debce5a77b7186383d573d9fb
author: Marco Paniconi <marpan@google.com>
date: Mon Feb 1 13:48:46 EST 2016
Merge "vp9 non-rd partition: Update condition on force_split for skin area."
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -773,12 +773,13 @@
vp9_build_inter_predictors_sb(xd, mi_row, mi_col, BLOCK_64X64);
// Check if most of the superblock is skin content, and if so, force split
- // to 32x32. Avoid checking superblocks on/near boundary for high resoln
+ // to 32x32. Avoid checking superblocks on/near boundary and avoid low
+ // resolutons for now.
// 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 &&
+ 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;
int num_16x16_nonskin = 0;