diff options
| author | Derek Sollenberger <djsollen@google.com> | 2013-02-07 18:38:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-07 18:38:54 +0000 |
| commit | b6dbce6bfeaabde2a7b581c4c6888d532d32f3ac (patch) | |
| tree | 1dd0a6f6cc091618520b48d4127d62c8c880e1d0 /src/dsp/cpu.c | |
| parent | 4b2196c929b70f2cdc1c2556580d349db89356d8 (diff) | |
| download | webp-b6dbce6bfeaabde2a7b581c4c6888d532d32f3ac.tar.gz | |
Revert "Sync libwebp with head#I6ecefe33"
This reverts commit 4b2196c929b70f2cdc1c2556580d349db89356d8
Change-Id: I3c026866c336663666cb5a2e9e34ecffd1f05595
Diffstat (limited to 'src/dsp/cpu.c')
| -rw-r--r-- | src/dsp/cpu.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/dsp/cpu.c b/src/dsp/cpu.c index bf9ae0c7..2ee7812d 100644 --- a/src/dsp/cpu.c +++ b/src/dsp/cpu.c @@ -11,9 +11,9 @@ #include "./dsp.h" -#if defined(__ANDROID__) -#include "./cpu-features.h" -#endif +//#if defined(__ANDROID__) +//#include <cpu-features.h> +//#endif #if defined(__cplusplus) || defined(c_plusplus) extern "C" { @@ -57,17 +57,17 @@ static int x86CPUInfo(CPUFeature feature) { return 0; } VP8CPUInfo VP8GetCPUInfo = x86CPUInfo; -#elif defined(WEBP_ANDROID_NEON) -static int AndroidCPUInfo(CPUFeature feature) { - const AndroidCpuFamily cpu_family = android_getCpuFamily(); - const uint64_t cpu_features = android_getCpuFeatures(); - if (feature == kNEON) { - return (cpu_family == ANDROID_CPU_FAMILY_ARM && - 0 != (cpu_features & ANDROID_CPU_ARM_FEATURE_NEON)); - } - return 0; -} -VP8CPUInfo VP8GetCPUInfo = AndroidCPUInfo; +//#elif defined(WEBP_ANDROID_NEON) +//static int AndroidCPUInfo(CPUFeature feature) { +// const AndroidCpuFamily cpu_family = android_getCpuFamily(); +// const uint64_t cpu_features = android_getCpuFeatures(); +// if (feature == kNEON) { +// return (cpu_family == ANDROID_CPU_FAMILY_ARM && +// 0 != (cpu_features & ANDROID_CPU_ARM_FEATURE_NEON)); +// } +// return 0; +//} +//VP8CPUInfo VP8GetCPUInfo = AndroidCPUInfo; #elif defined(__ARM_NEON__) // define a dummy function to enable turning off NEON at runtime by setting // VP8DecGetCPUInfo = NULL |