summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-02-02 14:01:58 -0800
committerGlenn Kasten <gkasten@google.com>2012-02-09 18:14:44 -0800
commit32d41d56e382f62f4ee81097524ee6427878961f (patch)
treed3f9d34cfd6a25150bbd80cf44d0a9df877ec21d
parentf4aaf1f56247289838f4bb25ee704196464be4f2 (diff)
downloadframeworks_base-32d41d56e382f62f4ee81097524ee6427878961f.zip
frameworks_base-32d41d56e382f62f4ee81097524ee6427878961f.tar.gz
frameworks_base-32d41d56e382f62f4ee81097524ee6427878961f.tar.bz2
Disable HQ resamplers for now until qualified
This saves about 6500 bytes. Change-Id: I87102fe561c95c19c9e615dea3de914f96639257
-rw-r--r--services/audioflinger/Android.mk4
-rw-r--r--services/audioflinger/AudioResampler.cpp4
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 6e17a4a..0a52939 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