virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avutil/mem: K&R formatting cosmetics

Browse Source
This commit is contained in:
Diego Biurrun
2012-10-18 19:16:37 +02:00
parent c08536979b
commit 5532cf3178
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
libavutil/mem.c
View File

@@ -58,8 +58,8 @@ void free(void *ptr);
#endif /* MALLOC_PREFIX */ #endif /* MALLOC_PREFIX */
/* You can redefine av_malloc and av_free in your project to use your /* You can redefine av_malloc and av_free in your project to use your
memory allocator. You do not need to suppress this file because the * memory allocator. You do not need to suppress this file because the
linker will do it automatically. */ * linker will do it automatically. */
void *av_malloc(size_t size) void *av_malloc(size_t size)
{ {
@@ -69,46 +69,46 @@ void *av_malloc(size_t size)
#endif #endif
/* let's disallow possible ambiguous cases */ /* let's disallow possible ambiguous cases */
if (size > (INT_MAX-32) || !size) if (size > (INT_MAX - 32) || !size)
return NULL; return NULL;
#if CONFIG_MEMALIGN_HACK #if CONFIG_MEMALIGN_HACK
ptr = malloc(size+32); ptr = malloc(size + 32);
if(!ptr) if (!ptr)
return ptr; return ptr;
diff= ((-(long)ptr - 1)&31) + 1; diff = ((-(long)ptr - 1) & 31) + 1;
ptr = (char*)ptr + diff; ptr = (char *)ptr + diff;
((char*)ptr)[-1]= diff; ((char *)ptr)[-1] = diff;
#elif HAVE_POSIX_MEMALIGN #elif HAVE_POSIX_MEMALIGN
if (posix_memalign(&ptr,32,size)) if (posix_memalign(&ptr, 32, size))
ptr = NULL; ptr = NULL;
#elif HAVE_ALIGNED_MALLOC #elif HAVE_ALIGNED_MALLOC
ptr = _aligned_malloc(size, 32); ptr = _aligned_malloc(size, 32);
#elif HAVE_MEMALIGN #elif HAVE_MEMALIGN
ptr = memalign(32,size); ptr = memalign(32, size);
/* Why 64? /* Why 64?
Indeed, we should align it: * Indeed, we should align it:
on 4 for 386 * on 4 for 386
on 16 for 486 * on 16 for 486
on 32 for 586, PPro - K6-III * on 32 for 586, PPro - K6-III
on 64 for K7 (maybe for P3 too). * on 64 for K7 (maybe for P3 too).
Because L1 and L2 caches are aligned on those values. * Because L1 and L2 caches are aligned on those values.
But I don't want to code such logic here! * But I don't want to code such logic here!
*/ */
/* Why 32? /* Why 32?
For AVX ASM. SSE / NEON needs only 16. * For AVX ASM. SSE / NEON needs only 16.
Why not larger? Because I did not see a difference in benchmarks ... * Why not larger? Because I did not see a difference in benchmarks ...
*/ */
/* benchmarks with P3 /* benchmarks with P3
memalign(64)+1 3071,3051,3032 * memalign(64) + 1 3071, 3051, 3032
memalign(64)+2 3051,3032,3041 * memalign(64) + 2 3051, 3032, 3041
memalign(64)+4 2911,2896,2915 * memalign(64) + 4 2911, 2896, 2915
memalign(64)+8 2545,2554,2550 * memalign(64) + 8 2545, 2554, 2550
memalign(64)+16 2543,2572,2563 * memalign(64) + 16 2543, 2572, 2563
memalign(64)+32 2546,2545,2571 * memalign(64) + 32 2546, 2545, 2571
memalign(64)+64 2570,2533,2558 * memalign(64) + 64 2570, 2533, 2558
*
BTW, malloc seems to do 8-byte alignment by default here. * BTW, malloc seems to do 8-byte alignment by default here.
*/ */
#else #else
ptr = malloc(size); ptr = malloc(size);
@@ -123,14 +123,15 @@ void *av_realloc(void *ptr, size_t size)
#endif #endif
/* let's disallow possible ambiguous cases */ /* let's disallow possible ambiguous cases */
if(size > (INT_MAX-16) ) if (size > (INT_MAX - 16))
return NULL; return NULL;
#if CONFIG_MEMALIGN_HACK #if CONFIG_MEMALIGN_HACK
//FIXME this isn't aligned correctly, though it probably isn't needed //FIXME this isn't aligned correctly, though it probably isn't needed
if(!ptr) return av_malloc(size); if (!ptr)
diff= ((char*)ptr)[-1]; return av_malloc(size);
return (char*)realloc((char*)ptr - diff, size + diff) + diff; diff = ((char *)ptr)[-1];
return (char *)realloc((char *)ptr - diff, size + diff) + diff;
#elif HAVE_ALIGNED_MALLOC #elif HAVE_ALIGNED_MALLOC
return _aligned_realloc(ptr, size, 32); return _aligned_realloc(ptr, size, 32);
#else #else
@@ -142,7 +143,7 @@ void av_free(void *ptr)
{ {
#if CONFIG_MEMALIGN_HACK #if CONFIG_MEMALIGN_HACK
if (ptr) if (ptr)
free((char*)ptr - ((char*)ptr)[-1]); free((char *)ptr - ((char *)ptr)[-1]);
#elif HAVE_ALIGNED_MALLOC #elif HAVE_ALIGNED_MALLOC
_aligned_free(ptr); _aligned_free(ptr);
#else #else
@@ -152,7 +153,7 @@ void av_free(void *ptr)
void av_freep(void *arg) void av_freep(void *arg)
{ {
void **ptr= (void**)arg; void **ptr = (void **)arg;
av_free(*ptr); av_free(*ptr);
*ptr = NULL; *ptr = NULL;
} }
@@ -167,8 +168,8 @@ void *av_mallocz(size_t size)
char *av_strdup(const char *s) char *av_strdup(const char *s)
{ {
char *ptr= NULL; char *ptr = NULL;
if(s){ if (s) {
int len = strlen(s) + 1; int len = strlen(s) + 1;
ptr = av_malloc(len); ptr = av_malloc(len);
if (ptr) if (ptr)

4
libavutil/mem.h
View File

@@ -89,7 +89,7 @@ void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
* be allocated. * be allocated.
* @see av_malloc() * @see av_malloc()
*/ */
av_alloc_size(1,2) static inline void *av_malloc_array(size_t nmemb, size_t size) av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
{ {
if (size <= 0 || nmemb >= INT_MAX / size) if (size <= 0 || nmemb >= INT_MAX / size)
return NULL; return NULL;
@@ -140,7 +140,7 @@ void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
* @see av_mallocz() * @see av_mallocz()
* @see av_malloc_array() * @see av_malloc_array()
*/ */
av_alloc_size(1,2) static inline void *av_mallocz_array(size_t nmemb, size_t size) av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
{ {
if (size <= 0 || nmemb >= INT_MAX / size) if (size <= 0 || nmemb >= INT_MAX / size)
return NULL; return NULL;