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

Merge "Fix mode selection bug when ARNR filtering disabled"

Browse Source
This commit is contained in:
Adrian Grange
2014-05-02 08:12:00 -07:00
committed by Gerrit Code Review
parent ac8c069198 0423a96469
commit a481fcc3e0
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vp9/encoder/vp9_rdopt.c
View File

@@ -3250,9 +3250,8 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
// an unfiltered alternative. We allow near/nearest as well // an unfiltered alternative. We allow near/nearest as well
// because they may result in zero-zero MVs but be cheaper. // 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)) { 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)); ~((1 << THR_NEARESTA) | (1 << THR_NEARA) | (1 << THR_ZEROA));
mode_skip_mask |= altref_zero_mask;
if (frame_mv[NEARMV][ALTREF_FRAME].as_int != 0) if (frame_mv[NEARMV][ALTREF_FRAME].as_int != 0)
mode_skip_mask |= (1 << THR_NEARA); mode_skip_mask |= (1 << THR_NEARA);
if (frame_mv[NEARESTMV][ALTREF_FRAME].as_int != 0) if (frame_mv[NEARESTMV][ALTREF_FRAME].as_int != 0)