diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2013-05-30 08:04:49 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-30 08:04:49 -0700 |
| commit | ecf023f6e483706a4bf352b1dfcd9fb996ca4555 (patch) | |
| tree | 0689bc2fbba2c23e2920f117c315501556f54569 /vp9 | |
| parent | a91e5b4fdc4e81352fa3a65c7fc795527eee6b07 (diff) | |
| parent | 5e5470b2546478ceec5b7e70ac099b847c399f2b (diff) | |
| download | libvpx-ecf023f6e483706a4bf352b1dfcd9fb996ca4555.tar libvpx-ecf023f6e483706a4bf352b1dfcd9fb996ca4555.tar.gz libvpx-ecf023f6e483706a4bf352b1dfcd9fb996ca4555.tar.bz2 libvpx-ecf023f6e483706a4bf352b1dfcd9fb996ca4555.zip | |
Merge "fix valgrind warning" into experimental
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 1026bd67d..52b4cc39e 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2550,11 +2550,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, this_mode = vp9_mode_order[mode_index].mode; ref_frame = vp9_mode_order[mode_index].ref_frame; - if (!(ref_frame == INTRA_FRAME - || (cpi->ref_frame_flags & flag_list[ref_frame]))) { - continue; - } - if (cpi->speed > 0 && bsize >= BLOCK_SIZE_SB8X8) { if (!(ref_frame_mask & (1 << ref_frame))) { continue; @@ -2572,6 +2567,15 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, mbmi->ref_frame = ref_frame; mbmi->second_ref_frame = vp9_mode_order[mode_index].second_ref_frame; + if (!(ref_frame == INTRA_FRAME + || (cpi->ref_frame_flags & flag_list[ref_frame]))) { + continue; + } + if (!(mbmi->second_ref_frame == NONE + || (cpi->ref_frame_flags & flag_list[mbmi->second_ref_frame]))) { + continue; + } + // TODO(jingning, jkoleszar): scaling reference frame not supported for // SPLITMV. if (mbmi->ref_frame > 0 && |