diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-14 02:44:16 +0300 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-14 02:44:16 +0300 |
commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavcodec/arm | |
parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/arm')
-rw-r--r-- | libavcodec/arm/asm.S | 2 | ||||
-rw-r--r-- | libavcodec/arm/dsputil_arm.c | 30 | ||||
-rw-r--r-- | libavcodec/arm/dsputil_arm_s.S | 4 | ||||
-rw-r--r-- | libavcodec/arm/dsputil_vfp.S | 2 | ||||
-rw-r--r-- | libavcodec/arm/float_arm_vfp.c | 2 | ||||
-rw-r--r-- | libavcodec/arm/mathops.h | 4 | ||||
-rw-r--r-- | libavcodec/arm/mpegvideo_arm.c | 4 |
7 files changed, 24 insertions, 24 deletions
diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S index 0aa1639998..69d83488ad 100644 --- a/libavcodec/arm/asm.S +++ b/libavcodec/arm/asm.S @@ -38,7 +38,7 @@ .endm .macro movrel rd, val -#if defined(HAVE_ARMV6T2) && !defined(CONFIG_SHARED) +#if HAVE_ARMV6T2 && !CONFIG_SHARED movw \rd, #:lower16:\val movt \rd, #:upper16:\val #else diff --git a/libavcodec/arm/dsputil_arm.c b/libavcodec/arm/dsputil_arm.c index eaa6b9eb8d..a91ca13141 100644 --- a/libavcodec/arm/dsputil_arm.c +++ b/libavcodec/arm/dsputil_arm.c @@ -20,7 +20,7 @@ */ #include "libavcodec/dsputil.h" -#ifdef HAVE_IPP +#if HAVE_IPP #include <ipp.h> #endif @@ -93,7 +93,7 @@ static void simple_idct_ARM_add(uint8_t *dest, int line_size, DCTELEM *block) ff_add_pixels_clamped(block, dest, line_size); } -#ifdef HAVE_IPP +#if HAVE_IPP static void simple_idct_ipp(DCTELEM *block) { ippiDCT8x8Inv_Video_16s_C1I(block); @@ -108,7 +108,7 @@ void add_pixels_clamped_iwmmxt(const DCTELEM *block, uint8_t *pixels, int line_s static void simple_idct_ipp_add(uint8_t *dest, int line_size, DCTELEM *block) { ippiDCT8x8Inv_Video_16s_C1I(block); -#ifdef HAVE_IWMMXT +#if HAVE_IWMMXT add_pixels_clamped_iwmmxt(block, dest, line_size); #else ff_add_pixels_clamped_ARM(block, dest, line_size); @@ -130,13 +130,13 @@ void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx) if (avctx->lowres == 0) { if(idct_algo == FF_IDCT_AUTO){ -#if defined(HAVE_IPP) +#if HAVE_IPP idct_algo = FF_IDCT_IPP; -#elif defined(HAVE_NEON) +#elif HAVE_NEON idct_algo = FF_IDCT_SIMPLENEON; -#elif defined(HAVE_ARMV6) +#elif HAVE_ARMV6 idct_algo = FF_IDCT_SIMPLEARMV6; -#elif defined(HAVE_ARMV5TE) +#elif HAVE_ARMV5TE idct_algo = FF_IDCT_SIMPLEARMV5TE; #else idct_algo = FF_IDCT_ARM; @@ -153,28 +153,28 @@ void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx) c->idct_add= simple_idct_ARM_add; c->idct = simple_idct_ARM; c->idct_permutation_type= FF_NO_IDCT_PERM; -#ifdef HAVE_ARMV6 +#if HAVE_ARMV6 } else if (idct_algo==FF_IDCT_SIMPLEARMV6){ c->idct_put= ff_simple_idct_put_armv6; c->idct_add= ff_simple_idct_add_armv6; c->idct = ff_simple_idct_armv6; c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; #endif -#ifdef HAVE_ARMV5TE +#if HAVE_ARMV5TE } else if (idct_algo==FF_IDCT_SIMPLEARMV5TE){ c->idct_put= simple_idct_put_armv5te; c->idct_add= simple_idct_add_armv5te; c->idct = simple_idct_armv5te; c->idct_permutation_type = FF_NO_IDCT_PERM; #endif -#ifdef HAVE_IPP +#if HAVE_IPP } else if (idct_algo==FF_IDCT_IPP){ c->idct_put= simple_idct_ipp_put; c->idct_add= simple_idct_ipp_add; c->idct = simple_idct_ipp; c->idct_permutation_type= FF_NO_IDCT_PERM; #endif -#ifdef HAVE_NEON +#if HAVE_NEON } else if (idct_algo==FF_IDCT_SIMPLENEON){ c->idct_put= ff_simple_idct_put_neon; c->idct_add= ff_simple_idct_add_neon; @@ -201,17 +201,17 @@ void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx) c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm; c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm; -#ifdef HAVE_ARMV5TE +#if HAVE_ARMV5TE c->prefetch = ff_prefetch_arm; #endif -#ifdef HAVE_IWMMXT +#if HAVE_IWMMXT dsputil_init_iwmmxt(c, avctx); #endif -#ifdef HAVE_ARMVFP +#if HAVE_ARMVFP ff_float_init_arm_vfp(c, avctx); #endif -#ifdef HAVE_NEON +#if HAVE_NEON ff_dsputil_init_neon(c, avctx); #endif } diff --git a/libavcodec/arm/dsputil_arm_s.S b/libavcodec/arm/dsputil_arm_s.S index 639b7b8af8..9425d33286 100644 --- a/libavcodec/arm/dsputil_arm_s.S +++ b/libavcodec/arm/dsputil_arm_s.S @@ -24,12 +24,12 @@ preserve8 -#ifndef HAVE_PLD +#if !HAVE_PLD .macro pld reg .endm #endif -#ifdef HAVE_ARMV5TE +#if HAVE_ARMV5TE function ff_prefetch_arm, export=1 subs r2, r2, #1 pld [r0] diff --git a/libavcodec/arm/dsputil_vfp.S b/libavcodec/arm/dsputil_vfp.S index 04c8014e1e..50cfd984a2 100644 --- a/libavcodec/arm/dsputil_vfp.S +++ b/libavcodec/arm/dsputil_vfp.S @@ -133,7 +133,7 @@ function ff_vector_fmul_reverse_vfp, export=1 bx lr .endfunc -#ifdef HAVE_ARMV6 +#if HAVE_ARMV6 /** * ARM VFP optimized float to int16 conversion. * Assume that len is a positive number and is multiple of 8, destination diff --git a/libavcodec/arm/float_arm_vfp.c b/libavcodec/arm/float_arm_vfp.c index 5598aa9c02..41a7c19994 100644 --- a/libavcodec/arm/float_arm_vfp.c +++ b/libavcodec/arm/float_arm_vfp.c @@ -29,7 +29,7 @@ void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx) { c->vector_fmul = ff_vector_fmul_vfp; c->vector_fmul_reverse = ff_vector_fmul_reverse_vfp; -#ifdef HAVE_ARMV6 +#if HAVE_ARMV6 c->float_to_int16 = ff_float_to_int16_vfp; #endif } diff --git a/libavcodec/arm/mathops.h b/libavcodec/arm/mathops.h index e36316c76b..7a9d632195 100644 --- a/libavcodec/arm/mathops.h +++ b/libavcodec/arm/mathops.h @@ -38,7 +38,7 @@ static inline av_const int MULL(int a, int b, unsigned shift) } #define MULH MULH -#ifdef HAVE_ARMV6 +#if HAVE_ARMV6 static inline av_const int MULH(int a, int b) { int r; @@ -73,7 +73,7 @@ static inline av_const int64_t MAC64(int64_t d, int a, int b) #define MAC64(d, a, b) ((d) = MAC64(d, a, b)) #define MLS64(d, a, b) MAC64(d, -(a), b) -#if defined(HAVE_ARMV5TE) +#if HAVE_ARMV5TE /* signed 16x16 -> 32 multiply add accumulate */ # define MAC16(rt, ra, rb) \ diff --git a/libavcodec/arm/mpegvideo_arm.c b/libavcodec/arm/mpegvideo_arm.c index 18faed2d36..4882dd4426 100644 --- a/libavcodec/arm/mpegvideo_arm.c +++ b/libavcodec/arm/mpegvideo_arm.c @@ -31,10 +31,10 @@ void MPV_common_init_arm(MpegEncContext *s) * allow optimized functions for armv5te unless * a better iwmmxt function exists */ -#ifdef HAVE_ARMV5TE +#if HAVE_ARMV5TE MPV_common_init_armv5te(s); #endif -#ifdef HAVE_IWMMXT +#if HAVE_IWMMXT MPV_common_init_iwmmxt(s); #endif } |