diff options
| author | Eric Laurent <elaurent@google.com> | 2014-01-31 00:58:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-31 00:58:30 +0000 |
| commit | b447379e2ea1c9ca4cd543ac183df70567d40485 (patch) | |
| tree | 957722049d481d2f6f458dd7f0531113dd45c8d6 | |
| parent | 60181e360e1c6240d70a3b365b78f8ff28b31493 (diff) | |
| parent | 745e9a8283b56c7772ee7d72383a3f2e012e1ef9 (diff) | |
| download | frameworks_av-b447379e2ea1c9ca4cd543ac183df70567d40485.zip frameworks_av-b447379e2ea1c9ca4cd543ac183df70567d40485.tar.gz frameworks_av-b447379e2ea1c9ca4cd543ac183df70567d40485.tar.bz2 | |
Merge "audioflinger: fix static track end detection"
| -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 2f71db7..73429ec 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -3036,15 +3036,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()) { |