commit a6e1ceefc6541065ab4a0eb3692d23ee52fd6161
author Glenn Kasten <gkasten@google.com> Wed Nov 09 19:00:05 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 09 19:00:05 2011 +0000
tree 0b23f698c84dbb1debb266ff196aedc065d29796
parent 0457e7ed94e5293e380c30909085236c7f9aaa0c
parent f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2

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

* commit 'f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2':
  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 bf19040..640e9fa 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -381,7 +381,7 @@
         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;