shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Modify early exit for alt_ref in nonrd_pickmode."

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

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

@@ -1582,9 +1582,7 @@

       skip_ref_find_pred[LAST_FRAME] = 1;

       skip_ref_find_pred[GOLDEN_FRAME] = 1;

     }

-    if (cm->show_frame == 0) {

-      usable_ref_frame = GOLDEN_FRAME;

-      skip_ref_find_pred[ALTREF_FRAME] = 1;

+    if (!cm->show_frame) {

       if (cpi->rc.frames_since_key == 1) {

         usable_ref_frame = LAST_FRAME;

         skip_ref_find_pred[GOLDEN_FRAME] = 1;

@@ -1679,6 +1677,10 @@

       if (cpi->rc.is_src_frame_alt_ref &&

           (ref_frame != ALTREF_FRAME ||

            frame_mv[this_mode][ref_frame].as_int != 0))

+        continue;

+

+      if (!cm->show_frame && ref_frame == ALTREF_FRAME &&

+          frame_mv[this_mode][ref_frame].as_int != 0)

         continue;

       if (cpi->rc.alt_ref_gf_group && cm->show_frame &&