Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50e321de authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make MediaParser match ExoPlayer's sniffing order" into rvc-dev am: 2c89e32d 

Change-Id: Ibbbeb14def88fb61962be1f58d2c5cd8add163d2
parents 82abc4fb 2c89e32d

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

+11 −9
Original line number Diff line number Diff line
@@ -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<>();