commit a0cf6c4d7d13c73feef5b88760b52b18289b0db2
author Robert Shih <robertshih@google.com> Tue May 05 10:31:48 2015 -0700
committer Robert Shih <robertshih@google.com> Tue May 05 14:23:09 2015 -0700
tree 74823d0bf82b996cfdc22f9c2748ed77411f316f
parent 464c7e085b68dd63ce8cdbb2c389d3827f8d586a

muxer: skip tracks unsupported by MediaMuxer instead of aborting

Bug: 17007397
Change-Id: Id3f3d54a58c76554227e3c103fdbb39422a54496

cmds/stagefright/muxer.cpp

diff --git a/cmds/stagefright/muxer.cpp b/cmds/stagefright/muxer.cpp
index 0029aec..0d04760 100644
--- a/cmds/stagefright/muxer.cpp
+++ b/cmds/stagefright/muxer.cpp
@@ -142,8 +142,13 @@
         CHECK_EQ(err, (status_t)OK);
 
         ssize_t newTrackIndex = muxer->addTrack(format);
-        CHECK_GE(newTrackIndex, 0);
-        trackIndexMap.add(i, newTrackIndex);
+        if (newTrackIndex < 0) {
+            fprintf(stderr, "%s track (%d) unsupported by muxer\n",
+                    isAudio ? "audio" : "video",
+                    i);
+        } else {
+            trackIndexMap.add(i, newTrackIndex);
+        }
     }
 
     int64_t muxerStartTimeUs = ALooper::GetNowUs();
@@ -162,7 +167,12 @@
             ALOGV("saw input eos, err %d", err);
             sawInputEOS = true;
             break;
+        } else if (trackIndexMap.indexOfKey(trackIndex) < 0) {
+            // ALOGV("skipping input from unsupported track %zu", trackIndex);
+            extractor->advance();
+            continue;
         } else {
+            // ALOGV("reading sample from track index %zu\n", trackIndex);
             err = extractor->readSampleData(newBuffer);
             CHECK_EQ(err, (status_t)OK);