diff options
| -rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp index 31157ceae5a8..e7351dcbf926 100644 --- 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( |