commit 70452261b0ed8e47676641ee5cc546dc5f8333ba
author Robert Shih <robertshih@google.com> Fri Sep 16 16:43:49 2016 -0700
committer Robert Shih <robertshih@google.com> Fri Sep 16 16:46:37 2016 -0700
tree 72f75379a3098f802ab38e2718197e87da6fd31d
parent a1d7f8aab76a4560fa8127db3320c8394bf3da6f

NdkMediaExtractor: fix advance return value

Bug: 31438605
Change-Id: I7424d8fca01818d67a6968700912182a281a61dc

media/ndk/NdkMediaExtractor.cpp

diff --git a/media/ndk/NdkMediaExtractor.cpp b/media/ndk/NdkMediaExtractor.cpp
index face727..89f2d9c 100644
--- a/media/ndk/NdkMediaExtractor.cpp
+++ b/media/ndk/NdkMediaExtractor.cpp
@@ -148,7 +148,14 @@
 EXPORT
 bool AMediaExtractor_advance(AMediaExtractor *mData) {
     //ALOGV("advance");
-    return mData->mImpl->advance();
+    status_t err = mData->mImpl->advance();
+    if (err == ERROR_END_OF_STREAM) {
+        return false;
+    } else if (err != OK) {
+        ALOGE("sf error code: %d", err);
+        return false;
+    }
+    return true;
 }
 
 EXPORT