diff options
| author | Alex Converse <aconverse@google.com> | 2014-05-27 18:14:14 -0700 |
|---|---|---|
| committer | Alex Converse <aconverse@google.com> | 2014-05-27 18:17:17 -0700 |
| commit | 6fbbb33aaf48748ad36d9807642e3ac2c5185777 (patch) | |
| tree | 19acfb14a2d38866c69703a6e4f31b862b82e4bc | |
| parent | 75d77e36db70b5ca667fab6d935dcb3b82456554 (diff) | |
| download | libvpx-6fbbb33aaf48748ad36d9807642e3ac2c5185777.tar libvpx-6fbbb33aaf48748ad36d9807642e3ac2c5185777.tar.gz libvpx-6fbbb33aaf48748ad36d9807642e3ac2c5185777.tar.bz2 libvpx-6fbbb33aaf48748ad36d9807642e3ac2c5185777.zip | |
Always allow ZEROMV when SEG_LVL_SKIP is on.
Change-Id: I6db1dc82f66438ac48f571d2f1a2ac7c39a97a1a
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 |