diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-11-09 16:41:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-09 16:41:19 +0000 |
| commit | b5d340314ac6da461f15fe4d1db996ae28770d67 (patch) | |
| tree | cf6832c7d73a0ecf7237880dc2401ce5f4738fc9 /media | |
| parent | a47b69c6f7c6fe0044ebcb2d0790ce3548de56fd (diff) | |
| parent | 683525b61bc1b58b4fd9e1b3ef9ed3b0c3bf34ae (diff) | |
| download | frameworks_av-b5d340314ac6da461f15fe4d1db996ae28770d67.zip frameworks_av-b5d340314ac6da461f15fe4d1db996ae28770d67.tar.gz frameworks_av-b5d340314ac6da461f15fe4d1db996ae28770d67.tar.bz2 | |
am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '19998120f53caceb620f138c6eea182f1e693660':
Bug 5478024 drop after decode if can't drop before
Diffstat (limited to 'media')
| -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 bf19040..640e9fa 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -381,7 +381,7 @@ void NuPlayer::Renderer::onDrainVideoQueue() { LOGV("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; |