diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-08 03:05:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-08 03:05:38 +0000 |
| commit | 4b4ceaabd739b39e0690911afd1ae8f6d5ae9fae (patch) | |
| tree | ba8eb25cd9ee303b307801c0efc31b6c1459d4d7 /services | |
| parent | df5a85b19273eeb1031d5b17ff1fdc68976d167d (diff) | |
| parent | 8510932d6e5a1d4628c700fbff8f836abe470713 (diff) | |
| download | frameworks_av-4b4ceaabd739b39e0690911afd1ae8f6d5ae9fae.zip frameworks_av-4b4ceaabd739b39e0690911afd1ae8f6d5ae9fae.tar.gz frameworks_av-4b4ceaabd739b39e0690911afd1ae8f6d5ae9fae.tar.bz2 | |
am ccfeadcd: audioflinger: fix duplicating thread output buffers clear automerge: 02b5708
automerge: 8510932
* commit '8510932d6e5a1d4628c700fbff8f836abe470713':
audioflinger: fix duplicating thread output buffers clear
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index dc974e9..33ce910 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -4725,7 +4725,11 @@ void AudioFlinger::DuplicatingThread::threadLoop_mix() if (outputsReady(outputTracks)) { mAudioMixer->process(AudioBufferProvider::kInvalidPTS); } else { - memset(mSinkBuffer, 0, mSinkBufferSize); + if (mMixerBufferValid) { + memset(mMixerBuffer, 0, mMixerBufferSize); + } else { + memset(mSinkBuffer, 0, mSinkBufferSize); + } } sleepTime = 0; writeFrames = mNormalFrameCount; |