commit 137266978bc08cbd147ad46c23aa26a7fe64f0f7
author Glenn Kasten <gkasten@google.com> Wed Nov 09 21:22:00 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 09 21:22:00 2011 +0000
tree 873e4e503a46f4911a9e1f09bfc09df1deac40f0
parent 101360f7813479aa4f2e8188917d1bc6d09c40f6
parent 714211068e77507baf227fad86ad88b9248b9236

am 71421106: am bb1b7d5c: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0

* commit '714211068e77507baf227fad86ad88b9248b9236':
  Bug 5478024 drop after decode if can't drop before

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

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 @@
         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;