generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Testing of modes with Alt Ref frame

Browse Source 
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
This commit is contained in:
Paul Wilkins 2011-01-14 14:52:15 +00:00
parent 72e22b0bb8
commit 415371c9d9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp8/encoder/pickinter.c
View File

@ -608,8 +608,10 @@ int vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int rec
memcpy(mdcounts, MDCounts[x->e_mbd.mode_info_context->mbmi.ref_frame], sizeof(mdcounts)); memcpy(mdcounts, MDCounts[x->e_mbd.mode_info_context->mbmi.ref_frame], sizeof(mdcounts));
} }
//Only consider ZEROMV/ALTREF_FRAME for alt ref frame. // Only consider ZEROMV/ALTREF_FRAME for alt ref frame,
if (cpi->is_src_frame_alt_ref) // 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) if (this_mode != ZEROMV || x->e_mbd.mode_info_context->mbmi.ref_frame != ALTREF_FRAME)
continue; continue;

3
vp8/encoder/rdopt.c
View File

@ -1852,8 +1852,7 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
// Only consider ZEROMV/ALTREF_FRAME for alt ref frame, // Only consider ZEROMV/ALTREF_FRAME for alt ref frame,
// unless ARNR filtering is enabled in which case we want // unless ARNR filtering is enabled in which case we want
// an unfiltered alternative // an unfiltered alternative
//if (cpi->is_src_frame_alt_ref && (cpi->oxcf.arnr_max_frames > 0)) if (cpi->is_src_frame_alt_ref && (cpi->oxcf.arnr_max_frames == 0))
if (cpi->is_src_frame_alt_ref)
{ {
if (this_mode != ZEROMV || x->e_mbd.mode_info_context->mbmi.ref_frame != ALTREF_FRAME) if (this_mode != ZEROMV || x->e_mbd.mode_info_context->mbmi.ref_frame != ALTREF_FRAME)
continue; continue;