commit fa1e6f99cd4f2e23e23dbbb1fd43041fcd32fe9e
author Glenn Kasten <gkasten@google.com> Wed Nov 09 21:19:00 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 09 21:19:00 2011 +0000
tree 172888e8812d41d54169efe2dcb5cd90b79adf26
parent 471af5aaea2d2491a77dba379771f7c96b9ca3c3
parent 32f0a8c022fa733aa721c607df330a5d4a0a1b32

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

* commit 'bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad':
  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;