ref: adaffcc01081a1d38b9c2b3077ac3c092988b685
parent: 4e8daaf9608bc4fc8772a033b050c28e54d43344
parent: c852200f513efa1b90507a78b1a7bc8530a0fc8e
author: Jingning Han <[email protected]>
date: Mon Mar 16 12:43:43 EDT 2015
Merge "Remove ineffective newmv skip checking from vp9_pick_inter_mode"
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -803,9 +803,6 @@
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];
@@ -840,8 +837,9 @@
}
}
- 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;