diff --git a/vpx_mem/include/vpx_mem_intrnl.h b/vpx_mem/include/vpx_mem_intrnl.h
index c4dd78550f352f6f99b89b3e7ea0a7347c0aaa17..b62d238fdd23d9f65ea93af76304c1bc9523a896 100644
--- a/vpx_mem/include/vpx_mem_intrnl.h
+++ b/vpx_mem/include/vpx_mem_intrnl.h
@@ -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_
diff --git a/vpx_mem/vpx_mem.c b/vpx_mem/vpx_mem.c
index b261fc0da11787570dd4c0b7bc7a448004feb5be..cfced2f7d013e655f555b005d5af352182e9cd39 100644
--- a/vpx_mem/vpx_mem.c
+++ b/vpx_mem/vpx_mem.c
@@ -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
diff --git a/vpx_mem/vpx_mem.h b/vpx_mem/vpx_mem.h
index a006e0f00b3b2e2d62082f2fa469eff3d3619789..c14f288b895736a1cbe5dece5ad2c2dc9acbd566 100644
--- a/vpx_mem/vpx_mem.h
+++ b/vpx_mem/vpx_mem.h
@@ -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)
diff --git a/vpx_ports/arm_cpudetect.c b/vpx_ports/arm_cpudetect.c
index d320ce8fa00321cd0404e40f5af76a22e7fc78ad..e446702e4028442b6b69d6cd728f12690c1d2d9a 100644
--- a/vpx_ports/arm_cpudetect.c
+++ b/vpx_ports/arm_cpudetect.c
@@ -76,27 +76,28 @@ int arm_cpu_caps(void) {
* All of these instructions should be essentially nops.
*/
#if HAVE_MEDIA
- if (mask & HAS_MEDIA) __try {
+ if (mask & HAS_MEDIA) {
+ __try {
/*SHADD8 r3,r3,r3*/
__emit(0xE6333F93);
flags |= HAS_MEDIA;
} __except (GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) {
/*Ignore exception.*/
}
-}
+ }
#endif /* HAVE_MEDIA */
#if HAVE_NEON || HAVE_NEON_ASM
-if (mask & HAS_NEON) {
- __try {
- /*VORR q0,q0,q0*/
- __emit(0xF2200150);
- flags |= HAS_NEON;
- } __except (GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) {
- /*Ignore exception.*/
+ if (mask & HAS_NEON) {
+ __try {
+ /*VORR q0,q0,q0*/
+ __emit(0xF2200150);
+ flags |= HAS_NEON;
+ } __except (GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) {
+ /*Ignore exception.*/
+ }
}
-}
#endif /* HAVE_NEON || HAVE_NEON_ASM */
-return flags & mask;
+ return flags & mask;
}
#elif defined(__ANDROID__) /* end _MSC_VER */
diff --git a/vpx_ports/x86.h b/vpx_ports/x86.h
index f76533529339848f3ab7a5118f1256052bce6891..a28807bb8dbdd6733ddc629e56c32d7bcf9707c3 100644
--- a/vpx_ports/x86.h
+++ b/vpx_ports/x86.h
@@ -102,10 +102,17 @@ typedef enum {
} while (0)
#endif
#else
-#define cpuid(func, func2, a, b, c, d) \
- __asm mov eax, func __asm mov ecx, func2 __asm cpuid __asm mov a, \
- eax __asm mov b, ebx __asm mov c, ecx __asm mov d, edx
+/* clang-format off */
+#define cpuid(func, func2, a, b, c, d) \
+ __asm mov eax, func \
+ __asm mov ecx, func2 \
+ __asm cpuid \
+ __asm mov a, eax \
+ __asm mov b, ebx \
+ __asm mov c, ecx \
+ __asm mov d, edx
#endif
+/* clang-format on */
#endif /* end others */
// NaCl has no support for xgetbv or the raw opcode.