From f3832b33d36cda9aa1099a8597209a261fb97d5f Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 2 Dec 2022 23:55:10 +0000 Subject: [PATCH] Temporal fix to allow proper library shrinking. PiperOrigin-RevId: 492579961 --- .../exoplayer2/extractor/DefaultExtractorsFactory.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 1933c93803..2f9e6bc4df 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 @@ -128,13 +128,13 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory { private @Mp3Extractor.Flags int mp3Flags; private @TsExtractor.Mode int tsMode; private @DefaultTsPayloadReaderFactory.Flags int tsFlags; - private ImmutableList tsSubtitleFormats; + // TODO (b/260245332): Initialize tsSubtitleFormats in constructor once shrinking bug is fixed. + @Nullable private ImmutableList tsSubtitleFormats; private int tsTimestampSearchBytes; public DefaultExtractorsFactory() { tsMode = TsExtractor.MODE_SINGLE_PMT; tsTimestampSearchBytes = TsExtractor.DEFAULT_TIMESTAMP_SEARCH_BYTES; - tsSubtitleFormats = ImmutableList.of(); } /** @@ -432,6 +432,9 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory { extractors.add(new PsExtractor()); break; case FileTypes.TS: + if (tsSubtitleFormats == null) { + tsSubtitleFormats = ImmutableList.of(); + } extractors.add( new TsExtractor( tsMode,