Mercurial > libavutil.hg
changeset 807:36cc11e07d9b libavutil
Optimise av_log2 with clz when available
10% faster flac decoding on x86 and ARM.
| author | mru |
|---|---|
| date | Thu, 14 Jan 2010 19:58:12 +0000 |
| parents | 757914de10e1 |
| children | 1778eea266cb |
| files | common.h intmath.h |
| diffstat | 2 files changed, 49 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/common.h Tue Jan 12 02:19:51 2010 +0000 +++ b/common.h Thu Jan 14 19:58:12 2010 +0000 @@ -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 av_reverse[256]; +#ifndef av_log2 static inline av_const int av_log2(unsigned int v) { int n = 0; @@ -153,7 +158,9 @@ 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 @@ return n; } +#endif /** * Clips a signed integer value into the amin-amax range.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/intmath.h Thu Jan 14 19:58:12 2010 +0000 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2010 Mans Rullgard <mans@mansr.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_INTMATH_H +#define AVUTIL_INTMATH_H + +#include "config.h" +#include "common.h" + +#if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4) + +#ifndef av_log2 + +#define av_log2(x) (31 - __builtin_clz((x)|1)) + +#ifndef av_log2_16bit +#define av_log2_16bit av_log2 +#endif + +#endif /* av_log2 */ + +#endif /* AV_GCC_VERSION_AT_LEAST(3,4) */ + +#endif /* AVUTIL_INTMATH_H */