aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/common.h
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-01-14 19:58:12 +0000
committerMåns Rullgård <mans@mansr.com>2010-01-14 19:58:12 +0000
commit544f5a922f63faae775edcf04918c0d0ab87c470 (patch)
tree73bf2971835f7a3c31fe810c1e206e47abaebacf /libavutil/common.h
parent669b5583302b6dc04afaaab78144a6536399cdc6 (diff)
downloadffmpeg-544f5a922f63faae775edcf04918c0d0ab87c470.tar.gz
Optimise av_log2 with clz when available
10% faster flac decoding on x86 and ARM. Originally committed as revision 21217 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/common.h')
-rw-r--r--libavutil/common.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavutil/common.h b/libavutil/common.h
index a8a9bd39e6..c91e658af7 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -117,6 +117,10 @@
#endif
#endif
+#ifdef HAVE_AV_CONFIG_H
+# include "intmath.h"
+#endif
+
//rounded division & shift
#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
/* assume b>0 */
@@ -138,6 +142,7 @@ extern const uint8_t ff_log2_tab[256];
extern const uint8_t av_reverse[256];
+#ifndef av_log2
static inline av_const int av_log2(unsigned int v)
{
int n = 0;
@@ -153,7 +158,9 @@ static inline av_const int av_log2(unsigned int v)
return n;
}
+#endif
+#ifndef av_log2_16bit
static inline av_const int av_log2_16bit(unsigned int v)
{
int n = 0;
@@ -165,6 +172,7 @@ static inline av_const int av_log2_16bit(unsigned int v)
return n;
}
+#endif
/**
* Clips a signed integer value into the amin-amax range.