diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-10-19 12:35:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-19 12:35:14 -0700 |
| commit | 10640a5d5041629433e1c4aa49e4d3281e408542 (patch) | |
| tree | 8869665d4f906e509bd3ce1f9fb7be86b28623a9 | |
| parent | fec5b1333ab756f73677acf42ddd7b71cdbfafae (diff) | |
| parent | 126c910f48a1e1b7a8044157d95f774d5e142316 (diff) | |
| download | frameworks_av-10640a5d5041629433e1c4aa49e4d3281e408542.zip frameworks_av-10640a5d5041629433e1c4aa49e4d3281e408542.tar.gz frameworks_av-10640a5d5041629433e1c4aa49e4d3281e408542.tar.bz2 | |
am 291f824e: Remove active track when thread goes to standby
* commit '291f824e02ff517a34cfe50220b4e2b402ee998d':
Remove active track when thread goes to standby
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 6a35053..76d6447 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -3033,7 +3033,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac (mOutput->stream->get_latency(mOutput->stream)*mSampleRate) / 1000; size_t framesWritten = mBytesWritten / audio_stream_frame_size(&mOutput->stream->common); - if (!track->presentationComplete(framesWritten, audioHALFrames)) { + if (!(mStandby || track->presentationComplete(framesWritten, audioHALFrames))) { // track stays in active list until presentation is complete break; } @@ -3278,7 +3278,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac size_t audioHALFrames = (latency_l() * mSampleRate) / 1000; size_t framesWritten = mBytesWritten / audio_stream_frame_size(&mOutput->stream->common); - if (track->presentationComplete(framesWritten, audioHALFrames)) { + if (mStandby || track->presentationComplete(framesWritten, audioHALFrames)) { if (track->isStopped()) { track->reset(); } @@ -3801,7 +3801,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep size_t audioHALFrames = (latency_l() * mSampleRate) / 1000; size_t framesWritten = mBytesWritten / audio_stream_frame_size(&mOutput->stream->common); - if (track->presentationComplete(framesWritten, audioHALFrames)) { + if (mStandby || track->presentationComplete(framesWritten, audioHALFrames)) { if (track->isStopped()) { track->reset(); } |