stagefright-plugins: Wait for reader shutdown on EOS

 * Source will flag EOS but we need to stick around during gapless
   playback, otherwise the extractor aborts early and can confuse
   apps.
 * Fixes gapless transitions during FLAC playback with Tidal.

Change-Id: Icbdaa180d39d626b163089f5686b7a1e4afcfbc2

diff --git a/extractor/FFmpegExtractor.cpp b/extractor/FFmpegExtractor.cpp
index c8a4799..d881209 100644 (file)
--- a/extractor/FFmpegExtractor.cpp
+++ b/extractor/FFmpegExtractor.cpp
@@ -1205,7 +1205,8 @@ void FFmpegExtractor::readerEntry() {
         if (ret < 0) {
             mEOF = true;
             eof = true;
-            if (mFormatCtx->pb && mFormatCtx->pb->error) {
+            if (mFormatCtx->pb && mFormatCtx->pb->error &&
+                    mFormatCtx->pb->error != ERROR_END_OF_STREAM) {
                 ALOGE("mFormatCtx->pb->error: %d", mFormatCtx->pb->error);
                 break;
             }