loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Temporal fix to allow proper library shrinking.

Browse Source 
PiperOrigin-RevId: 492579961
This commit is contained in:
Googler 2022-12-02 23:55:10 +00:00 committed by Ian Baker
parent d6c872494b
commit f3832b33d3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
View File

@ -128,13 +128,13 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
private @Mp3Extractor.Flags int mp3Flags; private @Mp3Extractor.Flags int mp3Flags;
private @TsExtractor.Mode int tsMode; private @TsExtractor.Mode int tsMode;
private @DefaultTsPayloadReaderFactory.Flags int tsFlags; private @DefaultTsPayloadReaderFactory.Flags int tsFlags;
private ImmutableList<Format> tsSubtitleFormats; // TODO (b/260245332): Initialize tsSubtitleFormats in constructor once shrinking bug is fixed.
@Nullable private ImmutableList<Format> tsSubtitleFormats;
private int tsTimestampSearchBytes; private int tsTimestampSearchBytes;
public DefaultExtractorsFactory() { public DefaultExtractorsFactory() {
tsMode = TsExtractor.MODE_SINGLE_PMT; tsMode = TsExtractor.MODE_SINGLE_PMT;
tsTimestampSearchBytes = TsExtractor.DEFAULT_TIMESTAMP_SEARCH_BYTES; tsTimestampSearchBytes = TsExtractor.DEFAULT_TIMESTAMP_SEARCH_BYTES;
tsSubtitleFormats = ImmutableList.of();
} }
/** /**
@ -432,6 +432,9 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
extractors.add(new PsExtractor()); extractors.add(new PsExtractor());
break; break;
case FileTypes.TS: case FileTypes.TS:
if (tsSubtitleFormats == null) {
tsSubtitleFormats = ImmutableList.of();
}
extractors.add( extractors.add(
new TsExtractor( new TsExtractor(
tsMode, tsMode,