diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-04-10 16:50:01 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-04-10 17:38:57 -0700 |
| commit | 8fb5be48a600bc75ee0e0b720c3ffe680d11db53 (patch) | |
| tree | 6c76cc48f6bb05c895c854a622cad8592e25055a /vp9/common/vp9_findnearmv.c | |
| parent | b4f6098ef772e381c174581eca324e9d9ff1b87e (diff) | |
| download | libvpx-8fb5be48a600bc75ee0e0b720c3ffe680d11db53.tar libvpx-8fb5be48a600bc75ee0e0b720c3ffe680d11db53.tar.gz libvpx-8fb5be48a600bc75ee0e0b720c3ffe680d11db53.tar.bz2 libvpx-8fb5be48a600bc75ee0e0b720c3ffe680d11db53.zip | |
Make usage of sb_type independent of literal values.
Change-Id: I0d12f9ef9d960df0172a1377f8e5236eb6d90492
Diffstat (limited to 'vp9/common/vp9_findnearmv.c')
| -rw-r--r-- | vp9/common/vp9_findnearmv.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vp9/common/vp9_findnearmv.c b/vp9/common/vp9_findnearmv.c index f6d6932cc..053895840 100644 --- a/vp9/common/vp9_findnearmv.c +++ b/vp9/common/vp9_findnearmv.c @@ -197,12 +197,13 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd, #else if (xd->up_available && xd->left_available) { #endif + const int bwl = mb_width_log2(xd->mode_info_context->mbmi.sb_type); vp9_sub_pixel_variance16x2(above_ref + offset, ref_y_stride, SP(this_mv.as_mv.col), SP(this_mv.as_mv.row), above_src, xd->dst.y_stride, &sse); score += sse; - if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB32X32) { + if (bwl >= 1) { vp9_sub_pixel_variance16x2(above_ref + offset + 16, ref_y_stride, SP(this_mv.as_mv.col), @@ -210,7 +211,7 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd, above_src + 16, xd->dst.y_stride, &sse); score += sse; } - if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB64X64) { + if (bwl >= 2) { vp9_sub_pixel_variance16x2(above_ref + offset + 32, ref_y_stride, SP(this_mv.as_mv.col), @@ -227,12 +228,13 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd, } #if !CONFIG_ABOVESPREFMV if (xd->left_available) { + const int bhl = mb_height_log2(xd->mode_info_context->mbmi.sb_type); vp9_sub_pixel_variance2x16_c(left_ref + offset, ref_y_stride, SP(this_mv.as_mv.col), SP(this_mv.as_mv.row), left_src, xd->dst.y_stride, &sse); score += sse; - if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB32X32) { + if (bhl >= 1) { vp9_sub_pixel_variance2x16_c(left_ref + offset + ref_y_stride * 16, ref_y_stride, SP(this_mv.as_mv.col), @@ -241,7 +243,7 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd, xd->dst.y_stride, &sse); score += sse; } - if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB64X64) { + if (bhl >= 2) { vp9_sub_pixel_variance2x16_c(left_ref + offset + ref_y_stride * 32, ref_y_stride, SP(this_mv.as_mv.col), |