diff options
author | Glenn Kasten <gkasten@google.com> | 2014-10-01 22:38:43 +0000 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2014-10-01 22:45:18 +0000 |
commit | 6954127b7ace022677ac407ff943c2793f8a11be (patch) | |
tree | 3e038561671d256e03d63fb88a32e529e198701a /services/audioflinger/Tracks.cpp | |
parent | 54464ba861aaafd11ee5645f5d1ecd1171c6e9fe (diff) | |
download | frameworks_av-6954127b7ace022677ac407ff943c2793f8a11be.zip frameworks_av-6954127b7ace022677ac407ff943c2793f8a11be.tar.gz frameworks_av-6954127b7ace022677ac407ff943c2793f8a11be.tar.bz2 |
Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"
This reverts commit 54464ba861aaafd11ee5645f5d1ecd1171c6e9fe.
Bug: 17733142.
Change-Id: I9886d40032b2f7d96bee03e600e14f78943d8052
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
-rw-r--r-- | services/audioflinger/Tracks.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 8c2bee4..c0a75b9 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -894,15 +894,7 @@ status_t AudioFlinger::PlaybackThread::Track::getTimestamp(AudioTimestamp& times uint32_t unpresentedFrames = ((int64_t) playbackThread->mLatchQ.mUnpresentedFrames * mSampleRate) / playbackThread->mSampleRate; - // FIXME Since we're using a raw pointer as the key, it is theoretically possible - // for a brand new track to share the same address as a recently destroyed - // track, and thus for us to get the frames released of the wrong track. - // It is unlikely that we would be able to call getTimestamp() so quickly - // right after creating a new track. Nevertheless, the index here should - // be changed to something that is unique. Or use a completely different strategy. - ssize_t i = playbackThread->mLatchQ.mFramesReleased.indexOfKey(this); - uint32_t framesWritten = i >= 0 ? - playbackThread->mLatchQ.mFramesReleased[i] : mAudioTrackServerProxy->framesReleased(); + uint32_t framesWritten = mAudioTrackServerProxy->framesReleased(); bool checkPreviousTimestamp = mPreviousValid && framesWritten >= mPreviousFramesWritten; if (framesWritten < unpresentedFrames) { mPreviousValid = false; |