diff options
Diffstat (limited to 'libavutil/intmath.h')
| -rw-r--r-- | libavutil/intmath.h | 48 |
1 files changed, 40 insertions, 8 deletions
diff --git a/libavutil/intmath.h b/libavutil/intmath.h index a5ee652..308c776 100644 --- a/libavutil/intmath.h +++ b/libavutil/intmath.h @@ -1,20 +1,20 @@ /* * Copyright (c) 2010 Mans Rullgard <mans@mansr.com> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * 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. * - * Libav is distributed in the hope that it will be useful, + * 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -35,21 +35,29 @@ * @{ */ -#if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4) - +#if HAVE_FAST_CLZ +#if AV_GCC_VERSION_AT_LEAST(3,4) #ifndef ff_log2 # define ff_log2(x) (31 - __builtin_clz((x)|1)) # ifndef ff_log2_16bit # define ff_log2_16bit av_log2 # endif #endif /* ff_log2 */ - +#elif defined( __INTEL_COMPILER ) +#ifndef ff_log2 +# define ff_log2(x) (_bit_scan_reverse(x|1)) +# ifndef ff_log2_16bit +# define ff_log2_16bit av_log2 +# endif +#endif /* ff_log2 */ +#endif #endif /* AV_GCC_VERSION_AT_LEAST(3,4) */ extern const uint8_t ff_log2_tab[256]; #ifndef ff_log2 #define ff_log2 ff_log2_c +#if !defined( _MSC_VER ) static av_always_inline av_const int ff_log2_c(unsigned int v) { int n = 0; @@ -65,6 +73,15 @@ static av_always_inline av_const int ff_log2_c(unsigned int v) return n; } +#else +static av_always_inline av_const int ff_log2_c(unsigned int v) +{ + unsigned long n; + _BitScanReverse(&n, v|1); + return n; +} +#define ff_log2_16bit av_log2 +#endif #endif #ifndef ff_log2_16bit @@ -94,14 +111,21 @@ static av_always_inline av_const int ff_log2_16bit_c(unsigned int v) * @{ */ -#if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4) +#if HAVE_FAST_CLZ +#if AV_GCC_VERSION_AT_LEAST(3,4) #ifndef ff_ctz #define ff_ctz(v) __builtin_ctz(v) #endif +#elif defined( __INTEL_COMPILER ) +#ifndef ff_ctz +#define ff_ctz(v) _bit_scan_forward(v) +#endif +#endif #endif #ifndef ff_ctz #define ff_ctz ff_ctz_c +#if !defined( _MSC_VER ) static av_always_inline av_const int ff_ctz_c(int v) { int c; @@ -130,6 +154,14 @@ static av_always_inline av_const int ff_ctz_c(int v) return c; } +#else +static av_always_inline av_const int ff_ctz_c( int v ) +{ + unsigned long c; + _BitScanForward(&c, v); + return c; +} +#endif #endif /** |
