diff options
| author | Marco Nelissen <marcone@google.com> | 2014-01-17 11:19:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-17 11:19:49 -0800 |
| commit | fd0daeb3fd20ba1c0a0fae530ea263e382a811e5 (patch) | |
| tree | c3086b6fd843643df992471390c686f622154745 /media | |
| parent | cbf9e91a5ab186904d3dad21eae416c23ee13668 (diff) | |
| parent | 4cc4794029998b21a1689794cd5bcbd5e4480ef6 (diff) | |
| download | frameworks_av-fd0daeb3fd20ba1c0a0fae530ea263e382a811e5.zip frameworks_av-fd0daeb3fd20ba1c0a0fae530ea263e382a811e5.tar.gz frameworks_av-fd0daeb3fd20ba1c0a0fae530ea263e382a811e5.tar.bz2 | |
am 4cc47940: Merge "Fix compile error in NuPlayerRenderer debug print"
* commit '4cc4794029998b21a1689794cd5bcbd5e4480ef6':
Fix compile error in NuPlayerRenderer debug print
Diffstat (limited to 'media')
| -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); } |