ref: 54040f94b910fe304ece6d04cb6e6c02779b14a0
parent: f92b5842bfd520155c023db03bd7f55037e56ba3
parent: 44627a967717faa4b714a74f50ca24bcabda160a
author: Jingning Han <jingning@google.com>
date: Mon Dec 9 11:12:39 EST 2013
Merge "Clean-ups in diamond_search_sad"
--- a/vp9/encoder/vp9_mcomp.c
+++ b/vp9/encoder/vp9_mcomp.c
@@ -1231,7 +1231,7 @@
// Work out the start point for the search
in_what = (uint8_t *)(xd->plane[0].pre[0].buf +
- (ref_row * (xd->plane[0].pre[0].stride)) + ref_col);
+ ref_row * in_what_stride + ref_col);
best_address = in_what;
// Check the starting position
@@ -1375,7 +1375,7 @@
// Work out the start point for the search
in_what = (uint8_t *)(xd->plane[0].pre[0].buf +
- (ref_row * (xd->plane[0].pre[0].stride)) + ref_col);
+ ref_row * in_what_stride + ref_col);
best_address = in_what;
// Check the starting position
@@ -1522,7 +1522,6 @@
int_mv *ref_mv, int_mv *dst_mv) {int_mv temp_mv;
int thissme, n, num00;
-
int bestsme = cpi->diamond_search_sad(x, mvp_full, &temp_mv,
step_param, sadpb, &num00,
fn_ptr, x->nmvjointcost,