From b48aea123775fb6ec7e6944826fc99da8d8996a5 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 4 May 2012 12:55:27 -0700 Subject: Revert "Merge "Improve AudioPlayer position reporting"" This reverts commit 887c5d2ac34d81bde66dadbd7b2ff07501744778, reversing changes made to 5aaeb0d64fc98f9b019a4378eb39f0ee49ee6ec4. --- media/libstagefright/AudioPlayer.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to '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 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) { 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::getRealTimeUs() { 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() { -- cgit v1.1