generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vpx_mem: apply clang-format

Browse Source 
Change-Id: I0440686fc03f1ee02bd0168c91e671a0a2d0056a
This commit is contained in:
clang-format 2016-07-25 14:16:28 -07:00 committed by James Zern
parent 82070ae939
commit d7a3b781d3
3 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vpx_mem/include/vpx_mem_intrnl.h
View File

@ -8,7 +8,6 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_ #ifndef VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_
#define VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_ #define VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_
#include "./vpx_config.h" #include "./vpx_config.h"
@ -16,16 +15,17 @@
#define ADDRESS_STORAGE_SIZE sizeof(size_t) #define ADDRESS_STORAGE_SIZE sizeof(size_t)
#ifndef DEFAULT_ALIGNMENT #ifndef DEFAULT_ALIGNMENT
# if defined(VXWORKS) #if defined(VXWORKS)
# define DEFAULT_ALIGNMENT 32 /*default addr alignment to use in /*default addr alignment to use in calls to vpx_* functions other than
calls to vpx_* functions other * vpx_memalign*/
than vpx_memalign*/ #define DEFAULT_ALIGNMENT 32
# else #else
# define DEFAULT_ALIGNMENT (2 * sizeof(void*)) /* NOLINT */ #define DEFAULT_ALIGNMENT (2 * sizeof(void *)) /* NOLINT */
# endif #endif
#endif #endif
/*returns an addr aligned to the byte boundary specified by align*/ /*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_ #endif // VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_

24
vpx_mem/vpx_mem.c
View File

@ -8,7 +8,6 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vpx_mem.h" #include "vpx_mem.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -17,8 +16,7 @@
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
void *vpx_memalign(size_t align, size_t size) { void *vpx_memalign(size_t align, size_t size) {
void *addr, void *addr, *x = NULL;
* x = NULL;
addr = malloc(size + align - 1 + ADDRESS_STORAGE_SIZE); addr = malloc(size + align - 1 + ADDRESS_STORAGE_SIZE);
@ -31,24 +29,20 @@ void *vpx_memalign(size_t align, size_t size) {
return x; return x;
} }
void *vpx_malloc(size_t size) { void *vpx_malloc(size_t size) { return vpx_memalign(DEFAULT_ALIGNMENT, size); }
return vpx_memalign(DEFAULT_ALIGNMENT, size);
}
void *vpx_calloc(size_t num, size_t size) { void *vpx_calloc(size_t num, size_t size) {
void *x; void *x;
x = vpx_memalign(DEFAULT_ALIGNMENT, num * size); x = vpx_memalign(DEFAULT_ALIGNMENT, num * size);
if (x) if (x) memset(x, 0, num * size);
memset(x, 0, num * size);
return x; return x;
} }
void *vpx_realloc(void *memblk, size_t size) { void *vpx_realloc(void *memblk, size_t size) {
void *addr, void *addr, *new_addr = NULL;
* new_addr = NULL;
int align = DEFAULT_ALIGNMENT; int align = DEFAULT_ALIGNMENT;
/* /*
@ -71,9 +65,10 @@ void *vpx_realloc(void *memblk, size_t size) {
if (new_addr) { if (new_addr) {
addr = new_addr; addr = new_addr;
new_addr = (void *)(((size_t) new_addr =
((unsigned char *)new_addr + ADDRESS_STORAGE_SIZE) + (align - 1)) & (void *)(((size_t)((unsigned char *)new_addr + ADDRESS_STORAGE_SIZE) +
(size_t) - align); (align - 1)) &
(size_t)-align);
/* save the actual malloc address */ /* save the actual malloc address */
((size_t *)new_addr)[-1] = (size_t)addr; ((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) { void *vpx_memset16(void *dest, int val, size_t length) {
size_t i; size_t i;
uint16_t *dest16 = (uint16_t *)dest; uint16_t *dest16 = (uint16_t *)dest;
for (i = 0; i < length; i++) for (i = 0; i < length; i++) *dest16++ = val;
*dest16++ = val;
return dest; return dest;
} }
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH

17
vpx_mem/vpx_mem.h
View File

@ -8,13 +8,12 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef VPX_MEM_VPX_MEM_H_ #ifndef VPX_MEM_VPX_MEM_H_
#define VPX_MEM_VPX_MEM_H_ #define VPX_MEM_VPX_MEM_H_
#include "vpx_config.h" #include "vpx_config.h"
#if defined(__uClinux__) #if defined(__uClinux__)
# include <lddk.h> #include <lddk.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>
@ -24,20 +23,20 @@
extern "C" { extern "C" {
#endif #endif
void *vpx_memalign(size_t align, size_t size); void *vpx_memalign(size_t align, size_t size);
void *vpx_malloc(size_t size); void *vpx_malloc(size_t size);
void *vpx_calloc(size_t num, size_t size); void *vpx_calloc(size_t num, size_t size);
void *vpx_realloc(void *memblk, size_t size); void *vpx_realloc(void *memblk, size_t size);
void vpx_free(void *memblk); void vpx_free(void *memblk);
#if CONFIG_VP9_HIGHBITDEPTH #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 #endif
#include <string.h> #include <string.h>
#ifdef VPX_MEM_PLTFRM #ifdef VPX_MEM_PLTFRM
# include VPX_MEM_PLTFRM #include VPX_MEM_PLTFRM
#endif #endif
#if defined(__cplusplus) #if defined(__cplusplus)