shithub: libvpx

Info  •  Files  •  Log  •  Branches

Testing of modes with Alt Ref frame

Previously when a frame was being overlaid on a previously coded
alt ref frame we only checked the alt ref 0,0 mode. Where there is
a possibility that the alt ref buffer is a filtered frame we should allow
the other prediction modes as normal or at the least allow use of
the last frame buffer.

Change-Id: I4d6227223d125c96b4f3066ec6ec9484fee7768c

--- a/vp8/encoder/pickinter.c

+++ b/vp8/encoder/pickinter.c

@@ -608,8 +608,10 @@

             memcpy(mdcounts, MDCounts[x->e_mbd.mode_info_context->mbmi.ref_frame], sizeof(mdcounts));

         }

-        //Only consider ZEROMV/ALTREF_FRAME for alt ref frame.

-        if (cpi->is_src_frame_alt_ref)

+        // Only consider ZEROMV/ALTREF_FRAME for alt ref frame,

+        // unless ARNR filtering is enabled in which case we want

+        // an unfiltered alternative

+        if (cpi->is_src_frame_alt_ref && (cpi->oxcf.arnr_max_frames == 0))

         {

             if (this_mode != ZEROMV || x->e_mbd.mode_info_context->mbmi.ref_frame != ALTREF_FRAME)

                 continue;

--- a/vp8/encoder/rdopt.c

+++ b/vp8/encoder/rdopt.c

@@ -1852,8 +1852,7 @@

         // Only consider ZEROMV/ALTREF_FRAME for alt ref frame,

         // unless ARNR filtering is enabled in which case we want

         // an unfiltered alternative

-        //if (cpi->is_src_frame_alt_ref && (cpi->oxcf.arnr_max_frames > 0))

-        if (cpi->is_src_frame_alt_ref)

+        if (cpi->is_src_frame_alt_ref && (cpi->oxcf.arnr_max_frames == 0))

         {

             if (this_mode != ZEROMV || x->e_mbd.mode_info_context->mbmi.ref_frame != ALTREF_FRAME)

                 continue;

-- 

⑨