ref: b16c77cdc4de7a3245d35fe87f1d5d87779ef238
parent: eacc3b4ccfa7541ee69bb37b7e72c0bbcf60c126
author: Marco <[email protected]>
date: Thu Jan 26 15:01:41 EST 2017
vp9: Modify bsize condition for using model_rd_large. In non-rd pickmode: small change in behavior for speed 6 and 7. Remove condition on HIGHBITDEPTH flag. Change-Id: I360a13fcc313d72612fe9b918162ef4bb278cdea
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1793,15 +1793,9 @@
pd->dst.stride = this_mode_pred->stride;
}
} else {-// TODO(jackychen): the low-bitdepth condition causes a segfault in
-// high-bitdepth builds.
-// https://bugs.chromium.org/p/webm/issues/detail?id=1250
-#if CONFIG_VP9_HIGHBITDEPTH
- const int large_block = bsize > BLOCK_32X32;
-#else
- const int large_block =
- x->sb_is_skin ? bsize > BLOCK_32X32 : bsize >= BLOCK_32X32;
-#endif
+ const int large_block = (x->sb_is_skin || cpi->oxcf.speed < 8)
+ ? bsize > BLOCK_32X32
+ : bsize >= BLOCK_32X32;
mi->interp_filter = (filter_ref == SWITCHABLE) ? EIGHTTAP : filter_ref;
vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize);