diff options
| author | Eric Laurent <elaurent@google.com> | 2014-01-07 02:06:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-07 02:06:07 +0000 |
| commit | 67d15f9ab45e7c03b23c871f680b1fae577ac43a (patch) | |
| tree | dc29ec79dbbb71429ac5d431b5b20d9aa927b380 | |
| parent | cbfff7b3bb8166dd6a95d6974baa1fc8312ca17f (diff) | |
| parent | 13e4c960ea3db03a43e084fbd85d52aa77f7b871 (diff) | |
| download | frameworks_av-67d15f9ab45e7c03b23c871f680b1fae577ac43a.zip frameworks_av-67d15f9ab45e7c03b23c871f680b1fae577ac43a.tar.gz frameworks_av-67d15f9ab45e7c03b23c871f680b1fae577ac43a.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 35b8575..01b90a8 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -3047,15 +3047,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()) { |