shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Non-rd pickmode: Don't skip checking zeromv-last mode."

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -1238,10 +1238,12 @@

     if (const_motion[ref_frame] && this_mode == NEARMV)

       continue;

-    i = (ref_frame == LAST_FRAME) ? GOLDEN_FRAME : LAST_FRAME;

-    if ((cpi->ref_frame_flags & flag_list[i]) && sf->reference_masking)

-      if (x->pred_mv_sad[ref_frame] > (x->pred_mv_sad[i] << 1))

-        ref_frame_skip_mask |= (1 << ref_frame);

+    if (!(this_mode == ZEROMV && ref_frame == LAST_FRAME)) {

+      i = (ref_frame == LAST_FRAME) ? GOLDEN_FRAME : LAST_FRAME;

+      if ((cpi->ref_frame_flags & flag_list[i]) && sf->reference_masking)

+        if (x->pred_mv_sad[ref_frame] > (x->pred_mv_sad[i] << 1))

+          ref_frame_skip_mask |= (1 << ref_frame);

+    }

     if (ref_frame_skip_mask & (1 << ref_frame))

       continue;