Merge "Bug 5478024 drop after decode if can't drop before" into ics-mr0

gkasten · Android (Google) Code Review · commit 19998120f53c · 2011-11-08T17:31:32.000-08:00
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ void NuPlayer::Renderer::onDrainVideoQueue() {`
`379`	`379`	`LOGV("rendering video at media time %.2f secs", mediaTimeUs / 1E6);`
`380`	`380`	`}`
`381`	`381`
`382`		`- entry->mNotifyConsumed->setInt32("render", true);`
	`382`	`+ entry->mNotifyConsumed->setInt32("render", !tooLate);`
`383`	`383`	`entry->mNotifyConsumed->post();`
`384`	`384`	`mVideoQueue.erase(mVideoQueue.begin());`
`385`	`385`	`entry = NULL;`