diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-10-19 13:22:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-19 13:22:21 -0700 |
| commit | 4687da74717842852009df4787fe041ef8c935ef (patch) | |
| tree | 02bb24719c50b74ec8e1442f2953a77eaaeffcea /services/audioflinger | |
| parent | 09620ff14ab21f002cdf5b25f3d2e755595ba73b (diff) | |
| parent | 424b4a57f5e1e8bd99cb619398389a467ec41f92 (diff) | |
| download | frameworks_av-4687da74717842852009df4787fe041ef8c935ef.zip frameworks_av-4687da74717842852009df4787fe041ef8c935ef.tar.gz frameworks_av-4687da74717842852009df4787fe041ef8c935ef.tar.bz2 | |
am 424b4a57: am 291f824e: Remove active track when thread goes to standby
* commit '424b4a57f5e1e8bd99cb619398389a467ec41f92':
Remove active track when thread goes to standby
Diffstat (limited to 'services/audioflinger')
| -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(); } |