From f204e4df7d98fda4e67cf69b5dc85a4280b60003 Mon Sep 17 00:00:00 2001 From: kimvde Date: Wed, 4 Mar 2020 11:59:38 +0000 Subject: [PATCH] Add setCoreFlacExtractorFlags on DefaultExtractory PiperOrigin-RevId: 298816694 --- .../extractor/DefaultExtractorsFactory.java | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java index 012b84059d..b7a5da10ab 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java @@ -93,14 +93,15 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory { } private boolean constantBitrateSeekingEnabled; - private @AdtsExtractor.Flags int adtsFlags; - private @AmrExtractor.Flags int amrFlags; - private @MatroskaExtractor.Flags int matroskaFlags; - private @Mp4Extractor.Flags int mp4Flags; - private @FragmentedMp4Extractor.Flags int fragmentedMp4Flags; - private @Mp3Extractor.Flags int mp3Flags; - private @TsExtractor.Mode int tsMode; - private @DefaultTsPayloadReaderFactory.Flags int tsFlags; + @AdtsExtractor.Flags private int adtsFlags; + @AmrExtractor.Flags private int amrFlags; + @FlacExtractor.Flags private int coreFlacFlags; + @MatroskaExtractor.Flags private int matroskaFlags; + @Mp4Extractor.Flags private int mp4Flags; + @FragmentedMp4Extractor.Flags private int fragmentedMp4Flags; + @Mp3Extractor.Flags private int mp3Flags; + @TsExtractor.Mode private int tsMode; + @DefaultTsPayloadReaderFactory.Flags private int tsFlags; public DefaultExtractorsFactory() { tsMode = TsExtractor.MODE_SINGLE_PMT; @@ -148,6 +149,19 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory { return this; } + /** + * Sets flags for {@link FlacExtractor} instances created by the factory. + * + * @see FlacExtractor#FlacExtractor(int) + * @param flags The flags to use. + * @return The factory, for convenience. + */ + public synchronized DefaultExtractorsFactory setCoreFlacExtractorFlags( + @FlacExtractor.Flags int flags) { + this.coreFlacFlags = flags; + return this; + } + /** * Sets flags for {@link MatroskaExtractor} instances created by the factory. * @@ -263,7 +277,7 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory { throw new IllegalStateException("Unexpected error creating FLAC extractor", e); } } else { - extractors[13] = new FlacExtractor(); + extractors[13] = new FlacExtractor(coreFlacFlags); } return extractors; }