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 a flag to enable the preemptive 608 track in HLS

Browse source 
By passing false, users can disable the preemptive 608 track.

Issue:#5736
PiperOrigin-RevId: 242476274
This commit is contained in:
aquilescanta 2019-04-08 17:28:18 +01:00 committed by Oliver Woodman
parent 9a03e73b7a
commit 73acdcf1e2
1 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
View file

@ -54,10 +54,15 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
public static final String WEBVTT_FILE_EXTENSION = ".webvtt"; public static final String WEBVTT_FILE_EXTENSION = ".webvtt";
@DefaultTsPayloadReaderFactory.Flags private final int payloadReaderFactoryFlags; @DefaultTsPayloadReaderFactory.Flags private final int payloadReaderFactoryFlags;
private final boolean exposeCea608WhenMissingDeclarations;
/** Creates a factory for HLS segment extractors. */ /**
* Equivalent to {@link #DefaultHlsExtractorFactory(int, boolean) new
* DefaultHlsExtractorFactory(payloadReaderFactoryFlags = 0, exposeCea608WhenMissingDeclarations =
* true)}
*/
public DefaultHlsExtractorFactory() { public DefaultHlsExtractorFactory() {
this(/* payloadReaderFactoryFlags= */ 0); this(/* payloadReaderFactoryFlags= */ 0, /* exposeCea608WhenMissingDeclarations */ true);
} }
/** /**
@ -66,9 +71,14 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
* @param payloadReaderFactoryFlags Flags to add when constructing any {@link * @param payloadReaderFactoryFlags Flags to add when constructing any {@link
* DefaultTsPayloadReaderFactory} instances. Other flags may be added on top of {@code * DefaultTsPayloadReaderFactory} instances. Other flags may be added on top of {@code
* payloadReaderFactoryFlags} when creating {@link DefaultTsPayloadReaderFactory}. * payloadReaderFactoryFlags} when creating {@link DefaultTsPayloadReaderFactory}.
* @param exposeCea608WhenMissingDeclarations Whether created {@link TsExtractor} instances should
* expose a CEA-608 track should the master playlist contain no Closed Captions declarations.
* If the master playlist contains any Closed Captions declarations, this flag is ignored.
*/ */
public DefaultHlsExtractorFactory(int payloadReaderFactoryFlags) { public DefaultHlsExtractorFactory(
int payloadReaderFactoryFlags, boolean exposeCea608WhenMissingDeclarations) {
this.payloadReaderFactoryFlags = payloadReaderFactoryFlags; this.payloadReaderFactoryFlags = payloadReaderFactoryFlags;
this.exposeCea608WhenMissingDeclarations = exposeCea608WhenMissingDeclarations;
} }
@Override @Override
@ -161,7 +171,11 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
if (!(extractorByFileExtension instanceof TsExtractor)) { if (!(extractorByFileExtension instanceof TsExtractor)) {
TsExtractor tsExtractor = TsExtractor tsExtractor =
createTsExtractor( createTsExtractor(
payloadReaderFactoryFlags, format, muxedCaptionFormats, timestampAdjuster); payloadReaderFactoryFlags,
exposeCea608WhenMissingDeclarations,
format,
muxedCaptionFormats,
timestampAdjuster);
if (sniffQuietly(tsExtractor, extractorInput)) { if (sniffQuietly(tsExtractor, extractorInput)) {
return buildResult(tsExtractor); return buildResult(tsExtractor);
} }
@ -207,12 +221,17 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
} else { } else {
// For any other file extension, we assume TS format. // For any other file extension, we assume TS format.
return createTsExtractor( return createTsExtractor(
payloadReaderFactoryFlags, format, muxedCaptionFormats, timestampAdjuster); payloadReaderFactoryFlags,
exposeCea608WhenMissingDeclarations,
format,
muxedCaptionFormats,
timestampAdjuster);
} }
} }
private static TsExtractor createTsExtractor( private static TsExtractor createTsExtractor(
@DefaultTsPayloadReaderFactory.Flags int userProvidedPayloadReaderFactoryFlags, @DefaultTsPayloadReaderFactory.Flags int userProvidedPayloadReaderFactoryFlags,
boolean exposeCea608WhenMissingDeclarations,
Format format, Format format,
List<Format> muxedCaptionFormats, List<Format> muxedCaptionFormats,
TimestampAdjuster timestampAdjuster) { TimestampAdjuster timestampAdjuster) {
@ -223,7 +242,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
if (muxedCaptionFormats != null) { if (muxedCaptionFormats != null) {
// The playlist declares closed caption renditions, we should ignore descriptors. // The playlist declares closed caption renditions, we should ignore descriptors.
payloadReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_OVERRIDE_CAPTION_DESCRIPTORS; payloadReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_OVERRIDE_CAPTION_DESCRIPTORS;
} else { } else if (exposeCea608WhenMissingDeclarations) {
// The playlist does not provide any closed caption information. We preemptively declare a // The playlist does not provide any closed caption information. We preemptively declare a
// closed caption track on channel 0. // closed caption track on channel 0.
muxedCaptionFormats = muxedCaptionFormats =
@ -233,6 +252,8 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
MimeTypes.APPLICATION_CEA608, MimeTypes.APPLICATION_CEA608,
/* selectionFlags= */ 0, /* selectionFlags= */ 0,
/* language= */ null)); /* language= */ null));
} else {
muxedCaptionFormats = Collections.emptyList();
} }
String codecs = format.codecs; String codecs = format.codecs;
if (!TextUtils.isEmpty(codecs)) { if (!TextUtils.isEmpty(codecs)) {