From abfeea518efc3a8314679fa11e5e415c8ac32184 Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 8 Oct 2024 07:01:18 -0700 Subject: [PATCH] Ensure consistent `ExtractorOutput` usage in `WebvttExtractor` This change is a no-op, because `SubtitleTranscodingExtractorOutput.seekMap` forwards directly to the delegate implementation, but it seems clearer to always use the wrapper. Also remove a no-op assignment in `MatroskaExtractor`. This is a follow-up to Issue: androidx/media#1779 where I manually checked every implementation of `Extractor.init` for a similar mistake. #cherrypick PiperOrigin-RevId: 683607090 --- .../java/androidx/media3/exoplayer/hls/WebvttExtractor.java | 2 +- .../java/androidx/media3/extractor/mkv/MatroskaExtractor.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/WebvttExtractor.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/WebvttExtractor.java index dd0b4a9ada..22bd3ed9fe 100644 --- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/WebvttExtractor.java +++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/WebvttExtractor.java @@ -121,7 +121,7 @@ public final class WebvttExtractor implements Extractor { parseSubtitlesDuringExtraction ? new SubtitleTranscodingExtractorOutput(output, subtitleParserFactory) : output; - output.seekMap(new SeekMap.Unseekable(C.TIME_UNSET)); + this.output.seekMap(new SeekMap.Unseekable(C.TIME_UNSET)); } @Override diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java index 34bafec956..6519eb1891 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java @@ -561,7 +561,6 @@ public class MatroskaExtractor implements Extractor { @Override public final void init(ExtractorOutput output) { - extractorOutput = output; extractorOutput = parseSubtitlesDuringExtraction ? new SubtitleTranscodingExtractorOutput(output, subtitleParserFactory)