summaryrefslogtreecommitdiff
path: root/vp8/encoder/arm/quantize_arm.h
diff options
context:
space:
mode:
authorFritz Koenig <frkoenig@google.com>2012-01-19 15:18:31 -0800
committerFritz Koenig <frkoenig@google.com>2012-01-20 10:38:15 -0800
commit892102842a7bfd5dc8f37ed4c69c3d68e1293df4 (patch)
treefcf90d3b86eae619199a80c0d8f2e161937f75a4 /vp8/encoder/arm/quantize_arm.h
parentac97b089d1000848f350480ec355b90e4f1f4ef7 (diff)
downloadlibvpx-892102842a7bfd5dc8f37ed4c69c3d68e1293df4.tar
libvpx-892102842a7bfd5dc8f37ed4c69c3d68e1293df4.tar.gz
libvpx-892102842a7bfd5dc8f37ed4c69c3d68e1293df4.tar.bz2
libvpx-892102842a7bfd5dc8f37ed4c69c3d68e1293df4.zip
Disconnect ARM tgt_isa from dsp extensions
A processor with ARMv7 instructions does not necessarily have NEON dsp extensions. This CL has the added side effect of allowing the ability to enable/disable the dsp extensions cleanly. Change-Id: Ie1e879b8fe131885bc3d4138a0acc9ffe73a36df
Diffstat (limited to 'vp8/encoder/arm/quantize_arm.h')
-rw-r--r--vp8/encoder/arm/quantize_arm.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/encoder/arm/quantize_arm.h b/vp8/encoder/arm/quantize_arm.h
index 7d2088d2d..ef6517bd8 100644
--- a/vp8/encoder/arm/quantize_arm.h
+++ b/vp8/encoder/arm/quantize_arm.h
@@ -12,7 +12,7 @@
#ifndef QUANTIZE_ARM_H
#define QUANTIZE_ARM_H
-#if HAVE_ARMV6
+#if HAVE_MEDIA
extern prototype_quantize_block(vp8_fast_quantize_b_armv6);
@@ -21,10 +21,10 @@ extern prototype_quantize_block(vp8_fast_quantize_b_armv6);
#define vp8_quantize_fastquantb vp8_fast_quantize_b_armv6
#endif
-#endif /* HAVE_ARMV6 */
+#endif /* HAVE_MEDIA */
-#if HAVE_ARMV7
+#if HAVE_NEON
extern prototype_quantize_block(vp8_fast_quantize_b_neon);
extern prototype_quantize_block_pair(vp8_fast_quantize_b_pair_neon);
@@ -46,7 +46,7 @@ extern prototype_quantize_block_pair(vp8_fast_quantize_b_pair_neon);
#define vp8_quantize_mby vp8_quantize_mby_neon
#endif
-#endif /* HAVE_ARMV7 */
+#endif /* HAVE_NEON */
#endif