commit fc52dd88e4d2f433feba5d5aaff1880659d46319
author Eric Laurent <elaurent@google.com> Fri May 04 15:22:37 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 04 15:22:37 2012 -0700
tree 81ecfa9eed697280b32fa657ddcd2432899c834c
parent 9dc4c66f36ca0158b470c78b0929cd9dd929a375
parent b48aea123775fb6ec7e6944826fc99da8d8996a5

Merge "Revert "Merge "Improve AudioPlayer position reporting""" into jb-dev

media/libstagefright/AudioPlayer.cpp

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