diff options
| author | Eric Laurent <elaurent@google.com> | 2012-03-06 10:53:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-06 10:53:39 -0800 |
| commit | 6556e5bb99bda64f3ab92e8b540fccdd59e9ed8d (patch) | |
| tree | be047ace7a873144a5927ed52352d3cd57d69bf2 /media/libstagefright/AudioPlayer.cpp | |
| parent | 22f9dd98d9c4c3e0e58586cf6a6008ca6ee946e5 (diff) | |
| parent | db354e58e65592777aa17caa47933e14838b8b35 (diff) | |
| download | frameworks_av-6556e5bb99bda64f3ab92e8b540fccdd59e9ed8d.zip frameworks_av-6556e5bb99bda64f3ab92e8b540fccdd59e9ed8d.tar.gz frameworks_av-6556e5bb99bda64f3ab92e8b540fccdd59e9ed8d.tar.bz2 | |
Merge "MediaPlayerService: fix AudioSink latency"
Diffstat (limited to 'media/libstagefright/AudioPlayer.cpp')
| -rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp index 9427ef7..650b6c4 100644 --- a/media/libstagefright/AudioPlayer.cpp +++ b/media/libstagefright/AudioPlayer.cpp @@ -427,6 +427,12 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) { break; } + if (mAudioSink != NULL) { + mLatencyUs = (int64_t)mAudioSink->latency() * 1000; + } else { + mLatencyUs = (int64_t)mAudioTrack->latency() * 1000; + } + CHECK(mInputBuffer->meta_data()->findInt64( kKeyTime, &mPositionTimeMediaUs)); |