From 32d41d56e382f62f4ee81097524ee6427878961f Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Thu, 2 Feb 2012 14:01:58 -0800 Subject: [PATCH] Disable HQ resamplers for now until qualified This saves about 6500 bytes. Change-Id: I87102fe561c95c19c9e615dea3de914f96639257 --- services/audioflinger/Android.mk | 4 ++-- 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 52834db26dc6e..deeb2dec25f8e 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 6e17a4a33f285..0a52939a9c732 100644 --- a/services/audioflinger/AudioResampler.cpp +++ b/services/audioflinger/AudioResampler.cpp @@ -23,8 +23,10 @@ #include #include #include "AudioResampler.h" +#if 0 #include "AudioResamplerSinc.h" #include "AudioResamplerCubic.h" +#endif #ifdef __arm__ #include @@ -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