diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-10 17:14:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 17:14:58 +0000 |
| commit | 2dca6f6826c81372e67625024bbe7fa00c02b708 (patch) | |
| tree | ceeef428c0e49b6757c9b3f1edaddf5206d19ebc /services/audioflinger | |
| parent | 10e898cc583473d4c3604456b48e008f90d82f70 (diff) | |
| parent | 995599cbd6ada739c257716a6d8b90eee6d61473 (diff) | |
| download | frameworks_av-2dca6f6826c81372e67625024bbe7fa00c02b708.zip frameworks_av-2dca6f6826c81372e67625024bbe7fa00c02b708.tar.gz frameworks_av-2dca6f6826c81372e67625024bbe7fa00c02b708.tar.bz2 | |
am 995599cb: audioflinger: fix duplicating thread output buffers clear
* commit '995599cbd6ada739c257716a6d8b90eee6d61473':
audioflinger: fix duplicating thread output buffers clear
Diffstat (limited to 'services/audioflinger')
| -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 e443476..71a6a73 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -4660,7 +4660,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; |