diff options
| author | Adrian Grange <agrange@google.com> | 2014-05-02 08:12:00 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-02 08:12:00 -0700 |
| commit | a481fcc3e032ff68061c8feeee332f6574e75a19 (patch) | |
| tree | 15bd15d67216dce890c4d6c11b25d37026515049 /vp9/encoder/vp9_rdopt.c | |
| parent | ac8c069198c08c5ec0e5e7fb31b61e3a2dc883a3 (diff) | |
| parent | 0423a964698fa64f499c916d77dcbc5bcad61d69 (diff) | |
| download | libvpx-a481fcc3e032ff68061c8feeee332f6574e75a19.tar libvpx-a481fcc3e032ff68061c8feeee332f6574e75a19.tar.gz libvpx-a481fcc3e032ff68061c8feeee332f6574e75a19.tar.bz2 libvpx-a481fcc3e032ff68061c8feeee332f6574e75a19.zip | |
Merge "Fix mode selection bug when ARNR filtering disabled"
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index a2fc1bb77..f854356b9 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -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 // 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) |