vpx_mem: apply clang-format
Change-Id: I0440686fc03f1ee02bd0168c91e671a0a2d0056a
This commit is contained in:
parent
82070ae939
commit
d7a3b781d3
@ -8,24 +8,24 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_
|
||||
#define VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_
|
||||
#include "./vpx_config.h"
|
||||
|
||||
#define ADDRESS_STORAGE_SIZE sizeof(size_t)
|
||||
#define ADDRESS_STORAGE_SIZE sizeof(size_t)
|
||||
|
||||
#ifndef DEFAULT_ALIGNMENT
|
||||
# if defined(VXWORKS)
|
||||
# define DEFAULT_ALIGNMENT 32 /*default addr alignment to use in
|
||||
calls to vpx_* functions other
|
||||
than vpx_memalign*/
|
||||
# else
|
||||
# define DEFAULT_ALIGNMENT (2 * sizeof(void*)) /* NOLINT */
|
||||
# endif
|
||||
#if defined(VXWORKS)
|
||||
/*default addr alignment to use in calls to vpx_* functions other than
|
||||
* vpx_memalign*/
|
||||
#define DEFAULT_ALIGNMENT 32
|
||||
#else
|
||||
#define DEFAULT_ALIGNMENT (2 * sizeof(void *)) /* NOLINT */
|
||||
#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))
|
||||
#define align_addr(addr, align) \
|
||||
(void *)(((size_t)(addr) + ((align)-1)) & (size_t) - (align))
|
||||
|
||||
#endif // VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_
|
||||
|
@ -8,7 +8,6 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
|
||||
#include "vpx_mem.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@ -17,8 +16,7 @@
|
||||
#include "vpx/vpx_integer.h"
|
||||
|
||||
void *vpx_memalign(size_t align, size_t size) {
|
||||
void *addr,
|
||||
* x = NULL;
|
||||
void *addr, *x = NULL;
|
||||
|
||||
addr = malloc(size + align - 1 + ADDRESS_STORAGE_SIZE);
|
||||
|
||||
@ -31,24 +29,20 @@ void *vpx_memalign(size_t align, size_t size) {
|
||||
return x;
|
||||
}
|
||||
|
||||
void *vpx_malloc(size_t size) {
|
||||
return vpx_memalign(DEFAULT_ALIGNMENT, size);
|
||||
}
|
||||
void *vpx_malloc(size_t size) { return vpx_memalign(DEFAULT_ALIGNMENT, size); }
|
||||
|
||||
void *vpx_calloc(size_t num, size_t size) {
|
||||
void *x;
|
||||
|
||||
x = vpx_memalign(DEFAULT_ALIGNMENT, num * size);
|
||||
|
||||
if (x)
|
||||
memset(x, 0, num * size);
|
||||
if (x) memset(x, 0, num * size);
|
||||
|
||||
return x;
|
||||
}
|
||||
|
||||
void *vpx_realloc(void *memblk, size_t size) {
|
||||
void *addr,
|
||||
* new_addr = NULL;
|
||||
void *addr, *new_addr = NULL;
|
||||
int align = DEFAULT_ALIGNMENT;
|
||||
|
||||
/*
|
||||
@ -64,16 +58,17 @@ void *vpx_realloc(void *memblk, size_t size) {
|
||||
else if (!size)
|
||||
vpx_free(memblk);
|
||||
else {
|
||||
addr = (void *)(((size_t *)memblk)[-1]);
|
||||
addr = (void *)(((size_t *)memblk)[-1]);
|
||||
memblk = NULL;
|
||||
|
||||
new_addr = realloc(addr, size + align + ADDRESS_STORAGE_SIZE);
|
||||
|
||||
if (new_addr) {
|
||||
addr = new_addr;
|
||||
new_addr = (void *)(((size_t)
|
||||
((unsigned char *)new_addr + ADDRESS_STORAGE_SIZE) + (align - 1)) &
|
||||
(size_t) - align);
|
||||
new_addr =
|
||||
(void *)(((size_t)((unsigned char *)new_addr + ADDRESS_STORAGE_SIZE) +
|
||||
(align - 1)) &
|
||||
(size_t)-align);
|
||||
/* save the actual malloc address */
|
||||
((size_t *)new_addr)[-1] = (size_t)addr;
|
||||
}
|
||||
@ -93,8 +88,7 @@ void vpx_free(void *memblk) {
|
||||
void *vpx_memset16(void *dest, int val, size_t length) {
|
||||
size_t i;
|
||||
uint16_t *dest16 = (uint16_t *)dest;
|
||||
for (i = 0; i < length; i++)
|
||||
*dest16++ = val;
|
||||
for (i = 0; i < length; i++) *dest16++ = val;
|
||||
return dest;
|
||||
}
|
||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||
|
@ -8,13 +8,12 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef VPX_MEM_VPX_MEM_H_
|
||||
#define VPX_MEM_VPX_MEM_H_
|
||||
|
||||
#include "vpx_config.h"
|
||||
#if defined(__uClinux__)
|
||||
# include <lddk.h>
|
||||
#include <lddk.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
@ -24,20 +23,20 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
void *vpx_memalign(size_t align, size_t size);
|
||||
void *vpx_malloc(size_t size);
|
||||
void *vpx_calloc(size_t num, size_t size);
|
||||
void *vpx_realloc(void *memblk, size_t size);
|
||||
void vpx_free(void *memblk);
|
||||
void *vpx_memalign(size_t align, size_t size);
|
||||
void *vpx_malloc(size_t size);
|
||||
void *vpx_calloc(size_t num, size_t size);
|
||||
void *vpx_realloc(void *memblk, size_t size);
|
||||
void vpx_free(void *memblk);
|
||||
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
void *vpx_memset16(void *dest, int val, size_t length);
|
||||
void *vpx_memset16(void *dest, int val, size_t length);
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#ifdef VPX_MEM_PLTFRM
|
||||
# include VPX_MEM_PLTFRM
|
||||
#include VPX_MEM_PLTFRM
|
||||
#endif
|
||||
|
||||
#if defined(__cplusplus)
|
||||
|
Loading…
Reference in New Issue
Block a user