Add the aom_align_addr macro.
It replaces the align_addr macro in aom_mem_intrnl.h and the
yv12_align_addr macro in yv12config.c.
Change-Id: I173a1cce54ebce5ff5472ec4c85947b5c4e520f6
diff --git a/aom/src/aom_image.c b/aom/src/aom_image.c
index 9407fac..f703504 100644
--- a/aom/src/aom_image.c
+++ b/aom/src/aom_image.c
@@ -16,7 +16,6 @@
#include "aom/aom_integer.h"
#include "aom/internal/aom_image_internal.h"
#include "aom_mem/aom_mem.h"
-#include "aom_mem/include/aom_mem_intrnl.h"
static INLINE unsigned int align_image_dimension(unsigned int d,
unsigned int subsampling,
@@ -130,7 +129,7 @@
const size_t padded_alloc_size = (size_t)alloc_size + buf_align - 1;
img->img_data = (uint8_t *)alloc_cb(cb_priv, padded_alloc_size);
if (img->img_data) {
- img->img_data = align_addr(img->img_data, buf_align);
+ img->img_data = (uint8_t *)aom_align_addr(img->img_data, buf_align);
}
img->img_data_owner = 0;
} else {
diff --git a/aom_mem/aom_mem.c b/aom_mem/aom_mem.c
index e603fc5..e977b01 100644
--- a/aom_mem/aom_mem.c
+++ b/aom_mem/aom_mem.c
@@ -54,7 +54,7 @@
#endif
void *const addr = malloc(aligned_size);
if (addr) {
- x = align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE, align);
+ x = aom_align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE, align);
SetActualMallocAddress(x, addr);
}
return x;
diff --git a/aom_mem/aom_mem.h b/aom_mem/aom_mem.h
index 4b1fa45..f533ab9 100644
--- a/aom_mem/aom_mem.h
+++ b/aom_mem/aom_mem.h
@@ -38,6 +38,10 @@
void aom_free(void *memblk);
void *aom_memset16(void *dest, int val, size_t length);
+/*returns an addr aligned to the byte boundary specified by align*/
+#define aom_align_addr(addr, align) \
+ (void *)(((size_t)(addr) + ((align)-1)) & ~(size_t)((align)-1))
+
#include <string.h>
#ifdef AOM_MEM_PLTFRM
diff --git a/aom_mem/include/aom_mem_intrnl.h b/aom_mem/include/aom_mem_intrnl.h
index cbc30a9..2c9819d 100644
--- a/aom_mem/include/aom_mem_intrnl.h
+++ b/aom_mem/include/aom_mem_intrnl.h
@@ -26,8 +26,4 @@
#endif
#endif
-/*returns an addr aligned to the byte boundary specified by align*/
-#define align_addr(addr, align) \
- (void *)(((size_t)(addr) + ((align)-1)) & ~(size_t)((align)-1))
-
#endif // AOM_AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_
diff --git a/aom_scale/generic/yv12config.c b/aom_scale/generic/yv12config.c
index 08b82b2..6406b18 100644
--- a/aom_scale/generic/yv12config.c
+++ b/aom_scale/generic/yv12config.c
@@ -23,8 +23,6 @@
/****************************************************************************
*
****************************************************************************/
-#define yv12_align_addr(addr, align) \
- (void *)(((size_t)(addr) + ((align)-1)) & (size_t) - (align))
// TODO(jkoleszar): Maybe replace this with struct aom_image
int aom_free_frame_buffer(YV12_BUFFER_CONFIG *ybf) {
@@ -87,7 +85,7 @@
if (fb->data == NULL || fb->size < external_frame_size)
return AOM_CODEC_MEM_ERROR;
- ybf->buffer_alloc = (uint8_t *)yv12_align_addr(fb->data, 32);
+ ybf->buffer_alloc = (uint8_t *)aom_align_addr(fb->data, 32);
#if defined(__has_feature)
#if __has_feature(memory_sanitizer)
@@ -142,15 +140,15 @@
ybf->flags = 0;
}
- ybf->y_buffer = (uint8_t *)yv12_align_addr(
+ ybf->y_buffer = (uint8_t *)aom_align_addr(
buf + (border * y_stride) + border, aom_byte_align);
- ybf->u_buffer = (uint8_t *)yv12_align_addr(
+ ybf->u_buffer = (uint8_t *)aom_align_addr(
buf + yplane_size + (uv_border_h * uv_stride) + uv_border_w,
aom_byte_align);
ybf->v_buffer =
- (uint8_t *)yv12_align_addr(buf + yplane_size + uvplane_size +
- (uv_border_h * uv_stride) + uv_border_w,
- aom_byte_align);
+ (uint8_t *)aom_align_addr(buf + yplane_size + uvplane_size +
+ (uv_border_h * uv_stride) + uv_border_w,
+ aom_byte_align);
ybf->use_external_reference_buffers = 0;
