sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure consistent ExtractorOutput usage in WebvttExtractor

Browse source 
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
This commit is contained in:
ibaker 2024-10-08 07:01:18 -07:00 committed by Copybara-Service
parent 5f935ef22e
commit abfeea518e
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/WebvttExtractor.java
View file

@ -121,7 +121,7 @@ public final class WebvttExtractor implements Extractor {
parseSubtitlesDuringExtraction parseSubtitlesDuringExtraction
? new SubtitleTranscodingExtractorOutput(output, subtitleParserFactory) ? new SubtitleTranscodingExtractorOutput(output, subtitleParserFactory)
: output; : output;
output.seekMap(new SeekMap.Unseekable(C.TIME_UNSET)); this.output.seekMap(new SeekMap.Unseekable(C.TIME_UNSET));
} }
@Override @Override

1
libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
View file

@ -561,7 +561,6 @@ public class MatroskaExtractor implements Extractor {
@Override @Override
public final void init(ExtractorOutput output) { public final void init(ExtractorOutput output) {
extractorOutput = output;
extractorOutput = extractorOutput =
parseSubtitlesDuringExtraction parseSubtitlesDuringExtraction
? new SubtitleTranscodingExtractorOutput(output, subtitleParserFactory) ? new SubtitleTranscodingExtractorOutput(output, subtitleParserFactory)