diff options
| author | Jingning Han <jingning@google.com> | 2015-03-16 15:05:01 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2015-03-16 15:06:27 -0700 |
| commit | c852200f513efa1b90507a78b1a7bc8530a0fc8e (patch) | |
| tree | 48dd06a953109df0246e646182f5077b52afd8c1 /vp9 | |
| parent | 981bb848826cecc8570cc037883138b80eadf6c6 (diff) | |
| download | libvpx-c852200f513efa1b90507a78b1a7bc8530a0fc8e.tar libvpx-c852200f513efa1b90507a78b1a7bc8530a0fc8e.tar.gz libvpx-c852200f513efa1b90507a78b1a7bc8530a0fc8e.tar.bz2 libvpx-c852200f513efa1b90507a78b1a7bc8530a0fc8e.zip | |
Remove ineffective newmv skip checking from vp9_pick_inter_mode
Change-Id: I41ee684cf113a7b5edf280183e51cb08b2e93cc4
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index f36359319..ac6e01371 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -808,9 +808,6 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, continue; if (this_mode == NEWMV) { - if (cpi->sf.partition_search_type != VAR_BASED_PARTITION - && best_rdc.rdcost < (int64_t) (1 << num_pels_log2_lookup[bsize])) - continue; if (ref_frame > LAST_FRAME) { int tmp_sad; int dis, cost_list[5]; @@ -845,8 +842,9 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, } } - if (this_mode != NEARESTMV && frame_mv[this_mode][ref_frame].as_int == - frame_mv[NEARESTMV][ref_frame].as_int) + if (this_mode != NEARESTMV && + frame_mv[this_mode][ref_frame].as_int == + frame_mv[NEARESTMV][ref_frame].as_int) continue; mbmi->mode = this_mode; |