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 | 3a144d08b713e3c0f6b7b8e95bc42cef5886f4fa (patch) | |
| tree | b3c0d783ff3b8ef62804701409b038447d3f2cbb | |
| parent | 0d9302d7830b46542821b3e5f3e4f96942bd3cb3 (diff) | |
| parent | cdf2158f3b9498d6cd0eb228d8bee16e32399e16 (diff) | |
| download | frameworks_av-3a144d08b713e3c0f6b7b8e95bc42cef5886f4fa.zip frameworks_av-3a144d08b713e3c0f6b7b8e95bc42cef5886f4fa.tar.gz frameworks_av-3a144d08b713e3c0f6b7b8e95bc42cef5886f4fa.tar.bz2 | |
Merge "Disable HQ resamplers for now until qualified"
| -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 |