shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Conditionally skip reference frame check"

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -2975,6 +2975,13 @@

       if (x->pred_mv_sad[ALTREF_FRAME] > (x->pred_mv_sad[GOLDEN_FRAME] << 1))

         mode_skip_mask[ALTREF_FRAME] |= INTER_ALL;

+  if (cpi->sf.adaptive_mode_search) {

+    if (cm->show_frame && !cpi->rc.is_src_frame_alt_ref &&

+        cpi->rc.frames_since_golden >= 3)

+      if (x->pred_mv_sad[GOLDEN_FRAME] > (x->pred_mv_sad[LAST_FRAME] << 1))

+        mode_skip_mask[GOLDEN_FRAME] |= INTER_ALL;

+  }

+

   if (bsize > cpi->sf.max_intra_bsize) {

     ref_frame_skip_mask[0] |= (1 << INTRA_FRAME);

     ref_frame_skip_mask[1] |= (1 << INTRA_FRAME);