commit b4a96805d69b1f6281ece568b07927da2dd50872
author JP Abgrall <jpa@google.com> Wed Nov 09 14:36:09 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 09 14:36:09 2011 +0000
tree f00db2e612adce63630532761e75476a85cdef6f
parent 8e2c51137cdd1917d36c3a78ff6c1a42cc8ea402
parent bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad

Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp

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;