diff options
author | Ronald S. Bultje <rbultje@google.com> | 2013-06-08 17:39:41 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-06-08 17:39:41 -0700 |
commit | 20760254f6ec5990add6349308343fab0d86df50 (patch) | |
tree | 0f282317dcbca171e59bb326b46354550695cc8c /vp9/common/vp9_alloccommon.c | |
parent | c08317e4f23776be898bfd2f56f8171c64e0960f (diff) | |
parent | 71701f3d40fb64a21420d0e0c15d4c204f5963cb (diff) | |
download | libvpx-20760254f6ec5990add6349308343fab0d86df50.tar libvpx-20760254f6ec5990add6349308343fab0d86df50.tar.gz libvpx-20760254f6ec5990add6349308343fab0d86df50.tar.bz2 libvpx-20760254f6ec5990add6349308343fab0d86df50.zip |
Merge "Align frame size to 8 instead of 16." into experimental
Diffstat (limited to 'vp9/common/vp9_alloccommon.c')
-rw-r--r-- | vp9/common/vp9_alloccommon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c index 10bf77667..13a1c7d7f 100644 --- a/vp9/common/vp9_alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -68,8 +68,8 @@ void vp9_free_frame_buffers(VP9_COMMON *oci) { } static void set_mb_mi(VP9_COMMON *cm, int aligned_width, int aligned_height) { - cm->mb_cols = aligned_width >> 4; - cm->mb_rows = aligned_height >> 4; + cm->mb_cols = (aligned_width + 8) >> 4; + cm->mb_rows = (aligned_height + 8) >> 4; cm->MBs = cm->mb_rows * cm->mb_cols; cm->mi_cols = aligned_width >> LOG2_MI_SIZE; @@ -95,8 +95,8 @@ int vp9_alloc_frame_buffers(VP9_COMMON *oci, int width, int height) { int i, mi_cols; // Our internal buffers are always multiples of 16 - const int aligned_width = multiple16(width); - const int aligned_height = multiple16(height); + const int aligned_width = multiple8(width); + const int aligned_height = multiple8(height); const int ss_x = oci->subsampling_x; const int ss_y = oci->subsampling_y; @@ -224,8 +224,8 @@ void vp9_initialize_common() { } void vp9_update_frame_size(VP9_COMMON *cm) { - const int aligned_width = multiple16(cm->width); - const int aligned_height = multiple16(cm->height); + const int aligned_width = multiple8(cm->width); + const int aligned_height = multiple8(cm->height); set_mb_mi(cm, aligned_width, aligned_height); setup_mi(cm); |