muxer: skip tracks unsupported by MediaMuxer instead of aborting (a0cf6c4d) · Commits · e / os / android_frameworks_av

cmds/stagefright/muxer.cpp

+12 −2

Original line number	Diff line number	Diff line
		@@ -142,9 +142,14 @@ static int muxing(
		CHECK_EQ(err, (status_t)OK);

		ssize_t newTrackIndex = muxer->addTrack(format);
		CHECK_GE(newTrackIndex, 0);
		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 @@ static int muxing(
		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);