From e141f10bfcd366e7eb9c4c45d5d9824ac113f60b Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Fri, 21 Mar 2014 14:02:25 -0700 Subject: [PATCH] Renaming and making vp9_update_mode_info_border() static. Change-Id: Ibb72a29cae9ca9443aae56fc4c5458d190eae279 --- vp9/common/vp9_alloccommon.c | 15 +++++++-------- vp9/common/vp9_alloccommon.h | 2 -- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c index ad11d1c..cb75870 100644 --- a/vp9/common/vp9_alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -17,16 +17,15 @@ #include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_systemdependent.h" -void vp9_update_mode_info_border(VP9_COMMON *cm, MODE_INFO *mi) { - const int stride = cm->mode_info_stride; +static void clear_mi_border(const VP9_COMMON *cm, MODE_INFO *mi) { int i; - // Clear down top border row - vpx_memset(mi, 0, sizeof(MODE_INFO) * stride); + // Top border row + vpx_memset(mi, 0, sizeof(*mi) * cm->mode_info_stride); - // Clear left border column - for (i = 1; i < cm->mi_rows + 1; i++) - vpx_memset(&mi[i * stride], 0, sizeof(MODE_INFO)); + // Left border column + for (i = 1; i < cm->mi_rows + 1; ++i) + vpx_memset(&mi[i * cm->mode_info_stride], 0, sizeof(*mi)); } static void set_mb_mi(VP9_COMMON *cm, int aligned_width, int aligned_height) { @@ -52,7 +51,7 @@ static void setup_mi(VP9_COMMON *cm) { cm->mode_info_stride * (cm->mi_rows + 1) * sizeof(*cm->mi_grid_base)); - vp9_update_mode_info_border(cm, cm->prev_mip); + clear_mi_border(cm, cm->prev_mip); } static int alloc_mi(VP9_COMMON *cm, int mi_size) { diff --git a/vp9/common/vp9_alloccommon.h b/vp9/common/vp9_alloccommon.h index fca6935..429e929 100644 --- a/vp9/common/vp9_alloccommon.h +++ b/vp9/common/vp9_alloccommon.h @@ -20,8 +20,6 @@ extern "C" { void vp9_initialize_common(); -void vp9_update_mode_info_border(VP9_COMMON *cm, MODE_INFO *mi); - void vp9_remove_common(VP9_COMMON *cm); int vp9_resize_frame_buffers(VP9_COMMON *cm, int width, int height); -- 2.7.4