Merge "Previous change broke A/V sync, this is a better change to eliminate negative media positions."

2010-02-03 15:41:23 -08:00
parent 348f7b9048 065f69ef53
commit bca1c65fe4
1 changed files with 7 additions and 3 deletions
--- a/media/libstagefright/AudioPlayer.cpp
+++ b/media/libstagefright/AudioPlayer.cpp
@@ -252,8 +252,7 @@ void AudioPlayer::fillBuffer(void *data, size_t size) {
                        kKeyTime, &mPositionTimeMediaUs));

            mPositionTimeRealUs =
-                -mLatencyUs
-                + ((mNumFramesPlayed + size_done / mFrameSize) * 1000000)
+                ((mNumFramesPlayed + size_done / mFrameSize) * 1000000)
                    / mSampleRate;

            LOGV("buffer->size() = %d, "
@@ -305,7 +304,12 @@ int64_t AudioPlayer::getMediaTimeUs() {
        return 0;
    }

-    return mPositionTimeMediaUs + (getRealTimeUsLocked() - mPositionTimeRealUs);
+    int64_t realTimeOffset = getRealTimeUsLocked() - mPositionTimeRealUs;
+    if (realTimeOffset < 0) {
+        realTimeOffset = 0;
+    }
+
+    return mPositionTimeMediaUs + realTimeOffset;
 }

 bool AudioPlayer::getMediaTimeMapping(