From c08536979be1a4e9a29e3ee7a6b79f6d73bb12d2 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 18 Oct 2012 19:15:43 +0200 Subject: avutil/lzo: K&R formatting cosmetics --- libavutil/lzo.c | 96 +++++++++++++++++++++++++++++++-------------------------- libavutil/lzo.h | 10 +++--- 2 files changed, 58 insertions(+), 48 deletions(-) diff --git a/libavutil/lzo.c b/libavutil/lzo.c index dba0ac9ab1..0d1ec55e91 100644 --- a/libavutil/lzo.c +++ b/libavutil/lzo.c @@ -29,6 +29,7 @@ #define OUTBUF_PADDED 1 /// Define if we may read up to 8 bytes beyond the input buffer. #define INBUF_PADDED 1 + typedef struct LZOContext { const uint8_t *in, *in_end; uint8_t *out_start, *out, *out_end; @@ -39,7 +40,8 @@ typedef struct LZOContext { * @brief Reads one byte from the input buffer, avoiding an overrun. * @return byte read */ -static inline int get_byte(LZOContext *c) { +static inline int get_byte(LZOContext *c) +{ if (c->in < c->in_end) return *c->in++; c->error |= AV_LZO_INPUT_DEPLETED; @@ -58,10 +60,12 @@ static inline int get_byte(LZOContext *c) { * @param mask bits used from x * @return decoded length value */ -static inline int get_len(LZOContext *c, int x, int mask) { +static inline int get_len(LZOContext *c, int x, int mask) +{ int cnt = x & mask; if (!cnt) { - while (!(x = get_byte(c))) cnt += 255; + while (!(x = get_byte(c))) + cnt += 255; cnt += mask + x; } return cnt; @@ -84,15 +88,16 @@ static inline int get_len(LZOContext *c, int x, int mask) { * @brief Copies bytes from input to output buffer with checking. * @param cnt number of bytes to copy, must be >= 0 */ -static inline void copy(LZOContext *c, int cnt) { +static inline void copy(LZOContext *c, int cnt) +{ register const uint8_t *src = c->in; - register uint8_t *dst = c->out; + register uint8_t *dst = c->out; if (cnt > c->in_end - src) { - cnt = FFMAX(c->in_end - src, 0); + cnt = FFMAX(c->in_end - src, 0); c->error |= AV_LZO_INPUT_DEPLETED; } if (cnt > c->out_end - dst) { - cnt = FFMAX(c->out_end - dst, 0); + cnt = FFMAX(c->out_end - dst, 0); c->error |= AV_LZO_OUTPUT_FULL; } #if defined(INBUF_PADDED) && defined(OUTBUF_PADDED) @@ -102,8 +107,8 @@ static inline void copy(LZOContext *c, int cnt) { cnt -= 4; if (cnt > 0) #endif - memcpy(dst, src, cnt); - c->in = src + cnt; + memcpy(dst, src, cnt); + c->in = src + cnt; c->out = dst + cnt; } @@ -117,22 +122,24 @@ static inline void memcpy_backptr(uint8_t *dst, int back, int cnt); * cnt > back is valid, this will copy the bytes we just copied, * thus creating a repeating pattern with a period length of back. */ -static inline void copy_backptr(LZOContext *c, int back, int cnt) { +static inline void copy_backptr(LZOContext *c, int back, int cnt) +{ register const uint8_t *src = &c->out[-back]; - register uint8_t *dst = c->out; + register uint8_t *dst = c->out; if (src < c->out_start || src > dst) { c->error |= AV_LZO_INVALID_BACKPTR; return; } if (cnt > c->out_end - dst) { - cnt = FFMAX(c->out_end - dst, 0); + cnt = FFMAX(c->out_end - dst, 0); c->error |= AV_LZO_OUTPUT_FULL; } memcpy_backptr(dst, back, cnt); c->out = dst + cnt; } -static inline void memcpy_backptr(uint8_t *dst, int back, int cnt) { +static inline void memcpy_backptr(uint8_t *dst, int back, int cnt) +{ const uint8_t *src = &dst[-back]; if (back == 1) { memset(dst, *src, cnt); @@ -157,8 +164,8 @@ static inline void memcpy_backptr(uint8_t *dst, int back, int cnt) { int blocklen = back; while (cnt > blocklen) { memcpy(dst, src, blocklen); - dst += blocklen; - cnt -= blocklen; + dst += blocklen; + cnt -= blocklen; blocklen <<= 1; } memcpy(dst, src, cnt); @@ -166,12 +173,14 @@ static inline void memcpy_backptr(uint8_t *dst, int back, int cnt) { } } -void av_memcpy_backptr(uint8_t *dst, int back, int cnt) { +void av_memcpy_backptr(uint8_t *dst, int back, int cnt) +{ memcpy_backptr(dst, back, cnt); } -int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) { - int state= 0; +int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) +{ + int state = 0; int x; LZOContext c; if (!*outlen || !*inlen) { @@ -182,16 +191,17 @@ int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) { res |= AV_LZO_INPUT_DEPLETED; return res; } - c.in = in; - c.in_end = (const uint8_t *)in + *inlen; - c.out = c.out_start = out; - c.out_end = (uint8_t *)out + * outlen; - c.error = 0; - x = GETB(c); + c.in = in; + c.in_end = (const uint8_t *)in + *inlen; + c.out = c.out_start = out; + c.out_end = (uint8_t *)out + *outlen; + c.error = 0; + x = GETB(c); if (x > 17) { copy(&c, x - 17); x = GETB(c); - if (x < 16) c.error |= AV_LZO_ERROR; + if (x < 16) + c.error |= AV_LZO_ERROR; } if (c.in > c.in_end) c.error |= AV_LZO_INPUT_DEPLETED; @@ -199,16 +209,16 @@ int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) { int cnt, back; if (x > 15) { if (x > 63) { - cnt = (x >> 5) - 1; + cnt = (x >> 5) - 1; back = (GETB(c) << 3) + ((x >> 2) & 7) + 1; } else if (x > 31) { - cnt = get_len(&c, x, 31); - x = GETB(c); + cnt = get_len(&c, x, 31); + x = GETB(c); back = (GETB(c) << 6) + (x >> 2) + 1; } else { - cnt = get_len(&c, x, 7); - back = (1 << 14) + ((x & 8) << 11); - x = GETB(c); + cnt = get_len(&c, x, 7); + back = (1 << 14) + ((x & 8) << 11); + x = GETB(c); back += (GETB(c) << 6) + (x >> 2); if (back == (1 << 14)) { if (cnt != 1) @@ -216,21 +226,21 @@ int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) { break; } } - } else if(!state){ - cnt = get_len(&c, x, 15); - copy(&c, cnt + 3); - x = GETB(c); - if (x > 15) - continue; - cnt = 1; - back = (1 << 11) + (GETB(c) << 2) + (x >> 2) + 1; + } else if (!state) { + cnt = get_len(&c, x, 15); + copy(&c, cnt + 3); + x = GETB(c); + if (x > 15) + continue; + cnt = 1; + back = (1 << 11) + (GETB(c) << 2) + (x >> 2) + 1; } else { - cnt = 0; - back = (GETB(c) << 2) + (x >> 2) + 1; + cnt = 0; + back = (GETB(c) << 2) + (x >> 2) + 1; } copy_backptr(&c, back, cnt + 2); - state= - cnt = x & 3; + state = + cnt = x & 3; copy(&c, cnt); x = GETB(c); } diff --git a/libavutil/lzo.h b/libavutil/lzo.h index 1b774a53bc..e3c6c01c6b 100644 --- a/libavutil/lzo.h +++ b/libavutil/lzo.h @@ -32,18 +32,18 @@ #include /** @name Error flags returned by av_lzo1x_decode - * @{ */ + * @{ */ /// end of the input buffer reached before decoding finished -#define AV_LZO_INPUT_DEPLETED 1 +#define AV_LZO_INPUT_DEPLETED 1 /// decoded data did not fit into output buffer -#define AV_LZO_OUTPUT_FULL 2 +#define AV_LZO_OUTPUT_FULL 2 /// a reference to previously decoded data was wrong #define AV_LZO_INVALID_BACKPTR 4 /// a non-specific error in the compressed bitstream -#define AV_LZO_ERROR 8 +#define AV_LZO_ERROR 8 /** @} */ -#define AV_LZO_INPUT_PADDING 8 +#define AV_LZO_INPUT_PADDING 8 #define AV_LZO_OUTPUT_PADDING 12 /** -- cgit v1.2.3 From 5532cf3178385dc7d5414b65e9f01966125d8a9b Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 18 Oct 2012 19:16:37 +0200 Subject: avutil/mem: K&R formatting cosmetics --- libavutil/mem.c | 77 +++++++++++++++++++++++++++++---------------------------- libavutil/mem.h | 4 +-- 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/libavutil/mem.c b/libavutil/mem.c index 3769da7d21..16c1adb014 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -58,8 +58,8 @@ void free(void *ptr); #endif /* MALLOC_PREFIX */ /* 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 - linker will do it automatically. */ + * memory allocator. You do not need to suppress this file because the + * linker will do it automatically. */ void *av_malloc(size_t size) { @@ -69,46 +69,46 @@ void *av_malloc(size_t size) #endif /* let's disallow possible ambiguous cases */ - if (size > (INT_MAX-32) || !size) + if (size > (INT_MAX - 32) || !size) return NULL; #if CONFIG_MEMALIGN_HACK - ptr = malloc(size+32); - if(!ptr) + ptr = malloc(size + 32); + if (!ptr) return ptr; - diff= ((-(long)ptr - 1)&31) + 1; - ptr = (char*)ptr + diff; - ((char*)ptr)[-1]= diff; + diff = ((-(long)ptr - 1) & 31) + 1; + ptr = (char *)ptr + diff; + ((char *)ptr)[-1] = diff; #elif HAVE_POSIX_MEMALIGN - if (posix_memalign(&ptr,32,size)) + if (posix_memalign(&ptr, 32, size)) ptr = NULL; #elif HAVE_ALIGNED_MALLOC ptr = _aligned_malloc(size, 32); #elif HAVE_MEMALIGN - ptr = memalign(32,size); + ptr = memalign(32, size); /* Why 64? - Indeed, we should align it: - on 4 for 386 - on 16 for 486 - on 32 for 586, PPro - K6-III - on 64 for K7 (maybe for P3 too). - Because L1 and L2 caches are aligned on those values. - But I don't want to code such logic here! + * Indeed, we should align it: + * on 4 for 386 + * on 16 for 486 + * on 32 for 586, PPro - K6-III + * on 64 for K7 (maybe for P3 too). + * Because L1 and L2 caches are aligned on those values. + * But I don't want to code such logic here! */ - /* Why 32? - For AVX ASM. SSE / NEON needs only 16. - Why not larger? Because I did not see a difference in benchmarks ... + /* Why 32? + * For AVX ASM. SSE / NEON needs only 16. + * Why not larger? Because I did not see a difference in benchmarks ... */ - /* benchmarks with P3 - memalign(64)+1 3071,3051,3032 - memalign(64)+2 3051,3032,3041 - memalign(64)+4 2911,2896,2915 - memalign(64)+8 2545,2554,2550 - memalign(64)+16 2543,2572,2563 - memalign(64)+32 2546,2545,2571 - memalign(64)+64 2570,2533,2558 - - BTW, malloc seems to do 8-byte alignment by default here. + /* benchmarks with P3 + * memalign(64) + 1 3071, 3051, 3032 + * memalign(64) + 2 3051, 3032, 3041 + * memalign(64) + 4 2911, 2896, 2915 + * memalign(64) + 8 2545, 2554, 2550 + * memalign(64) + 16 2543, 2572, 2563 + * memalign(64) + 32 2546, 2545, 2571 + * memalign(64) + 64 2570, 2533, 2558 + * + * BTW, malloc seems to do 8-byte alignment by default here. */ #else ptr = malloc(size); @@ -123,14 +123,15 @@ void *av_realloc(void *ptr, size_t size) #endif /* let's disallow possible ambiguous cases */ - if(size > (INT_MAX-16) ) + if (size > (INT_MAX - 16)) return NULL; #if CONFIG_MEMALIGN_HACK //FIXME this isn't aligned correctly, though it probably isn't needed - if(!ptr) return av_malloc(size); - diff= ((char*)ptr)[-1]; - return (char*)realloc((char*)ptr - diff, size + diff) + diff; + if (!ptr) + return av_malloc(size); + diff = ((char *)ptr)[-1]; + return (char *)realloc((char *)ptr - diff, size + diff) + diff; #elif HAVE_ALIGNED_MALLOC return _aligned_realloc(ptr, size, 32); #else @@ -142,7 +143,7 @@ void av_free(void *ptr) { #if CONFIG_MEMALIGN_HACK if (ptr) - free((char*)ptr - ((char*)ptr)[-1]); + free((char *)ptr - ((char *)ptr)[-1]); #elif HAVE_ALIGNED_MALLOC _aligned_free(ptr); #else @@ -152,7 +153,7 @@ void av_free(void *ptr) void av_freep(void *arg) { - void **ptr= (void**)arg; + void **ptr = (void **)arg; av_free(*ptr); *ptr = NULL; } @@ -167,8 +168,8 @@ void *av_mallocz(size_t size) char *av_strdup(const char *s) { - char *ptr= NULL; - if(s){ + char *ptr = NULL; + if (s) { int len = strlen(s) + 1; ptr = av_malloc(len); if (ptr) diff --git a/libavutil/mem.h b/libavutil/mem.h index fb222061f7..4f14f27a91 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -89,7 +89,7 @@ void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1); * be allocated. * @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) return NULL; @@ -140,7 +140,7 @@ void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1); * @see av_mallocz() * @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) return NULL; -- cgit v1.2.3 From 79042ab37619a234d5fe0f680885a392e966ea6b Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 19 Oct 2012 18:58:39 +0200 Subject: configure: Group math functions into a separate variable This avoids some duplication when listing and testing for the functions. --- configure | 55 +++++++++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 32 deletions(-) diff --git a/configure b/configure index f892bfe9cb..996c7169e4 100755 --- a/configure +++ b/configure @@ -1124,6 +1124,25 @@ HAVE_LIST_PUB=' fast_unaligned ' +MATH_FUNCS=" + cbrtf + exp2 + exp2f + isinf + isnan + llrint + llrintf + log2 + log2f + lrint + lrintf + rint + round + roundf + trunc + truncf +" + HAVE_LIST=" $ARCH_EXT_LIST $(add_suffix _external $ARCH_EXT_LIST) @@ -1131,6 +1150,7 @@ HAVE_LIST=" $HAVE_LIST_CMDLINE $HAVE_LIST_PUB $THREADS_LIST + $MATH_FUNCS aligned_malloc aligned_stack alsa_asoundlib_h @@ -1140,7 +1160,6 @@ HAVE_LIST=" asm_mod_y attribute_may_alias attribute_packed - cbrtf closesocket cmov cpunop @@ -1158,8 +1177,6 @@ HAVE_LIST=" dxva_h ebp_available ebx_available - exp2 - exp2f fast_64bit fast_clz fast_cmov @@ -1179,22 +1196,14 @@ HAVE_LIST=" inet_aton io_h isatty - isinf - isnan jack_port_get_latency_range ldbrx libdc1394_1 libdc1394_2 - llrint - llrintf local_aligned_16 local_aligned_8 localtime_r - log2 - log2f loongson - lrint - lrintf machine_ioctl_bt848_h machine_ioctl_meteor_h malloc_h @@ -1209,9 +1218,6 @@ HAVE_LIST=" poll_h posix_memalign rdtsc - rint - round - roundf sched_getaffinity sdl sdl_video_size @@ -1246,8 +1252,6 @@ HAVE_LIST=" sys_time_h sys_videoio_h threads - trunc - truncf unistd_h usleep vfp_args @@ -3270,22 +3274,9 @@ done check_lib math.h sin -lm && LIBM="-lm" enabled vaapi && require vaapi va/va.h vaInitialize -lva -check_mathfunc cbrtf -check_mathfunc exp2 -check_mathfunc exp2f -check_mathfunc isinf -check_mathfunc isnan -check_mathfunc llrint -check_mathfunc llrintf -check_mathfunc log2 -check_mathfunc log2f -check_mathfunc lrint -check_mathfunc lrintf -check_mathfunc rint -check_mathfunc round -check_mathfunc roundf -check_mathfunc trunc -check_mathfunc truncf +for func in $MATH_FUNCS; do + check_mathfunc $func +done # these are off by default, so fail if requested and not available enabled avisynth && require2 vfw32 "windows.h vfw.h" AVIFileInit -lavifil32 -- cgit v1.2.3