diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-03-21 21:19:18 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-21 21:19:18 -0700 |
| commit | 2786938a3c442aaef7767de1364c52d5da1e2908 (patch) | |
| tree | e73335ba0ca93baca6b32347ae09cf4ac6d8b336 /vp9/common | |
| parent | e85bff2578904cf5c6ff8cb55133ec0978e6711f (diff) | |
| parent | e141f10bfcd366e7eb9c4c45d5d9824ac113f60b (diff) | |
| download | libvpx-2786938a3c442aaef7767de1364c52d5da1e2908.tar libvpx-2786938a3c442aaef7767de1364c52d5da1e2908.tar.gz libvpx-2786938a3c442aaef7767de1364c52d5da1e2908.tar.bz2 libvpx-2786938a3c442aaef7767de1364c52d5da1e2908.zip | |
Merge "Renaming and making vp9_update_mode_info_border() static."
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_alloccommon.c | 15 | ||||
| -rw-r--r-- | 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 ad11d1c94..cb75870ab 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 fca693541..429e9290d 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); |