summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_mcomp.c
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2013-12-06 14:23:34 -0800
committerJingning Han <jingning@google.com>2013-12-06 14:25:20 -0800
commit44627a967717faa4b714a74f50ca24bcabda160a (patch)
tree5264273748ba5f4f2436aeb00d8baf4551920fd5 /vp9/encoder/vp9_mcomp.c
parentb295092b8fcac34fd657df45b15fed54ed89b814 (diff)
downloadlibvpx-44627a967717faa4b714a74f50ca24bcabda160a.tar
libvpx-44627a967717faa4b714a74f50ca24bcabda160a.tar.gz
libvpx-44627a967717faa4b714a74f50ca24bcabda160a.tar.bz2
libvpx-44627a967717faa4b714a74f50ca24bcabda160a.zip
Clean-ups in diamond_search_sad
Use the pre-fetched stride value. Change-Id: I8d4aaedab7a83a4870be51c110da27e55ca3bc85
Diffstat (limited to 'vp9/encoder/vp9_mcomp.c')
-rw-r--r--vp9/encoder/vp9_mcomp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c
index 2183edba9..efdb6124e 100644
--- a/vp9/encoder/vp9_mcomp.c
+++ b/vp9/encoder/vp9_mcomp.c
@@ -1231,7 +1231,7 @@ int vp9_diamond_search_sad_c(MACROBLOCK *x,
// 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 @@ int vp9_diamond_search_sadx4(MACROBLOCK *x,
// 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 vp9_full_pixel_diamond(VP9_COMP *cpi, MACROBLOCK *x,
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,