summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-11-08 17:31:32 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-08 17:31:32 -0800
commit19998120f53caceb620f138c6eea182f1e693660 (patch)
tree523fa5ba57dc953dc22dff0a5d1be7819fb32697
parentfee5f29b22f99bd2891fb2af54669f20832fb851 (diff)
parentf330986fa843c22304e1cfc42e55a050a7bfe556 (diff)
downloadframeworks_base-19998120f53caceb620f138c6eea182f1e693660.zip
frameworks_base-19998120f53caceb620f138c6eea182f1e693660.tar.gz
frameworks_base-19998120f53caceb620f138c6eea182f1e693660.tar.bz2
Merge "Bug 5478024 drop after decode if can't drop before" into ics-mr0
-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 07e347e..61a7ba4 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -379,7 +379,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;