Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix CTS tests" into rvc-dev am: 881b688f68

Browse Source 
Change-Id: I7d588274ab732da753d3204233a4f9e8fbae1af0
This commit is contained in:
Automerger Merge Worker
2020-02-28 15:07:05 +00:00
parent 515725a66f 881b688f68
commit 2402bf11fd
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
apex/media/framework/java/android/media/MediaParser.java
View File

@@ -700,30 +700,34 @@ public final class MediaParser {
mDataSource.mInputReader = seekableInputReader; mDataSource.mInputReader = seekableInputReader;
// TODO: Apply parameters when creating extractor instances. // TODO: Apply parameters when creating extractor instances.
if (mExtractorName != null) { if (mExtractor == null) {
mExtractor = EXTRACTOR_FACTORIES_BY_NAME.get(mExtractorName).createInstance(); if (mExtractorName != null) {
} else if (mExtractor == null) { mExtractor = EXTRACTOR_FACTORIES_BY_NAME.get(mExtractorName).createInstance();
for (String parserName : mParserNamesPool) { mExtractor.init(new ExtractorOutputAdapter());
Extractor extractor = EXTRACTOR_FACTORIES_BY_NAME.get(parserName).createInstance(); } else {
try { for (String parserName : mParserNamesPool) {
if (extractor.sniff(mExtractorInput)) { Extractor extractor =
mExtractorName = parserName; EXTRACTOR_FACTORIES_BY_NAME.get(parserName).createInstance();
mExtractor = extractor; try {
mExtractor.init(new ExtractorOutputAdapter()); if (extractor.sniff(mExtractorInput)) {
break; mExtractorName = parserName;
mExtractor = extractor;
mExtractor.init(new ExtractorOutputAdapter());
break;
}
} catch (EOFException e) {
// Do nothing.
} catch (IOException | InterruptedException e) {
throw new IllegalStateException(e);
} finally {
mExtractorInput.resetPeekPosition();
} }
} catch (EOFException e) {
// Do nothing.
} catch (IOException | InterruptedException e) {
throw new IllegalStateException(e);
} finally {
mExtractorInput.resetPeekPosition();
} }
if (mExtractor == null) {
throw UnrecognizedInputFormatException.createForExtractors(mParserNamesPool);
}
return true;
} }
if (mExtractor == null) {
throw UnrecognizedInputFormatException.createForExtractors(mParserNamesPool);
}
return true;
} }
if (isPendingSeek()) { if (isPendingSeek()) {