From 69a85b792c31033a99c8858e3b1a3c2ea68b6278 Mon Sep 17 00:00:00 2001
From: Wei Jia <wjia@google.com>
Date: Mon, 4 Aug 2014 18:32:43 -0700
Subject: [PATCH] NuPlayer: don't feed decoder input data during flushing.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Change-Id: I7c258b986ae711357bd7e636b79853f8f3959d32
---
 media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 58d0138cc8..0e015b0534 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1169,11 +1169,11 @@ status_t NuPlayer::feedDecoderInputData(bool audio, const sp<AMessage> &msg) {
     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;
-- 
2.11.0