From: Ronald S. Bultje <rbultje@google.com>
Date: Mon, 10 Jun 2013 17:54:29 +0000 (-0700)
Subject: Allow non-zeromv if ref_frame=intra with segmentation skip/ref enabled.
X-Git-Tag: v1.3.0~1104^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b12a8dac98aa90d08d094d0a3709ef3eddf32092;p=libvpx

Allow non-zeromv if ref_frame=intra with segmentation skip/ref enabled.

Change-Id: Ib5a95bb6ab643b276df3faa9bf99595e4a69ff18
---

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 06f571aaa..3d710dcf6 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2680,7 +2680,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
     // If the segment skip feature is enabled....
     // then do nothing if the current mode is not allowed..
     } else if (vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP) &&
-               (this_mode != ZEROMV)) {
+               (this_mode != ZEROMV && ref_frame != INTRA_FRAME)) {
       continue;
     // Disable this drop out case if the ref frame
     // segment level feature is enabled for this segment. This is to