Merge "Fix CTS tests" into rvc-dev am: 881b688f68 (2402bf11) · Commits · e / os / android_frameworks_base

apex/media/framework/java/android/media/MediaParser.java

+25 −21

Original line number	Diff line number	Diff line
		@@ -700,11 +700,14 @@ public final class MediaParser {
		mDataSource.mInputReader = seekableInputReader;

		// TODO: Apply parameters when creating extractor instances.
		if (mExtractor == null) {
		if (mExtractorName != null) {
		mExtractor = EXTRACTOR_FACTORIES_BY_NAME.get(mExtractorName).createInstance();
		} else if (mExtractor == null) {
		mExtractor.init(new ExtractorOutputAdapter());
		} else {
		for (String parserName : mParserNamesPool) {
		Extractor extractor = EXTRACTOR_FACTORIES_BY_NAME.get(parserName).createInstance();
		Extractor extractor =
		EXTRACTOR_FACTORIES_BY_NAME.get(parserName).createInstance();
		try {
		if (extractor.sniff(mExtractorInput)) {
		mExtractorName = parserName;
		@@ -725,6 +728,7 @@ public final class MediaParser {
		}
		return true;
		}
		}

		if (isPendingSeek()) {
		mExtractor.seek(mPendingSeekPosition, mPendingSeekTimeUs);