diff options
| author | Johann <johannkoenig@google.com> | 2011-06-29 10:51:41 -0400 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2011-06-29 10:51:41 -0400 |
| commit | 6611f6697849a94888974b81378390cd2bb5bd41 (patch) | |
| tree | 3ac145efcd4951c786613cccfe6800ae14c177e9 | |
| parent | f3a13cb236754734c4b0cdf55bf7e277f91e519c (diff) | |
| download | libvpx-6611f6697849a94888974b81378390cd2bb5bd41.tar libvpx-6611f6697849a94888974b81378390cd2bb5bd41.tar.gz libvpx-6611f6697849a94888974b81378390cd2bb5bd41.tar.bz2 libvpx-6611f6697849a94888974b81378390cd2bb5bd41.zip | |
clean up warnings when building arm with rtcd
Change-Id: I3683cb87e9cb7c36fc22c1d70f0799c7c46a21df
| -rw-r--r-- | vp8/common/arm/arm_systemdependent.c | 13 | ||||
| -rw-r--r-- | vp8/decoder/arm/arm_dsystemdependent.c | 13 | ||||
| -rw-r--r-- | vp8/encoder/arm/arm_csystemdependent.c | 15 |
3 files changed, 25 insertions, 16 deletions
diff --git a/vp8/common/arm/arm_systemdependent.c b/vp8/common/arm/arm_systemdependent.c index bd5c0759d..8aab0ff03 100644 --- a/vp8/common/arm/arm_systemdependent.c +++ b/vp8/common/arm/arm_systemdependent.c @@ -24,14 +24,17 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx) #if CONFIG_RUNTIME_CPU_DETECT VP8_COMMON_RTCD *rtcd = &ctx->rtcd; int flags = arm_cpu_caps(); - int has_edsp = flags & HAS_EDSP; - int has_media = flags & HAS_MEDIA; - int has_neon = flags & HAS_NEON; rtcd->flags = flags; /* Override default functions with fastest ones for this CPU. */ +#if HAVE_ARMV5TE + if (flags & HAS_EDSP) + { + } +#endif + #if HAVE_ARMV6 - if (has_media) + if (flags & HAS_MEDIA) { rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_armv6; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_armv6; @@ -66,7 +69,7 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx) #endif #if HAVE_ARMV7 - if (has_neon) + if (flags & HAS_NEON) { rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_neon; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_neon; diff --git a/vp8/decoder/arm/arm_dsystemdependent.c b/vp8/decoder/arm/arm_dsystemdependent.c index 51e901d79..79e2e1ba9 100644 --- a/vp8/decoder/arm/arm_dsystemdependent.c +++ b/vp8/decoder/arm/arm_dsystemdependent.c @@ -21,12 +21,15 @@ void vp8_arch_arm_decode_init(VP8D_COMP *pbi) { #if CONFIG_RUNTIME_CPU_DETECT int flags = pbi->common.rtcd.flags; - int has_edsp = flags & HAS_EDSP; - int has_media = flags & HAS_MEDIA; - int has_neon = flags & HAS_NEON; + +#if HAVE_ARMV5TE + if (flags & HAS_EDSP) + { + } +#endif #if HAVE_ARMV6 - if (has_media) + if (flags & HAS_MEDIA) { pbi->dequant.block = vp8_dequantize_b_v6; pbi->dequant.idct_add = vp8_dequant_idct_add_v6; @@ -38,7 +41,7 @@ void vp8_arch_arm_decode_init(VP8D_COMP *pbi) #endif #if HAVE_ARMV7 - if (has_neon) + if (flags & HAS_NEON) { pbi->dequant.block = vp8_dequantize_b_neon; pbi->dequant.idct_add = vp8_dequant_idct_add_neon; diff --git a/vp8/encoder/arm/arm_csystemdependent.c b/vp8/encoder/arm/arm_csystemdependent.c index 56c858c71..89f8136fe 100644 --- a/vp8/encoder/arm/arm_csystemdependent.c +++ b/vp8/encoder/arm/arm_csystemdependent.c @@ -22,12 +22,15 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi) { #if CONFIG_RUNTIME_CPU_DETECT int flags = cpi->common.rtcd.flags; - int has_edsp = flags & HAS_EDSP; - int has_media = flags & HAS_MEDIA; - int has_neon = flags & HAS_NEON; + +#if HAVE_ARMV5TE + if (flags & HAS_EDSP) + { + } +#endif #if HAVE_ARMV6 - if (has_media) + if (flags & HAS_MEDIA) { cpi->rtcd.variance.sad16x16 = vp8_sad16x16_armv6; /*cpi->rtcd.variance.sad16x8 = vp8_sad16x8_c; @@ -74,7 +77,7 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi) #endif #if HAVE_ARMV7 - if (has_neon) + if (flags & HAS_NEON) { cpi->rtcd.variance.sad16x16 = vp8_sad16x16_neon; cpi->rtcd.variance.sad16x8 = vp8_sad16x8_neon; @@ -124,7 +127,7 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi) #if HAVE_ARMV7 #if CONFIG_RUNTIME_CPU_DETECT - if (has_neon) + if (flags & HAS_NEON) #endif { vp8_yv12_copy_partial_frame_ptr = vpxyv12_copy_partial_frame_neon; |