diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-10 15:31:54 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-10 15:31:54 -0800 |
| commit | 6f5f9ce713b3ea58cbc71f3f4b02c2b694ce9dec (patch) | |
| tree | bfb2fe3a528eabe2937d9597e81e90a448e8c3ba /services/audioflinger | |
| parent | d335c1cc4f9980d3fe2600876bd068ee5cb0002e (diff) | |
| parent | 32d41d56e382f62f4ee81097524ee6427878961f (diff) | |
| download | frameworks_base-6f5f9ce713b3ea58cbc71f3f4b02c2b694ce9dec.zip frameworks_base-6f5f9ce713b3ea58cbc71f3f4b02c2b694ce9dec.tar.gz frameworks_base-6f5f9ce713b3ea58cbc71f3f4b02c2b694ce9dec.tar.bz2 | |
Merge "Disable HQ resamplers for now until qualified"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/Android.mk | 4 | ||||
| -rw-r--r-- | services/audioflinger/AudioResampler.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 52834db..deeb2de 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -6,9 +6,9 @@ LOCAL_SRC_FILES:= \ AudioFlinger.cpp \ AudioMixer.cpp.arm \ AudioResampler.cpp.arm \ - AudioResamplerSinc.cpp.arm \ - AudioResamplerCubic.cpp.arm \ AudioPolicyService.cpp +# AudioResamplerSinc.cpp.arm +# AudioResamplerCubic.cpp.arm LOCAL_C_INCLUDES := \ system/media/audio_effects/include \ diff --git a/services/audioflinger/AudioResampler.cpp b/services/audioflinger/AudioResampler.cpp index 4eac032..9486b9c 100644 --- a/services/audioflinger/AudioResampler.cpp +++ b/services/audioflinger/AudioResampler.cpp @@ -23,8 +23,10 @@ #include <cutils/log.h> #include <cutils/properties.h> #include "AudioResampler.h" +#if 0 #include "AudioResamplerSinc.h" #include "AudioResamplerCubic.h" +#endif #ifdef __arm__ #include <machine/cpu-features.h> @@ -99,6 +101,7 @@ AudioResampler* AudioResampler::create(int bitDepth, int inChannelCount, ALOGV("Create linear Resampler"); resampler = new AudioResamplerOrder1(bitDepth, inChannelCount, sampleRate); break; +#if 0 case MED_QUALITY: ALOGV("Create cubic Resampler"); resampler = new AudioResamplerCubic(bitDepth, inChannelCount, sampleRate); @@ -107,6 +110,7 @@ AudioResampler* AudioResampler::create(int bitDepth, int inChannelCount, ALOGV("Create sinc Resampler"); resampler = new AudioResamplerSinc(bitDepth, inChannelCount, sampleRate); break; +#endif } // initialize resampler |