#endif
#if HAVE_FAST_CLZ
-#if 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 */
-#elif AV_GCC_VERSION_AT_LEAST(3,4)
+#if AV_GCC_VERSION_AT_LEAST(3,4)
#ifndef ff_log2
# define ff_log2(x) (31 - __builtin_clz((x)|1))
# ifndef ff_log2_16bit
#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;
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
*/
#if HAVE_FAST_CLZ
-#if defined( __INTEL_COMPILER )
-#ifndef ff_ctz
-#define ff_ctz(v) _bit_scan_forward(v)
-#endif
-#elif AV_GCC_VERSION_AT_LEAST(3,4)
+#if AV_GCC_VERSION_AT_LEAST(3,4)
#ifndef ff_ctz
#define ff_ctz(v) __builtin_ctz(v)
#endif
* @param v input value. If v is 0, the result is undefined.
* @return the number of trailing 0-bits
*/
-#if !defined( _MSC_VER )
/* We use the De-Bruijn method outlined in:
* http://supertech.csail.mit.edu/papers/debruijn.pdf. */
static av_always_inline av_const int ff_ctz_c(int v)
};
return debruijn_ctz32[(uint32_t)((v & -v) * 0x077CB531U) >> 27];
}
-#else
-static av_always_inline av_const int ff_ctz_c( int v )
-{
- unsigned long c;
- _BitScanForward(&c, v);
- return c;
-}
-#endif
#endif
#ifndef ff_ctzll
#if HAVE_FAST_CLZ
#if defined(__INTEL_COMPILER)
+# define ff_log2(x) (_bit_scan_reverse((x)|1))
+# define ff_log2_16bit av_log2
+
+# define ff_ctz(v) _bit_scan_forward(v)
+
# define ff_ctzll ff_ctzll_x86
static av_always_inline av_const int ff_ctzll_x86(long long v)
{
# endif
}
#elif defined(_MSC_VER)
+# define ff_log2 ff_log2_x86
+static av_always_inline av_const int ff_log2_x86(unsigned int v) {
+ unsigned long n;
+ _BitScanReverse(&n, v | 1);
+ return n;
+}
+# define ff_log2_16bit av_log2
+
+# define ff_ctz ff_ctz_x86
+static av_always_inline av_const int ff_ctz_x86(int v) {
+ unsigned long c;
+ _BitScanForward(&c, v);
+ return c;
+}
+
# define ff_ctzll ff_ctzll_x86
static av_always_inline av_const int ff_ctzll_x86(long long v)
{