From 6fbbb33aaf48748ad36d9807642e3ac2c5185777 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Tue, 27 May 2014 18:14:14 -0700 Subject: [PATCH] Always allow ZEROMV when SEG_LVL_SKIP is on. Change-Id: I6db1dc82f66438ac48f571d2f1a2ac7c39a97a1a --- vp9/encoder/vp9_rdopt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index d24850e6d..d402d7b40 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3129,6 +3129,8 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, if (vp9_segfeature_active(seg, segment_id, SEG_LVL_SKIP)) { const int inter_non_zero_mode_mask = 0x1F7F7; mode_skip_mask |= inter_non_zero_mode_mask; + mode_skip_mask &= ~(1 << THR_ZEROMV); + disable_inter_mode_mask = ~(1 << INTER_OFFSET(ZEROMV)); } // Disable this drop out case if the ref frame