commit 1cbe62c82a8bfdb18a5bb79de57252dbd378445c
author Wei Jia <wjia@google.com> Thu Mar 30 17:57:02 2017 -0700
committer Wei Jia <wjia@google.com> Sun Apr 02 01:02:00 2017 +0000
tree 13379a463ac11808ee9084d2760d5c37542bbf69
parent 32efa2fd44f9ac834771663cd9fe2fcc5f5ec2f8

NuPlayer: handle source error correctly.

Test: source error is sent to app.
Bug: 35025627
Change-Id: I668bab0de20cf24def028a6a467efceaed54af2b
(cherry picked from commit 231fd353518502e3a05021473ae60e7addd9a46c)

media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
index cb668e4..9a4bc8c 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
@@ -294,6 +294,9 @@
             return;
         }
 
+        if (streamErr != ERROR_END_OF_STREAM) {
+            handleError(streamErr);
+        }
         mReachedEOS = true;
         if (mRenderer != NULL) {
             mRenderer->queueEOS(true /* audio */, ERROR_END_OF_STREAM);

media/libstagefright/MP3Extractor.cpp

diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp
index 82e7a26..22df522 100644
--- a/media/libstagefright/MP3Extractor.cpp
+++ b/media/libstagefright/MP3Extractor.cpp
@@ -538,7 +538,7 @@
             buffer->release();
             buffer = NULL;
 
-            return ERROR_END_OF_STREAM;
+            return (n < 0 ? n : ERROR_END_OF_STREAM);
         }
 
         uint32_t header = U32_AT((const uint8_t *)buffer->data());
@@ -582,7 +582,7 @@
         buffer->release();
         buffer = NULL;
 
-        return ERROR_END_OF_STREAM;
+        return (n < 0 ? n : ERROR_END_OF_STREAM);
     }
 
     buffer->set_range(0, frame_size);