summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-19 08:59:58 -0800
committerGlenn Kasten <gkasten@google.com>2012-02-14 09:17:59 -0800
commit99e53b86eebb605b70dd7591b89bf61a9414ed0e (patch)
tree8939550ada02fe21121550a83952ebf7638c0dac /services/audioflinger/AudioMixer.cpp
parent6dbc1359f778575d09d6da722b060a6d72c2e7c5 (diff)
downloadframeworks_av-99e53b86eebb605b70dd7591b89bf61a9414ed0e.zip
frameworks_av-99e53b86eebb605b70dd7591b89bf61a9414ed0e.tar.gz
frameworks_av-99e53b86eebb605b70dd7591b89bf61a9414ed0e.tar.bz2
Update comments
We no longer put the filename at start of file. Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
-rw-r--r--services/audioflinger/AudioMixer.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp
index 191520a..cb7678b 100644
--- a/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@ -1,4 +1,4 @@
-/* //device/include/server/AudioFlinger/AudioMixer.cpp
+/*
**
** Copyright 2007, The Android Open Source Project
**
@@ -961,7 +961,12 @@ void AudioMixer::process__genericResampling(state_t* state)
// one track, 16 bits stereo without resampling is the most common case
void AudioMixer::process__OneTrack16BitsStereoNoResampling(state_t* state)
{
+ // This method is only called when state->enabledTracks has exactly
+ // one bit set. The asserts below would verify this, but are commented out
+ // since the whole point of this method is to optimize performance.
+ //assert(0 != state->enabledTracks);
const int i = 31 - __builtin_clz(state->enabledTracks);
+ //assert((1 << i) == state->enabledTracks);
const track_t& t = state->tracks[i];
AudioBufferProvider::Buffer& b(t.buffer);