diff options
author | Eric Laurent <elaurent@google.com> | 2015-09-09 20:07:32 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-09 20:07:32 +0000 |
commit | f30fd8000153d7320f9c45b7d116d26d7f029d01 (patch) | |
tree | 6bb1fc692bdcce57dee94ce193f38e0cec1e66b2 /services | |
parent | a84bbe6b59721b1b963d65d270aa98d6513bbb78 (diff) | |
parent | 564d144fc28917d42e3a67718ac51d61bfc36315 (diff) | |
download | frameworks_av-f30fd8000153d7320f9c45b7d116d26d7f029d01.zip frameworks_av-f30fd8000153d7320f9c45b7d116d26d7f029d01.tar.gz frameworks_av-f30fd8000153d7320f9c45b7d116d26d7f029d01.tar.bz2 |
Merge "Revert "Do not acknowledge flush() on start() for static tracks"" into mnc-dr-dev
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/Tracks.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index d058255..f7da209 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -712,12 +712,9 @@ status_t AudioFlinger::PlaybackThread::Track::start(AudioSystem::sync_event_t ev // But in this case we know the mixer thread (whether normal mixer or fast mixer) // isn't looking at this track yet: we still hold the normal mixer thread lock, // and for fast tracks the track is not yet in the fast mixer thread's active set. - // TODO: remove race condition on stop() followed by start(). - if (mSharedBuffer == 0) { // only streaming tracks use flush(). - ServerProxy::Buffer buffer; - buffer.mFrameCount = 1; - (void) mAudioTrackServerProxy->obtainBuffer(&buffer, true /*ackFlush*/); - } + ServerProxy::Buffer buffer; + buffer.mFrameCount = 1; + (void) mAudioTrackServerProxy->obtainBuffer(&buffer, true /*ackFlush*/); } } else { status = BAD_VALUE; |