commit e46711343b43786c049a007369a72c1c78e6c5db
author Wei Jia <wjia@google.com> Tue Aug 05 21:53:08 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 05 00:34:22 2014 +0000
tree dc3e0d4fd6c340fd482faa7008e91067a4af2d3d
parent b15486f973f80063ae2d436f7d71667b592c6fc9
parent 69a85b792c31033a99c8858e3b1a3c2ea68b6278

Merge "NuPlayer: don't feed decoder input data during flushing." into lmp-dev

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 0a59b2e..17038a4 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1180,11 +1180,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;