commit c80863e922cb94122b783ef31ce18cf58471f546
author Wei Jia <wjia@google.com> Thu Aug 07 16:52:10 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 06 23:54:36 2014 +0000
tree cbcd7579bbea161c7a8d65cdeac9f3acf4c32683
parent 7f04ec2a4ec94ada7ef89db8c50fd1e5c3a93a3b
parent 5e78d66badd543bc9587eed74128bca47df40d70

Merge "Revert "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 d56b1f0..ba6fb7d 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1198,11 +1198,11 @@
     sp<AMessage> reply;
     CHECK(msg->findMessage("reply", &reply));
 
-    if ((audio && mFlushingAudio != NONE
-                && mFlushingAudio != AWAITING_DISCONTINUITY)
-            || (!audio && mFlushingVideo != NONE
-                       && mFlushingVideo != AWAITING_DISCONTINUITY)) {
-        return -EWOULDBLOCK;
+    if ((audio && IsFlushingState(mFlushingAudio))
+            || (!audio && IsFlushingState(mFlushingVideo))) {
+        reply->setInt32("err", INFO_DISCONTINUITY);
+        reply->post();
+        return OK;
     }
 
     sp<ABuffer> accessUnit;