Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add an
Extractor to parse subtitles before SampleQueue
The end-to-end test output for the overlapping SRT and SSA subtitles is currently incorrect. They will be fixed in a future change that updates `TextRenderer` to support this overlap. The 'extra' samples visible in the extractor test output files are 'empty cue list' samples produced by `SsaParser`. They will go away when this implementation is updated to remove this behaviour and rely on `CuesWithTiming.durationUs` instead (the 'empty list' behaviour is not required by the `SubtitleParser` interface). PiperOrigin-RevId: 549264593
- Loading branch information
Showing
34 changed files
with
6,578 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
...ractor/src/main/java/com/google/android/exoplayer2/text/SubtitleTranscodingExtractor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * Copyright 2023 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.android.exoplayer2.text; | ||
|
|
||
| import com.google.android.exoplayer2.C; | ||
| import com.google.android.exoplayer2.Format; | ||
| import com.google.android.exoplayer2.extractor.Extractor; | ||
| import com.google.android.exoplayer2.extractor.ExtractorInput; | ||
| import com.google.android.exoplayer2.extractor.ExtractorOutput; | ||
| import com.google.android.exoplayer2.extractor.PositionHolder; | ||
| import com.google.android.exoplayer2.extractor.TrackOutput; | ||
| import com.google.android.exoplayer2.util.MimeTypes; | ||
| import java.io.IOException; | ||
| import org.checkerframework.checker.nullness.qual.MonotonicNonNull; | ||
|
|
||
| /** | ||
| * A wrapping {@link Extractor} that transcodes {@linkplain C#TRACK_TYPE_TEXT text samples} from | ||
| * supported subtitle formats to {@link MimeTypes#TEXT_EXOPLAYER_CUES}. | ||
| * | ||
| * <p>Samples emitted by the delegate {@link Extractor} to {@linkplain C#TRACK_TYPE_TEXT text | ||
| * tracks} with a supported subtitle format are transcoded and the resulting {@link | ||
| * MimeTypes#TEXT_EXOPLAYER_CUES} samples are emitted to the underlying {@link TrackOutput}. | ||
| * | ||
| * <p>Samples emitted by the delegate {@link Extractor} to non-text tracks (or text tracks with an | ||
| * unsupported format) are passed through to the underlying {@link TrackOutput} without | ||
| * modification. | ||
| * | ||
| * <p>Support for subtitle formats is determined by {@link | ||
| * SubtitleParser.Factory#supportsFormat(Format)} on the {@link SubtitleParser.Factory} passed to | ||
| * the constructor of this class. | ||
| * | ||
| * @deprecated com.google.android.exoplayer2 is deprecated. Please migrate to androidx.media3 (which | ||
| * contains the same ExoPlayer code). See <a | ||
| * href="https://developer.android.com/guide/topics/media/media3/getting-started/migration-guide">the | ||
| * migration guide</a> for more details, including a script to help with the migration. | ||
| */ | ||
| @Deprecated | ||
| public class SubtitleTranscodingExtractor implements Extractor { | ||
|
|
||
| private final Extractor delegate; | ||
| private final SubtitleParser.Factory subtitleParserFactory; | ||
|
|
||
| private @MonotonicNonNull SubtitleTranscodingExtractorOutput transcodingExtractorOutput; | ||
|
|
||
| public SubtitleTranscodingExtractor( | ||
| Extractor delegate, SubtitleParser.Factory subtitleParserFactory) { | ||
| this.delegate = delegate; | ||
| this.subtitleParserFactory = subtitleParserFactory; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean sniff(ExtractorInput input) throws IOException { | ||
| return delegate.sniff(input); | ||
| } | ||
|
|
||
| @Override | ||
| public void init(ExtractorOutput output) { | ||
| transcodingExtractorOutput = | ||
| new SubtitleTranscodingExtractorOutput(output, subtitleParserFactory); | ||
| delegate.init(transcodingExtractorOutput); | ||
| } | ||
|
|
||
| @Override | ||
| public @ReadResult int read(ExtractorInput input, PositionHolder seekPosition) | ||
| throws IOException { | ||
| return delegate.read(input, seekPosition); | ||
| } | ||
|
|
||
| @Override | ||
| public void seek(long position, long timeUs) { | ||
| if (transcodingExtractorOutput != null) { | ||
| transcodingExtractorOutput.resetSubtitleParsers(); | ||
| } | ||
| delegate.seek(position, timeUs); | ||
| } | ||
|
|
||
| @Override | ||
| public void release() { | ||
| delegate.release(); | ||
| } | ||
|
|
||
| @Override | ||
| public Extractor getUnderlyingImplementation() { | ||
| return delegate; | ||
| } | ||
| } |
79 changes: 79 additions & 0 deletions
79
.../src/main/java/com/google/android/exoplayer2/text/SubtitleTranscodingExtractorOutput.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Copyright 2023 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.android.exoplayer2.text; | ||
|
|
||
| import android.util.SparseArray; | ||
| import com.google.android.exoplayer2.C; | ||
| import com.google.android.exoplayer2.extractor.ExtractorOutput; | ||
| import com.google.android.exoplayer2.extractor.SeekMap; | ||
| import com.google.android.exoplayer2.extractor.TrackOutput; | ||
|
|
||
| /** | ||
| * A wrapping {@link ExtractorOutput} for use by {@link SubtitleTranscodingExtractor}. | ||
| * | ||
| * @deprecated com.google.android.exoplayer2 is deprecated. Please migrate to androidx.media3 (which | ||
| * contains the same ExoPlayer code). See <a | ||
| * href="https://developer.android.com/guide/topics/media/media3/getting-started/migration-guide">the | ||
| * migration guide</a> for more details, including a script to help with the migration. | ||
| */ | ||
| @Deprecated | ||
| /* package */ class SubtitleTranscodingExtractorOutput implements ExtractorOutput { | ||
|
|
||
| private final ExtractorOutput delegate; | ||
| private final SubtitleParser.Factory subtitleParserFactory; | ||
| private final SparseArray<SubtitleTranscodingTrackOutput> textTrackOutputs; | ||
|
|
||
| public SubtitleTranscodingExtractorOutput( | ||
| ExtractorOutput delegate, SubtitleParser.Factory subtitleParserFactory) { | ||
| this.delegate = delegate; | ||
| this.subtitleParserFactory = subtitleParserFactory; | ||
| textTrackOutputs = new SparseArray<>(); | ||
| } | ||
|
|
||
| public void resetSubtitleParsers() { | ||
| for (int i = 0; i < textTrackOutputs.size(); i++) { | ||
| textTrackOutputs.valueAt(i).resetSubtitleParser(); | ||
| } | ||
| } | ||
|
|
||
| // ExtractorOutput implementation | ||
|
|
||
| @Override | ||
| public TrackOutput track(int id, @C.TrackType int type) { | ||
| if (type != C.TRACK_TYPE_TEXT) { | ||
| return delegate.track(id, type); | ||
| } | ||
| SubtitleTranscodingTrackOutput existingTrackOutput = textTrackOutputs.get(id); | ||
| if (existingTrackOutput != null) { | ||
| return existingTrackOutput; | ||
| } | ||
| SubtitleTranscodingTrackOutput trackOutput = | ||
| new SubtitleTranscodingTrackOutput(delegate.track(id, type), subtitleParserFactory); | ||
| textTrackOutputs.put(id, trackOutput); | ||
| return trackOutput; | ||
| } | ||
|
|
||
| @Override | ||
| public void endTracks() { | ||
| delegate.endTracks(); | ||
| } | ||
|
|
||
| @Override | ||
| public void seekMap(SeekMap seekMap) { | ||
| delegate.seekMap(seekMap); | ||
| } | ||
| } |
Oops, something went wrong.