diff options
| author | Marco Nelissen <marcone@google.com> | 2014-01-17 20:11:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-17 20:11:41 +0000 |
| commit | 8b567a219c3c7673d0b17e2a4da7e9ac4e984c3c (patch) | |
| tree | 6164dc629c28f24af2cb84861976be127ff7724b /media/libmediaplayerservice | |
| parent | 543140eb709a07bc386eb5f667a4a72e31dba56c (diff) | |
| parent | fea77cb3c22dcb691f44b939c626ae3070212b73 (diff) | |
| download | frameworks_av-8b567a219c3c7673d0b17e2a4da7e9ac4e984c3c.zip frameworks_av-8b567a219c3c7673d0b17e2a4da7e9ac4e984c3c.tar.gz frameworks_av-8b567a219c3c7673d0b17e2a4da7e9ac4e984c3c.tar.bz2 | |
am fea77cb3: am fd0daeb3: am 4cc47940: Merge "Fix compile error in NuPlayerRenderer debug print"
* commit 'fea77cb3c22dcb691f44b939c626ae3070212b73':
Fix compile error in NuPlayerRenderer debug print
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index 92b9a92..bf5271e 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -422,7 +422,9 @@ void NuPlayer::Renderer::onDrainVideoQueue() { ALOGV("video late by %lld us (%.2f secs)", mVideoLateByUs, mVideoLateByUs / 1E6); } else { - ALOGV("rendering video at media time %.2f secs", mediaTimeUs / 1E6); + ALOGV("rendering video at media time %.2f secs", + (mFlags & FLAG_REAL_TIME ? realTimeUs : + (realTimeUs + mAnchorTimeMediaUs - mAnchorTimeRealUs)) / 1E6); if (mSoftRenderer != NULL) { mSoftRenderer->render(entry->mBuffer->data(), entry->mBuffer->size(), NULL); } |