commit 69a85b792c31033a99c8858e3b1a3c2ea68b6278
author Wei Jia <wjia@google.com> Mon Aug 04 18:32:43 2014 -0700
committer Wei Jia <wjia@google.com> Tue Aug 05 14:45:33 2014 -0700
tree 94cf65c46392c04271e06cfa9e136069e3586130
parent d0fded31e473e909c018f534d3019fb5168bdcd6

NuPlayer: don't feed decoder input data during flushing.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Change-Id: I7c258b986ae711357bd7e636b79853f8f3959d32

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 58d0138..0e015b0 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1169,11 +1169,11 @@
     sp<AMessage> reply;
     CHECK(msg->findMessage("reply", &reply));
 
-    if ((audio && IsFlushingState(mFlushingAudio))
-            || (!audio && IsFlushingState(mFlushingVideo))) {
-        reply->setInt32("err", INFO_DISCONTINUITY);
-        reply->post();
-        return OK;
+    if ((audio && mFlushingAudio != NONE
+                && mFlushingAudio != AWAITING_DISCONTINUITY)
+            || (!audio && mFlushingVideo != NONE
+                       && mFlushingVideo != AWAITING_DISCONTINUITY)) {
+        return -EWOULDBLOCK;
     }
 
     sp<ABuffer> accessUnit;