summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.cpp
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2015-05-06 08:46:52 -0700
committerAndy Hung <hunga@google.com>2015-05-12 09:30:51 -0700
commitdb4c031f518ae5806af73756273ff32cd8d0e4f8 (patch)
tree62f9e0541acccc3acacf808d2a3cdad130eb819b /services/audioflinger/AudioMixer.cpp
parent18aa27016a94d0fee243637a80fd0741f89e08f2 (diff)
downloadframeworks_av-db4c031f518ae5806af73756273ff32cd8d0e4f8.zip
frameworks_av-db4c031f518ae5806af73756273ff32cd8d0e4f8.tar.gz
frameworks_av-db4c031f518ae5806af73756273ff32cd8d0e4f8.tar.bz2
Update sampling rate to 192kHz for devices
Change-Id: I0a83206be51d7ae18ccf85b94b2127356307be69
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
-rw-r--r--services/audioflinger/AudioMixer.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp
index 7040af4..1348d08 100644
--- a/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@ -708,11 +708,10 @@ bool AudioMixer::track_t::setResampler(uint32_t trackSampleRate, uint32_t devSam
// FIXME this is flawed for dynamic sample rates, as we choose the resampler
// quality level based on the initial ratio, but that could change later.
// Should have a way to distinguish tracks with static ratios vs. dynamic ratios.
- if (!((trackSampleRate == 44100 && devSampleRate == 48000) ||
- (trackSampleRate == 48000 && devSampleRate == 44100))) {
- quality = AudioResampler::DYN_LOW_QUALITY;
- } else {
+ if (isMusicRate(trackSampleRate)) {
quality = AudioResampler::DEFAULT_QUALITY;
+ } else {
+ quality = AudioResampler::DYN_LOW_QUALITY;
}
// TODO: Remove MONO_HACK. Resampler sees #channels after the downmixer