diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-02-14 00:02:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-14 00:02:36 +0000 |
| commit | 51eb3965caa8ba135bcdd8ffb7a2024a042ecdc0 (patch) | |
| tree | 0444520a23aa61553f9cf8bb67ee0f8127096b6a /services/audioflinger/AudioMixer.cpp | |
| parent | 0ddd56316262ac74a95e9edb595697c163136d6d (diff) | |
| download | frameworks_av-51eb3965caa8ba135bcdd8ffb7a2024a042ecdc0.zip frameworks_av-51eb3965caa8ba135bcdd8ffb7a2024a042ecdc0.tar.gz frameworks_av-51eb3965caa8ba135bcdd8ffb7a2024a042ecdc0.tar.bz2 | |
Revert "Temporary additional logging to investigate bug"
This reverts commit 0ddd56316262ac74a95e9edb595697c163136d6d
Change-Id: I180a928af6f5a38d15a5efe44cd1fe927b5d961c
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
| -rw-r--r-- | services/audioflinger/AudioMixer.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 30d645c..08325ad 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -209,7 +209,6 @@ int AudioMixer::getTrackName(audio_channel_mask_t channelMask, int sessionId) t->mainBuffer = NULL; t->auxBuffer = NULL; t->downmixerBufferProvider = NULL; - t->fastIndex = -1; status_t status = initTrackDownmix(&mState.tracks[n], n, channelMask); if (status == OK) { @@ -456,9 +455,6 @@ void AudioMixer::setParameter(int name, int target, int param, void *value) // for a specific track? or per mixer? /* case DOWNMIX_TYPE: break */ - case FAST_INDEX: - track.fastIndex = valueInt; - break; default: LOG_FATAL("bad param"); } @@ -1115,8 +1111,8 @@ void AudioMixer::process__genericNoResampling(state_t* state, int64_t pts) t.buffer.frameCount = state->frameCount; int valid = t.bufferProvider->getValid(); if (valid != AudioBufferProvider::kValid) { - ALOGE("invalid bufferProvider=%p name=%d fastIndex=%d frameCount=%d valid=%#x enabledTracks=%#x", - t.bufferProvider, i, t.fastIndex, t.buffer.frameCount, valid, enabledTracks); + ALOGE("invalid bufferProvider=%p name=%d frameCount=%d valid=%#x enabledTracks=%#x", + t.bufferProvider, i, t.buffer.frameCount, valid, enabledTracks); // expect to crash } t.bufferProvider->getNextBuffer(&t.buffer, pts); |