diff options
author | Glenn Kasten <gkasten@google.com> | 2014-10-01 23:21:10 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 23:21:10 +0000 |
commit | 03248b02ca1d23dbbbe670d7ed993f0c8dbf9178 (patch) | |
tree | 24f8d49ebbe57af77c152b54ddb246df5c1f4320 /services/audioflinger/Tracks.cpp | |
parent | 17bef6401492d996232b5bc0859529a79834e810 (diff) | |
parent | a49c94ea49c8329a1bdefe980e1f7d335c0d1ec5 (diff) | |
download | frameworks_av-03248b02ca1d23dbbbe670d7ed993f0c8dbf9178.zip frameworks_av-03248b02ca1d23dbbbe670d7ed993f0c8dbf9178.tar.gz frameworks_av-03248b02ca1d23dbbbe670d7ed993f0c8dbf9178.tar.bz2 |
am a49c94ea: Merge "Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"" into lmp-dev
* commit 'a49c94ea49c8329a1bdefe980e1f7d335c0d1ec5':
Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"
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 b2d53cf..75190f3 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -898,15 +898,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; |