summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2013-07-25 10:28:38 -0700
committerYaowu Xu <yaowu@google.com>2013-07-25 10:28:38 -0700
commit3e386aefc20333209639a19f1a3a5559c25de2c2 (patch)
tree67536bb1e65a2ec43b041df2ac529f775710060c
parentfcc34796d2376575ecb34d0d381a84b03bc6ad81 (diff)
downloadlibvpx-3e386aefc20333209639a19f1a3a5559c25de2c2.tar
libvpx-3e386aefc20333209639a19f1a3a5559c25de2c2.tar.gz
libvpx-3e386aefc20333209639a19f1a3a5559c25de2c2.tar.bz2
libvpx-3e386aefc20333209639a19f1a3a5559c25de2c2.zip
fix a bug where flags are not reset
The feature that uses small partition results as a measure to skip mode evaluation at larger partition requires the flags to be reset. The reset was missing in the code path that calls rd_use_partition(). Change-Id: Ia0a3a0aee1a862b6e2333d596808db7c48033d50
-rw-r--r--vp9/encoder/vp9_encodeframe.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 798adc1f3..5fe136ece 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1213,6 +1213,10 @@ static void rd_use_partition(VP9_COMP *cpi, MODE_INFO *m, TOKENEXTRA **tp,
}
save_context(cpi, mi_row, mi_col, a, l, sa, sl, bsize);
+ x->fast_ms = 0;
+ x->pred_mv.as_int = 0;
+ x->subblock_ref = 0;
+
if (cpi->sf.adjust_partitioning_from_last_frame) {
// Check if any of the sub blocks are further split.
if (partition == PARTITION_SPLIT && subsize > BLOCK_SIZE_SB8X8) {