diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-11-09 21:19:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-09 21:19:00 +0000 |
| commit | fa1e6f99cd4f2e23e23dbbb1fd43041fcd32fe9e (patch) | |
| tree | 172888e8812d41d54169efe2dcb5cd90b79adf26 /media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | |
| parent | 471af5aaea2d2491a77dba379771f7c96b9ca3c3 (diff) | |
| parent | 32f0a8c022fa733aa721c607df330a5d4a0a1b32 (diff) | |
| download | frameworks_av-fa1e6f99cd4f2e23e23dbbb1fd43041fcd32fe9e.zip frameworks_av-fa1e6f99cd4f2e23e23dbbb1fd43041fcd32fe9e.tar.gz frameworks_av-fa1e6f99cd4f2e23e23dbbb1fd43041fcd32fe9e.tar.bz2 | |
am bb1b7d5c: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0
* commit 'bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad':
Bug 5478024 drop after decode if can't drop before
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index 4995846..1731728 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -381,7 +381,7 @@ void NuPlayer::Renderer::onDrainVideoQueue() { ALOGV("rendering video at media time %.2f secs", mediaTimeUs / 1E6); } - entry->mNotifyConsumed->setInt32("render", true); + entry->mNotifyConsumed->setInt32("render", !tooLate); entry->mNotifyConsumed->post(); mVideoQueue.erase(mVideoQueue.begin()); entry = NULL; |