| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| 11 | 11 | 
| 12 #ifndef QUANTIZE_ARM_H | 12 #ifndef QUANTIZE_ARM_H | 
| 13 #define QUANTIZE_ARM_H | 13 #define QUANTIZE_ARM_H | 
| 14 | 14 | 
| 15 #if HAVE_ARMV6 | 15 #if HAVE_ARMV6 | 
| 16 | 16 | 
| 17 extern prototype_quantize_block(vp8_fast_quantize_b_armv6); | 17 extern prototype_quantize_block(vp8_fast_quantize_b_armv6); | 
| 18 | 18 | 
|  | 19 #if !CONFIG_RUNTIME_CPU_DETECT | 
| 19 #undef  vp8_quantize_fastquantb | 20 #undef  vp8_quantize_fastquantb | 
| 20 #define vp8_quantize_fastquantb vp8_fast_quantize_b_armv6 | 21 #define vp8_quantize_fastquantb vp8_fast_quantize_b_armv6 | 
|  | 22 #endif | 
| 21 | 23 | 
| 22 #endif /* HAVE_ARMV6 */ | 24 #endif /* HAVE_ARMV6 */ | 
| 23 | 25 | 
| 24 | 26 | 
| 25 #if HAVE_ARMV7 | 27 #if HAVE_ARMV7 | 
|  | 28 | 
| 26 extern prototype_quantize_block(vp8_fast_quantize_b_neon); | 29 extern prototype_quantize_block(vp8_fast_quantize_b_neon); | 
|  | 30 extern prototype_quantize_block_pair(vp8_fast_quantize_b_pair_neon); | 
| 27 | 31 | 
| 28 /* The neon quantizer has not been updated to match the new exact | 32 #if !CONFIG_RUNTIME_CPU_DETECT | 
| 29  * quantizer introduced in commit e04e2935 | 33 #undef  vp8_quantize_fastquantb | 
| 30  */ | 34 #define vp8_quantize_fastquantb vp8_fast_quantize_b_neon | 
| 31 //#undef  vp8_quantize_fastquantb | 35 | 
| 32 //#define vp8_quantize_fastquantb vp8_fast_quantize_b_neon | 36 #undef  vp8_quantize_fastquantb_pair | 
|  | 37 #define vp8_quantize_fastquantb_pair vp8_fast_quantize_b_pair_neon | 
|  | 38 | 
|  | 39 #undef vp8_quantize_mb | 
|  | 40 #define vp8_quantize_mb vp8_quantize_mb_neon | 
|  | 41 | 
|  | 42 #undef vp8_quantize_mbuv | 
|  | 43 #define vp8_quantize_mbuv vp8_quantize_mbuv_neon | 
|  | 44 | 
|  | 45 #undef vp8_quantize_mby | 
|  | 46 #define vp8_quantize_mby vp8_quantize_mby_neon | 
|  | 47 #endif | 
|  | 48 | 
|  | 49 #endif /* HAVE_ARMV7 */ | 
| 33 | 50 | 
| 34 #endif | 51 #endif | 
| 35 | 52 | 
| 36 #endif |  | 
| OLD | NEW | 
|---|