commit db978bbb76431a78aa7d40241251f12acfc298e7
author Marco Nelissen <marcone@google.com> Thu Jan 10 08:20:36 2019 -0800
committer Marco Nelissen <marcone@google.com> Thu Jan 10 10:13:23 2019 -0800
tree 047f3fdb9a1b4dd3aa7507d65de03cc9457c18ae
parent 35288162c7fcece56f43c1b1862636b02e6c51b0

Fix end-of-stream handling in OggExtractor

Bug: 122496376
Test: CTS
Change-Id: Ied78ce1fbd26e8303cc1772858d31e04765904df

media/extractors/ogg/OggExtractor.cpp

diff --git a/media/extractors/ogg/OggExtractor.cpp b/media/extractors/ogg/OggExtractor.cpp
index c3914f1..5abe039 100644
--- a/media/extractors/ogg/OggExtractor.cpp
+++ b/media/extractors/ogg/OggExtractor.cpp
@@ -872,7 +872,7 @@
 
             ALOGV("readPage returned %zd", n);
 
-            return n < 0 ? (media_status_t) n : AMEDIA_ERROR_END_OF_STREAM;
+            return n == ERROR_END_OF_STREAM ? AMEDIA_ERROR_END_OF_STREAM : AMEDIA_ERROR_UNKNOWN;
         }
 
         // Prevent a harmless unsigned integer overflow by clamping to 0