From: Jingning Han Date: Fri, 6 Dec 2013 22:23:34 +0000 (-0800) Subject: Clean-ups in diamond_search_sad X-Git-Tag: v1.4.0~2874^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44627a967717faa4b714a74f50ca24bcabda160a;p=libvpx Clean-ups in diamond_search_sad Use the pre-fetched stride value. Change-Id: I8d4aaedab7a83a4870be51c110da27e55ca3bc85 --- 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,