commit f444964c1cbb46af5b0acfea684f3b718ce8cb9c
author Marco Nelissen <marcone@google.com> Thu Sep 01 13:12:24 2016 -0700
committer Marco Nelissen <marcone@google.com> Fri Sep 15 10:41:18 2017 -0700
tree e4f4dfa2d091f80bb4d98be07fce24bea66209e0
parent 50a6f88bc3cea96152ccf56e85a743be14aa39b0

Don't CHECK if the source can't be started

Bug: 19779574
Bug: 31156921
Bug: 23270724
Change-Id: I770619949ed211dab301ee3da10069d319279715

media/libstagefright/NuMediaExtractor.cpp

diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp
index 55c1bc8..4558b3c 100644
--- a/media/libstagefright/NuMediaExtractor.cpp
+++ b/media/libstagefright/NuMediaExtractor.cpp
@@ -305,7 +305,10 @@
 
     sp<IMediaSource> source = mImpl->getTrack(index);
 
-    CHECK_EQ((status_t)OK, source->start());
+    status_t ret = source->start();
+    if (ret != OK) {
+        return ret;
+    }
 
     mSelectedTracks.push();
     TrackInfo *info = &mSelectedTracks.editItemAt(mSelectedTracks.size() - 1);