diff options
author | Glenn Kasten <gkasten@google.com> | 2014-10-01 02:11:39 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 02:11:39 +0000 |
commit | 785da8f542120e49d29289947e69aba180c1724b (patch) | |
tree | 72882af2eaa0ced5a80bf13795ab408640266114 /services/audioflinger/Tracks.cpp | |
parent | 6e871139d0301cebc677821d49b6901bc204cb96 (diff) | |
parent | 955e24d3a8e218d4711cabc6558781e095011132 (diff) | |
download | frameworks_av-785da8f542120e49d29289947e69aba180c1724b.zip frameworks_av-785da8f542120e49d29289947e69aba180c1724b.tar.gz frameworks_av-785da8f542120e49d29289947e69aba180c1724b.tar.bz2 |
am 955e24d3: Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" into lmp-dev
* commit '955e24d3a8e218d4711cabc6558781e095011132':
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, 9 insertions, 1 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 75190f3..b2d53cf 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -898,7 +898,15 @@ status_t AudioFlinger::PlaybackThread::Track::getTimestamp(AudioTimestamp& times uint32_t unpresentedFrames = ((int64_t) playbackThread->mLatchQ.mUnpresentedFrames * mSampleRate) / playbackThread->mSampleRate; - uint32_t framesWritten = mAudioTrackServerProxy->framesReleased(); + // 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(); bool checkPreviousTimestamp = mPreviousValid && framesWritten >= mPreviousFramesWritten; if (framesWritten < unpresentedFrames) { mPreviousValid = false; |