diff options
author | Mathias Agopian <mathias@google.com> | 2012-10-26 16:04:26 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-26 16:04:26 -0700 |
commit | 132cf756c152f36dafd81ebc235bc7e15660593e (patch) | |
tree | f9ee7ac78891876e6357f064561d8e4220e228f4 /services | |
parent | 401c4cf650ab8b208aedde8daf74aa2ae02dd760 (diff) | |
parent | 93d0767a8a9ee9d649eea9afac59f778e29a6a54 (diff) | |
download | frameworks_av-132cf756c152f36dafd81ebc235bc7e15660593e.zip frameworks_av-132cf756c152f36dafd81ebc235bc7e15660593e.tar.gz frameworks_av-132cf756c152f36dafd81ebc235bc7e15660593e.tar.bz2 |
Merge "reenable the cubic resampler"
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/Android.mk | 4 | ||||
-rw-r--r-- | services/audioflinger/AudioResampler.cpp | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index bd9421c..60f231e 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -19,11 +19,9 @@ LOCAL_SRC_FILES:= \ AudioResampler.cpp.arm \ AudioPolicyService.cpp \ ServiceUtilities.cpp \ + AudioResamplerCubic.cpp.arm \ AudioResamplerSinc.cpp.arm -# uncomment to enable AudioResampler::MED_QUALITY -# LOCAL_SRC_FILES += AudioResamplerCubic.cpp.arm - LOCAL_SRC_FILES += StateQueue.cpp # uncomment for debugging timing problems related to StateQueue::push() diff --git a/services/audioflinger/AudioResampler.cpp b/services/audioflinger/AudioResampler.cpp index ffea9b9..2c3c719 100644 --- a/services/audioflinger/AudioResampler.cpp +++ b/services/audioflinger/AudioResampler.cpp @@ -82,10 +82,8 @@ bool AudioResampler::qualityIsSupported(src_quality quality) switch (quality) { case DEFAULT_QUALITY: case LOW_QUALITY: -#if 0 // these have not been qualified recently so are not supported unless explicitly requested case MED_QUALITY: case HIGH_QUALITY: -#endif case VERY_HIGH_QUALITY: return true; default: @@ -190,12 +188,10 @@ AudioResampler* AudioResampler::create(int bitDepth, int inChannelCount, ALOGV("Create linear Resampler"); resampler = new AudioResamplerOrder1(bitDepth, inChannelCount, sampleRate); break; -#if 0 // disabled because it has not been qualified recently, if requested will use default: case MED_QUALITY: ALOGV("Create cubic Resampler"); resampler = new AudioResamplerCubic(bitDepth, inChannelCount, sampleRate); break; -#endif case HIGH_QUALITY: ALOGV("Create HIGH_QUALITY sinc Resampler"); resampler = new AudioResamplerSinc(bitDepth, inChannelCount, sampleRate); |