commit 6db5763b0cc771278d3ee8ef1bcad945d6d2c430
author Marco Nelissen <marcone@google.com> Thu Sep 01 13:12:24 2016 -0700
committer Marco Nelissen <marcone@google.com> Thu Sep 01 13:12:24 2016 -0700
tree aab0edf2403c67c9dd20dbf1c543d1b711236a49
parent 7b960a5dc58cfcbb3ef5ac05c93549edf954e5d0

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

Bug: 19779574
Bug: 31156921
Change-Id: I770619949ed211dab301ee3da10069d319279715

media/libstagefright/NuMediaExtractor.cpp

diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp
index a669dca..276d731 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);