diff options
| author | Eric Laurent <elaurent@google.com> | 2014-03-05 23:47:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-05 23:47:17 +0000 |
| commit | 4f4c9a22f4676c65bcae77f0805dcd699b3ba475 (patch) | |
| tree | 4e7e9f1ab7238a965949fec8ea62a28d4e7ae8ec /services | |
| parent | c7753b12a9c8c1cba69ba75bccc0083c37bc67f1 (diff) | |
| parent | 281dd4e13309973dbb85bce531f884237e0d8fb0 (diff) | |
| download | frameworks_av-4f4c9a22f4676c65bcae77f0805dcd699b3ba475.zip frameworks_av-4f4c9a22f4676c65bcae77f0805dcd699b3ba475.tar.gz frameworks_av-4f4c9a22f4676c65bcae77f0805dcd699b3ba475.tar.bz2 | |
am 281dd4e1: audioflinger: fix static track end detection
* commit '281dd4e13309973dbb85bce531f884237e0d8fb0':
audioflinger: fix static track end detection
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 14629de..3d657b3 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -3038,15 +3038,8 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac (mMixerStatusIgnoringFastTracks == MIXER_TRACKS_READY)) { minFrames = desiredFrames; } - // It's not safe to call framesReady() for a static buffer track, so assume it's ready - size_t framesReady; - if (track->sharedBuffer() == 0) { - framesReady = track->framesReady(); - } else if (track->isStopped()) { - framesReady = 0; - } else { - framesReady = 1; - } + + size_t framesReady = track->framesReady(); if ((framesReady >= minFrames) && track->isReady() && !track->isPaused() && !track->isTerminated()) { |