Revert "Fix NuPlayer::Decoder input buffer loss upon seamless format change"
This reverts commit c5eef08195a6f81c2ae8fe7d4c346f12b15944e5.
Change-Id: I49d817ed367aaa29a93e22135e9adf1e2ad253f1
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
index 33378db..5d98d98 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
@@ -602,11 +602,11 @@
// output queue, and handles it in renderer instead.
rememberCodecSpecificData(newFormat);
onFlush(false /* notifyComplete */);
- continue;
+ err = OK;
} else if (seamlessFormatChange) {
// reuse existing decoder and don't flush
rememberCodecSpecificData(newFormat);
- continue;
+ err = OK;
} else {
// This stream is unaffected by the discontinuity
return -EWOULDBLOCK;
@@ -696,7 +696,10 @@
int32_t streamErr = ERROR_END_OF_STREAM;
CHECK(msg->findInt32("err", &streamErr) || !hasBuffer);
- CHECK(streamErr != OK);
+ if (streamErr == OK) {
+ /* buffers are returned to hold on to */
+ return true;
+ }
// attempt to queue EOS
status_t err = mCodec->queueInputBuffer(