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

Merge "Make MediaParser match ExoPlayer's sniffing order" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-25 18:30:35 +00:00
committed by Android (Google) Code Review
parent 81a320279e 98127bca05
commit 2c89e32d34
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1114,20 +1114,22 @@ public final class MediaParser {
static {
// Using a LinkedHashMap to keep the insertion order when iterating over the keys.
LinkedHashMap<String, ExtractorFactory> extractorFactoriesByName = new LinkedHashMap<>();
extractorFactoriesByName.put("exo.Ac3Parser", Ac3Extractor::new);
extractorFactoriesByName.put("exo.Ac4Parser", Ac4Extractor::new);
extractorFactoriesByName.put("exo.AdtsParser", AdtsExtractor::new);
extractorFactoriesByName.put("exo.AmrParser", AmrExtractor::new);
extractorFactoriesByName.put("exo.FlacParser", FlacExtractor::new);
extractorFactoriesByName.put("exo.FlvParser", FlvExtractor::new);
extractorFactoriesByName.put("exo.FragmentedMp4Parser", FragmentedMp4Extractor::new);
// Parsers are ordered to match ExoPlayer's DefaultExtractorsFactory extractor ordering,
// which in turn aims to minimize the chances of incorrect extractor selections.
extractorFactoriesByName.put("exo.MatroskaParser", MatroskaExtractor::new);
extractorFactoriesByName.put("exo.Mp3Parser", Mp3Extractor::new);
extractorFactoriesByName.put("exo.FragmentedMp4Parser", FragmentedMp4Extractor::new);
extractorFactoriesByName.put("exo.Mp4Parser", Mp4Extractor::new);
extractorFactoriesByName.put("exo.Mp3Parser", Mp3Extractor::new);
extractorFactoriesByName.put("exo.AdtsParser", AdtsExtractor::new);
extractorFactoriesByName.put("exo.Ac3Parser", Ac3Extractor::new);
extractorFactoriesByName.put("exo.TsParser", TsExtractor::new);
extractorFactoriesByName.put("exo.FlvParser", FlvExtractor::new);
extractorFactoriesByName.put("exo.OggParser", OggExtractor::new);
extractorFactoriesByName.put("exo.PsParser", PsExtractor::new);
extractorFactoriesByName.put("exo.TsParser", TsExtractor::new);
extractorFactoriesByName.put("exo.WavParser", WavExtractor::new);
extractorFactoriesByName.put("exo.AmrParser", AmrExtractor::new);
extractorFactoriesByName.put("exo.Ac4Parser", Ac4Extractor::new);
extractorFactoriesByName.put("exo.FlacParser", FlacExtractor::new);
EXTRACTOR_FACTORIES_BY_NAME = Collections.unmodifiableMap(extractorFactoriesByName);
HashMap<String, Class> expectedTypeByParameterName = new HashMap<>();