summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2012-10-22 11:54:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-22 11:54:12 -0700
commitdf71e8e48ccf36b9f3947fb9d90cea4a5d319187 (patch)
tree2d4dc4d8eec6dd7f234ac041e0d04316846425ff /services
parentbd68fa3f7f214d73031b4043a85deab074c1f072 (diff)
parent7f4d5714f3f0ab4efaf2d0929a9f984467ef95c7 (diff)
downloadframeworks_av-df71e8e48ccf36b9f3947fb9d90cea4a5d319187.zip
frameworks_av-df71e8e48ccf36b9f3947fb9d90cea4a5d319187.tar.gz
frameworks_av-df71e8e48ccf36b9f3947fb9d90cea4a5d319187.tar.bz2
am 7f4d5714: am e384d75b: Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
* commit '7f4d5714f3f0ab4efaf2d0929a9f984467ef95c7': Fix a typo that caused the high quality resampler to produce garbage
Diffstat (limited to 'services')
-rw-r--r--services/audioflinger/AudioResamplerSinc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/AudioResamplerSinc.cpp b/services/audioflinger/AudioResamplerSinc.cpp
index 90651f1..9e8447a 100644
--- a/services/audioflinger/AudioResamplerSinc.cpp
+++ b/services/audioflinger/AudioResamplerSinc.cpp
@@ -252,7 +252,7 @@ void AudioResamplerSinc::resample(int32_t* out, size_t outFrameCount,
// FIXME store current state (up or down sample) and only load the coefs when the state
// changes. Or load two pointers one for up and one for down in the init function.
// Not critical now since the read functions are fast, but would be important if read was slow.
- if (readResampleCoefficients) {
+ if (mConstants == &veryHighQualityConstants && readResampleCoefficients) {
ALOGV("get coefficient from libmm-audio resampler library");
mFirCoefs = (mInSampleRate <= mSampleRate) ? readResampleCoefficients(true) :
readResampleCoefficients(false);