summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-11-09 16:41:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-09 16:41:19 +0000
commitf2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2 (patch)
treeea639f688e5a2951159124bea2a93146b93c8762 /media/libmediaplayerservice/nuplayer
parent9c5c97f61818f4d20079616a98d62f888f07d285 (diff)
parent19998120f53caceb620f138c6eea182f1e693660 (diff)
downloadframeworks_base-f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2.zip
frameworks_base-f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2.tar.gz
frameworks_base-f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2.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/libmediaplayerservice/nuplayer')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp2
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;