commit 8fb0a5ffbe2aa71b13e35882e1ad73a6c2ef9031
author Marco Nelissen <marcone@google.com> Fri Mar 09 12:36:17 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 12:36:17 2012 -0800
tree b887ee19d29e2e0f634c74d7299f7c275c689fff
parent 2bff6407793917d69653542a73525a72a53dd6cc
parent 1eb0e4a26059f2fe9bd353f04d1b646edbf38473

Merge "Improve AudioPlayer position reporting"

media/libstagefright/AudioPlayer.cpp

diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp
index 650b6c4..2b3cb1a 100644
--- a/media/libstagefright/AudioPlayer.cpp
+++ b/media/libstagefright/AudioPlayer.cpp
@@ -437,8 +437,11 @@
                         kKeyTime, &mPositionTimeMediaUs));
 
             mPositionTimeRealUs =
-                ((mNumFramesPlayed + size_done / mFrameSize) * 1000000)
+                -mLatencyUs + ((mNumFramesPlayed + size_done / mFrameSize) * 1000000)
                     / mSampleRate;
+            if (mPositionTimeRealUs < 0) {
+                mPositionTimeRealUs = 0;
+            }
 
             ALOGV("buffer->size() = %d, "
                  "mPositionTimeMediaUs=%.2f mPositionTimeRealUs=%.2f",
@@ -493,7 +496,9 @@
 int64_t AudioPlayer::getRealTimeUsLocked() const {
     CHECK(mStarted);
     CHECK_NE(mSampleRate, 0);
-    return -mLatencyUs + (mNumFramesPlayed * 1000000) / mSampleRate;
+    int64_t t = -mLatencyUs + (mNumFramesPlayed * 1000000) / mSampleRate;
+    if (t < 0) return 0;
+    return t;
 }
 
 int64_t AudioPlayer::getMediaTimeUs() {