diff options
| author | Eric Laurent <elaurent@google.com> | 2012-05-04 12:55:27 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-05-04 12:55:27 -0700 |
| commit | b48aea123775fb6ec7e6944826fc99da8d8996a5 (patch) | |
| tree | 15449caae182d9110150e829635d5cf143536ec9 /media/libstagefright/AudioPlayer.cpp | |
| parent | ef7f379497199148b5694615e75b3fb2bf666a18 (diff) | |
| download | frameworks_av-b48aea123775fb6ec7e6944826fc99da8d8996a5.zip frameworks_av-b48aea123775fb6ec7e6944826fc99da8d8996a5.tar.gz frameworks_av-b48aea123775fb6ec7e6944826fc99da8d8996a5.tar.bz2 | |
Revert "Merge "Improve AudioPlayer position reporting""
This reverts commit 887c5d2ac34d81bde66dadbd7b2ff07501744778, reversing
changes made to 5aaeb0d64fc98f9b019a4378eb39f0ee49ee6ec4.
Diffstat (limited to 'media/libstagefright/AudioPlayer.cpp')
| -rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
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() { |