| Index: source/libvpx/vp8/encoder/arm/quantize_arm.h
|
| ===================================================================
|
| --- source/libvpx/vp8/encoder/arm/quantize_arm.h (revision 96967)
|
| +++ source/libvpx/vp8/encoder/arm/quantize_arm.h (working copy)
|
| @@ -16,21 +16,37 @@
|
|
|
| extern prototype_quantize_block(vp8_fast_quantize_b_armv6);
|
|
|
| +#if !CONFIG_RUNTIME_CPU_DETECT
|
| #undef vp8_quantize_fastquantb
|
| #define vp8_quantize_fastquantb vp8_fast_quantize_b_armv6
|
| +#endif
|
|
|
| #endif /* HAVE_ARMV6 */
|
|
|
|
|
| #if HAVE_ARMV7
|
| +
|
| extern prototype_quantize_block(vp8_fast_quantize_b_neon);
|
| +extern prototype_quantize_block_pair(vp8_fast_quantize_b_pair_neon);
|
|
|
| -/* The neon quantizer has not been updated to match the new exact
|
| - * quantizer introduced in commit e04e2935
|
| - */
|
| -//#undef vp8_quantize_fastquantb
|
| -//#define vp8_quantize_fastquantb vp8_fast_quantize_b_neon
|
| +#if !CONFIG_RUNTIME_CPU_DETECT
|
| +#undef vp8_quantize_fastquantb
|
| +#define vp8_quantize_fastquantb vp8_fast_quantize_b_neon
|
|
|
| +#undef vp8_quantize_fastquantb_pair
|
| +#define vp8_quantize_fastquantb_pair vp8_fast_quantize_b_pair_neon
|
| +
|
| +#undef vp8_quantize_mb
|
| +#define vp8_quantize_mb vp8_quantize_mb_neon
|
| +
|
| +#undef vp8_quantize_mbuv
|
| +#define vp8_quantize_mbuv vp8_quantize_mbuv_neon
|
| +
|
| +#undef vp8_quantize_mby
|
| +#define vp8_quantize_mby vp8_quantize_mby_neon
|
| #endif
|
|
|
| +#endif /* HAVE_ARMV7 */
|
| +
|
| #endif
|
| +
|
|
|