ref: 3aafb47729a316d50de7aca17a64cfc353e67159
parent: 8f711db4e88abc27d8616e4dc37d8e64677c2238
parent: 415371c9d99639258e9e4546bda45fe889a79ef3
author: Paul Wilkins <paulwilkins@google.com>
date: Fri Jan 14 02:26:37 EST 2011
Merge "Testing of modes with Alt Ref frame"
--- 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;
--
⑨