ref: a481fcc3e032ff68061c8feeee332f6574e75a19
parent: ac8c069198c08c5ec0e5e7fb31b61e3a2dc883a3
parent: 0423a964698fa64f499c916d77dcbc5bcad61d69
author: Adrian Grange <agrange@google.com>
date: Fri May 2 04:12:00 EDT 2014
Merge "Fix mode selection bug when ARNR filtering disabled"
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3250,9 +3250,8 @@
// an unfiltered alternative. We allow near/nearest as well
// because they may result in zero-zero MVs but be cheaper.
if (cpi->rc.is_src_frame_alt_ref && (cpi->oxcf.arnr_max_frames == 0)) {- const int altref_zero_mask =
+ mode_skip_mask =
~((1 << THR_NEARESTA) | (1 << THR_NEARA) | (1 << THR_ZEROA));
- mode_skip_mask |= altref_zero_mask;
if (frame_mv[NEARMV][ALTREF_FRAME].as_int != 0)
mode_skip_mask |= (1 << THR_NEARA);
if (frame_mv[NEARESTMV][ALTREF_FRAME].as_int != 0)
--
⑨