am 12d0cd1b: am 3a8bad2e: am be9ebd46: Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" into lmp-dev

* commit '12d0cd1bf756ec96755fae2e573659898bfba6d6':
  Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp

1 files changed, 10 insertions, 1 deletions

diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index 8793f4a..7d8d4c8 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -899,7 +899,16 @@ 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;