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

Add DefaultExtractorsFactory.setTsSubtitleFormats

Browse source 
ExoPlayer is unable to detect the presence of subtitle tracks in some
MPEG-TS files that don't fully declare them. It's possible for a
developer to provide the list instead, but doing so is quite awkward
without this helper method. This is consistent for how
`DefaultExtractorsFactory` allows other aspects of the delegate
`Extractor` implementations to be customised.

* Issue: google/ExoPlayer#10175
* Issue: google/ExoPlayer#10505

#minor-release

PiperOrigin-RevId: 490214619
(cherry picked from commit ff48faec5f)
This commit is contained in:
ibaker 2022-11-22 13:09:17 +00:00 committed by christosts
parent fa6b8fe06d
commit dddb72b269
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libraries/extractor/src/main/java/androidx/media3/extractor/DefaultExtractorsFactory.java
View file

@ -22,6 +22,7 @@ import android.net.Uri;
import androidx.annotation.GuardedBy; import androidx.annotation.GuardedBy;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.media3.common.FileTypes; import androidx.media3.common.FileTypes;
import androidx.media3.common.Format;
import androidx.media3.common.PlaybackException; import androidx.media3.common.PlaybackException;
import androidx.media3.common.Player; import androidx.media3.common.Player;
import androidx.media3.common.util.TimestampAdjuster; import androidx.media3.common.util.TimestampAdjuster;
@ -44,6 +45,7 @@ import androidx.media3.extractor.ts.PsExtractor;
import androidx.media3.extractor.ts.TsExtractor; import androidx.media3.extractor.ts.TsExtractor;
import androidx.media3.extractor.ts.TsPayloadReader; import androidx.media3.extractor.ts.TsPayloadReader;
import androidx.media3.extractor.wav.WavExtractor; import androidx.media3.extractor.wav.WavExtractor;
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@ -128,11 +130,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;
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();
} }
/** /**
@ -303,6 +307,20 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
return this; return this;
} }
/**
* Sets a list of subtitle formats to pass to the {@link DefaultTsPayloadReaderFactory} used by
* {@link TsExtractor} instances created by the factory.
*
* @see DefaultTsPayloadReaderFactory#DefaultTsPayloadReaderFactory(int, List)
* @param subtitleFormats The subtitle formats.
* @return The factory, for convenience.
*/
@CanIgnoreReturnValue
public synchronized DefaultExtractorsFactory setTsSubtitleFormats(List<Format> subtitleFormats) {
tsSubtitleFormats = ImmutableList.copyOf(subtitleFormats);
return this;
}
/** /**
* Sets the number of bytes searched to find a timestamp for {@link TsExtractor} instances created * Sets the number of bytes searched to find a timestamp for {@link TsExtractor} instances created
* by the factory. * by the factory.
@ -416,7 +434,12 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
extractors.add(new PsExtractor()); extractors.add(new PsExtractor());
break; break;
case FileTypes.TS: case FileTypes.TS:
extractors.add(new TsExtractor(tsMode, tsFlags, tsTimestampSearchBytes)); extractors.add(
new TsExtractor(
tsMode,
new TimestampAdjuster(0),
new DefaultTsPayloadReaderFactory(tsFlags, tsSubtitleFormats),
tsTimestampSearchBytes));
break; break;
case FileTypes.WAV: case FileTypes.WAV:
extractors.add(new WavExtractor()); extractors.add(new WavExtractor());