From ca766b6979a595052456aba565d37de97d6b9475 Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 22 Jun 2023 16:41:35 +0000 Subject: [PATCH] Check the two Extractor instantiation sites in HLS remain consistent PiperOrigin-RevId: 542585842 --- .../media3/exoplayer/hls/BundledHlsMediaChunkExtractor.java | 1 + .../media3/exoplayer/hls/DefaultHlsExtractorFactory.java | 1 + 2 files changed, 2 insertions(+) diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/BundledHlsMediaChunkExtractor.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/BundledHlsMediaChunkExtractor.java index d39a701f28..5b699ce0a0 100644 --- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/BundledHlsMediaChunkExtractor.java +++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/BundledHlsMediaChunkExtractor.java @@ -93,6 +93,7 @@ public final class BundledHlsMediaChunkExtractor implements HlsMediaChunkExtract extractor.getUnderlyingImplementation() == extractor, "Can't recreate wrapped extractors. Outer type: " + extractor.getClass()); Extractor newExtractorInstance; + // LINT.IfChange(extractor_instantiation) if (extractor instanceof WebvttExtractor) { newExtractorInstance = new WebvttExtractor(multivariantPlaylistFormat.language, timestampAdjuster); diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/DefaultHlsExtractorFactory.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/DefaultHlsExtractorFactory.java index aec437e327..2ca8d08dbf 100644 --- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/DefaultHlsExtractorFactory.java +++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/DefaultHlsExtractorFactory.java @@ -159,6 +159,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory { Format format, @Nullable List muxedCaptionFormats, TimestampAdjuster timestampAdjuster) { + // LINT.IfChange(extractor_instantiation) switch (fileType) { case FileTypes.WEBVTT: return new WebvttExtractor(format.language, timestampAdjuster);