Skip to content

SDK / exoplayer

Go to a project
Commit dad44a1c by tonihei
Options

Set LogSessionId on MediaParser for HLS sources. 

This requires some plumbing through HlsMediaPeriod and HlsChunkSource.

PiperOrigin-RevId: 411004283
parent 25f408e6
Inline Side-by-side
Showing with 76 additions and 25 deletions
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
...@@ -22,6 +22,7 @@ import android.net.Uri; ...@@ -22,6 +22,7 @@ import android.net.Uri;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.extractor.mp3.Mp3Extractor; import com.google.android.exoplayer2.extractor.mp3.Mp3Extractor;
...@@ -94,7 +95,8 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory { ...@@ -94,7 +95,8 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
@Nullable List<Format> muxedCaptionFormats, @Nullable List<Format> muxedCaptionFormats,
TimestampAdjuster timestampAdjuster, TimestampAdjuster timestampAdjuster,
Map<String, List<String>> responseHeaders, Map<String, List<String>> responseHeaders,
ExtractorInput sniffingExtractorInput) ExtractorInput sniffingExtractorInput,
PlayerId playerId)
throws IOException { throws IOException {
@FileTypes.Type @FileTypes.Type
int formatInferredFileType = FileTypes.inferFileTypeFromMimeType(format.sampleMimeType); int formatInferredFileType = FileTypes.inferFileTypeFromMimeType(format.sampleMimeType);
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
...@@ -26,6 +26,7 @@ import androidx.annotation.Nullable; ...@@ -26,6 +26,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.source.BehindLiveWindowException; import com.google.android.exoplayer2.source.BehindLiveWindowException;
import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.TrackGroup;
import com.google.android.exoplayer2.source.chunk.BaseMediaChunkIterator; import com.google.android.exoplayer2.source.chunk.BaseMediaChunkIterator;
...@@ -122,6 +123,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -122,6 +123,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private final TrackGroup trackGroup; private final TrackGroup trackGroup;
@Nullable private final List<Format> muxedCaptionFormats; @Nullable private final List<Format> muxedCaptionFormats;
private final FullSegmentEncryptionKeyCache keyCache; private final FullSegmentEncryptionKeyCache keyCache;
private final PlayerId playerId;
private boolean isTimestampMaster; private boolean isTimestampMaster;
private byte[] scratchSpace; private byte[] scratchSpace;
...@@ -161,13 +163,15 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -161,13 +163,15 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
HlsDataSourceFactory dataSourceFactory, HlsDataSourceFactory dataSourceFactory,
@Nullable TransferListener mediaTransferListener, @Nullable TransferListener mediaTransferListener,
TimestampAdjusterProvider timestampAdjusterProvider, TimestampAdjusterProvider timestampAdjusterProvider,
@Nullable List<Format> muxedCaptionFormats) { @Nullable List<Format> muxedCaptionFormats,
PlayerId playerId) {
this.extractorFactory = extractorFactory; this.extractorFactory = extractorFactory;
this.playlistTracker = playlistTracker; this.playlistTracker = playlistTracker;
this.playlistUrls = playlistUrls; this.playlistUrls = playlistUrls;
this.playlistFormats = playlistFormats; this.playlistFormats = playlistFormats;
this.timestampAdjusterProvider = timestampAdjusterProvider; this.timestampAdjusterProvider = timestampAdjusterProvider;
this.muxedCaptionFormats = muxedCaptionFormats; this.muxedCaptionFormats = muxedCaptionFormats;
this.playerId = playerId;
keyCache = new FullSegmentEncryptionKeyCache(KEY_CACHE_SIZE); keyCache = new FullSegmentEncryptionKeyCache(KEY_CACHE_SIZE);
scratchSpace = Util.EMPTY_BYTE_ARRAY; scratchSpace = Util.EMPTY_BYTE_ARRAY;
liveEdgeInPeriodTimeUs = C.TIME_UNSET; liveEdgeInPeriodTimeUs = C.TIME_UNSET;
...@@ -453,7 +457,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -453,7 +457,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
previous, previous,
/* mediaSegmentKey= */ keyCache.get(mediaSegmentKeyUri), /* mediaSegmentKey= */ keyCache.get(mediaSegmentKeyUri),
/* initSegmentKey= */ keyCache.get(initSegmentKeyUri), /* initSegmentKey= */ keyCache.get(initSegmentKeyUri),
shouldSpliceIn); shouldSpliceIn,
playerId);
} }
@Nullable @Nullable
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source.hls; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source.hls;
import android.net.Uri; import android.net.Uri;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.extractor.PositionHolder;
...@@ -44,6 +45,7 @@ public interface HlsExtractorFactory { ...@@ -44,6 +45,7 @@ public interface HlsExtractorFactory {
* @param sniffingExtractorInput The first extractor input that will be passed to the returned * @param sniffingExtractorInput The first extractor input that will be passed to the returned
* extractor's {@link Extractor#read(ExtractorInput, PositionHolder)}. Must only be used to * extractor's {@link Extractor#read(ExtractorInput, PositionHolder)}. Must only be used to
* call {@link Extractor#sniff(ExtractorInput)}. * call {@link Extractor#sniff(ExtractorInput)}.
* @param playerId The {@link PlayerId} of the player using this extractors factory.
* @return An {@link HlsMediaChunkExtractor}. * @return An {@link HlsMediaChunkExtractor}.
* @throws IOException If an I/O error is encountered while sniffing. * @throws IOException If an I/O error is encountered while sniffing.
*/ */
...@@ -53,6 +55,7 @@ public interface HlsExtractorFactory { ...@@ -53,6 +55,7 @@ public interface HlsExtractorFactory {
@Nullable List<Format> muxedCaptionFormats, @Nullable List<Format> muxedCaptionFormats,
TimestampAdjuster timestampAdjuster, TimestampAdjuster timestampAdjuster,
Map<String, List<String>> responseHeaders, Map<String, List<String>> responseHeaders,
ExtractorInput sniffingExtractorInput) ExtractorInput sniffingExtractorInput,
PlayerId playerId)
throws IOException; throws IOException;
} }
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
...@@ -21,6 +21,7 @@ import android.net.Uri; ...@@ -21,6 +21,7 @@ import android.net.Uri;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.extractor.DefaultExtractorInput; import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
...@@ -91,7 +92,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -91,7 +92,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
@Nullable HlsMediaChunk previousChunk, @Nullable HlsMediaChunk previousChunk,
@Nullable byte[] mediaSegmentKey, @Nullable byte[] mediaSegmentKey,
@Nullable byte[] initSegmentKey, @Nullable byte[] initSegmentKey,
boolean shouldSpliceIn) { boolean shouldSpliceIn,
PlayerId playerId) {
// Media segment. // Media segment.
HlsMediaPlaylist.SegmentBase mediaSegment = segmentBaseHolder.segmentBase; HlsMediaPlaylist.SegmentBase mediaSegment = segmentBaseHolder.segmentBase;
DataSpec dataSpec = DataSpec dataSpec =
...@@ -184,7 +186,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -184,7 +186,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
previousExtractor, previousExtractor,
id3Decoder, id3Decoder,
scratchId3Data, scratchId3Data,
shouldSpliceIn); shouldSpliceIn,
playerId);
} }
/** /**
...@@ -256,6 +259,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -256,6 +259,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
private final ParsableByteArray scratchId3Data; private final ParsableByteArray scratchId3Data;
private final boolean mediaSegmentEncrypted; private final boolean mediaSegmentEncrypted;
private final boolean initSegmentEncrypted; private final boolean initSegmentEncrypted;
private final PlayerId playerId;
private @MonotonicNonNull HlsMediaChunkExtractor extractor; private @MonotonicNonNull HlsMediaChunkExtractor extractor;
private @MonotonicNonNull HlsSampleStreamWrapper output; private @MonotonicNonNull HlsSampleStreamWrapper output;
...@@ -295,7 +299,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -295,7 +299,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
@Nullable HlsMediaChunkExtractor previousExtractor, @Nullable HlsMediaChunkExtractor previousExtractor,
Id3Decoder id3Decoder, Id3Decoder id3Decoder,
ParsableByteArray scratchId3Data, ParsableByteArray scratchId3Data,
boolean shouldSpliceIn) { boolean shouldSpliceIn,
PlayerId playerId) {
super( super(
mediaDataSource, mediaDataSource,
dataSpec, dataSpec,
...@@ -324,6 +329,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -324,6 +329,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
this.id3Decoder = id3Decoder; this.id3Decoder = id3Decoder;
this.scratchId3Data = scratchId3Data; this.scratchId3Data = scratchId3Data;
this.shouldSpliceIn = shouldSpliceIn; this.shouldSpliceIn = shouldSpliceIn;
this.playerId = playerId;
sampleQueueFirstSampleIndices = ImmutableList.of(); sampleQueueFirstSampleIndices = ImmutableList.of();
uid = uidSource.getAndIncrement(); uid = uidSource.getAndIncrement();
} }
...@@ -497,7 +503,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -497,7 +503,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
muxedCaptionFormats, muxedCaptionFormats,
timestampAdjuster, timestampAdjuster,
dataSource.getResponseHeaders(), dataSource.getResponseHeaders(),
extractorInput); extractorInput,
playerId);
if (extractor.isPackedAudioExtractor()) { if (extractor.isPackedAudioExtractor()) {
output.setSampleOffsetUs( output.setSampleOffsetUs(
id3Timestamp != C.TIME_UNSET id3Timestamp != C.TIME_UNSET
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
...@@ -21,6 +21,7 @@ import androidx.annotation.Nullable; ...@@ -21,6 +21,7 @@ import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.SeekParameters; import com.google.android.exoplayer2.SeekParameters;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.drm.DrmSession; import com.google.android.exoplayer2.drm.DrmSession;
import com.google.android.exoplayer2.drm.DrmSessionEventListener; import com.google.android.exoplayer2.drm.DrmSessionEventListener;
...@@ -80,6 +81,7 @@ public final class HlsMediaPeriod ...@@ -80,6 +81,7 @@ public final class HlsMediaPeriod
private final boolean allowChunklessPreparation; private final boolean allowChunklessPreparation;
private final @HlsMediaSource.MetadataType int metadataType; private final @HlsMediaSource.MetadataType int metadataType;
private final boolean useSessionKeys; private final boolean useSessionKeys;
private final PlayerId playerId;
@Nullable private Callback callback; @Nullable private Callback callback;
private int pendingPrepareCount; private int pendingPrepareCount;
...@@ -123,7 +125,8 @@ public final class HlsMediaPeriod ...@@ -123,7 +125,8 @@ public final class HlsMediaPeriod
CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory, CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory,
boolean allowChunklessPreparation, boolean allowChunklessPreparation,
@HlsMediaSource.MetadataType int metadataType, @HlsMediaSource.MetadataType int metadataType,
boolean useSessionKeys) { boolean useSessionKeys,
PlayerId playerId) {
this.extractorFactory = extractorFactory; this.extractorFactory = extractorFactory;
this.playlistTracker = playlistTracker; this.playlistTracker = playlistTracker;
this.dataSourceFactory = dataSourceFactory; this.dataSourceFactory = dataSourceFactory;
...@@ -137,6 +140,7 @@ public final class HlsMediaPeriod ...@@ -137,6 +140,7 @@ public final class HlsMediaPeriod
this.allowChunklessPreparation = allowChunklessPreparation; this.allowChunklessPreparation = allowChunklessPreparation;
this.metadataType = metadataType; this.metadataType = metadataType;
this.useSessionKeys = useSessionKeys; this.useSessionKeys = useSessionKeys;
this.playerId = playerId;
compositeSequenceableLoader = compositeSequenceableLoader =
compositeSequenceableLoaderFactory.createCompositeSequenceableLoader(); compositeSequenceableLoaderFactory.createCompositeSequenceableLoader();
streamWrapperIndices = new IdentityHashMap<>(); streamWrapperIndices = new IdentityHashMap<>();
...@@ -771,7 +775,8 @@ public final class HlsMediaPeriod ...@@ -771,7 +775,8 @@ public final class HlsMediaPeriod
dataSourceFactory, dataSourceFactory,
mediaTransferListener, mediaTransferListener,
timestampAdjusterProvider, timestampAdjusterProvider,
muxedCaptionFormats); muxedCaptionFormats,
playerId);
return new HlsSampleStreamWrapper( return new HlsSampleStreamWrapper(
trackType, trackType,
/* callback= */ this, /* callback= */ this,
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
...@@ -497,7 +497,8 @@ public final class HlsMediaSource extends BaseMediaSource ...@@ -497,7 +497,8 @@ public final class HlsMediaSource extends BaseMediaSource
compositeSequenceableLoaderFactory, compositeSequenceableLoaderFactory,
allowChunklessPreparation, allowChunklessPreparation,
metadataType, metadataType,
useSessionKeys); useSessionKeys,
getPlayerId());
} }
@Override @Override
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/MediaParserHlsMediaChunkExtractor.java
...@@ -34,6 +34,7 @@ import android.text.TextUtils; ...@@ -34,6 +34,7 @@ import android.text.TextUtils;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.extractor.ExtractorOutput; import com.google.android.exoplayer2.extractor.ExtractorOutput;
import com.google.android.exoplayer2.source.mediaparser.InputReaderAdapterV30; import com.google.android.exoplayer2.source.mediaparser.InputReaderAdapterV30;
...@@ -42,6 +43,7 @@ import com.google.android.exoplayer2.source.mediaparser.OutputConsumerAdapterV30 ...@@ -42,6 +43,7 @@ import com.google.android.exoplayer2.source.mediaparser.OutputConsumerAdapterV30
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.FileTypes; import com.google.android.exoplayer2.util.FileTypes;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.io.IOException; import java.io.IOException;
...@@ -60,7 +62,8 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt ...@@ -60,7 +62,8 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt
muxedCaptionFormats, muxedCaptionFormats,
timestampAdjuster, timestampAdjuster,
responseHeaders, responseHeaders,
sniffingExtractorInput) -> { sniffingExtractorInput,
playerId) -> {
if (FileTypes.inferFileTypeFromMimeType(format.sampleMimeType) == FileTypes.WEBVTT) { if (FileTypes.inferFileTypeFromMimeType(format.sampleMimeType) == FileTypes.WEBVTT) {
// The segment contains WebVTT. MediaParser does not support WebVTT parsing, so we use the // The segment contains WebVTT. MediaParser does not support WebVTT parsing, so we use the
// bundled extractor. // bundled extractor.
...@@ -100,6 +103,7 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt ...@@ -100,6 +103,7 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt
format, format,
overrideInBandCaptionDeclarations, overrideInBandCaptionDeclarations,
muxedCaptionMediaFormats, muxedCaptionMediaFormats,
playerId,
MediaParser.PARSER_NAME_FMP4, MediaParser.PARSER_NAME_FMP4,
MediaParser.PARSER_NAME_AC3, MediaParser.PARSER_NAME_AC3,
MediaParser.PARSER_NAME_AC4, MediaParser.PARSER_NAME_AC4,
...@@ -119,7 +123,8 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt ...@@ -119,7 +123,8 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt
format, format,
overrideInBandCaptionDeclarations, overrideInBandCaptionDeclarations,
muxedCaptionMediaFormats, muxedCaptionMediaFormats,
/* leadingBytesToSkip= */ peekingInputReader.totalPeekedBytes); /* leadingBytesToSkip= */ peekingInputReader.totalPeekedBytes,
playerId);
}; };
private final OutputConsumerAdapterV30 outputConsumerAdapter; private final OutputConsumerAdapterV30 outputConsumerAdapter;
...@@ -128,6 +133,8 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt ...@@ -128,6 +133,8 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt
private final Format format; private final Format format;
private final boolean overrideInBandCaptionDeclarations; private final boolean overrideInBandCaptionDeclarations;
private final ImmutableList<MediaFormat> muxedCaptionMediaFormats; private final ImmutableList<MediaFormat> muxedCaptionMediaFormats;
private final PlayerId playerId;
private int pendingSkipBytes; private int pendingSkipBytes;
/** /**
...@@ -146,6 +153,7 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt ...@@ -146,6 +153,7 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt
* that {@link MediaParser} should expose. * that {@link MediaParser} should expose.
* @param leadingBytesToSkip The number of bytes to skip from the start of the input before * @param leadingBytesToSkip The number of bytes to skip from the start of the input before
* starting extraction. * starting extraction.
* @param playerId The {@link PlayerId} of the player using this chunk extractor.
*/ */
public MediaParserHlsMediaChunkExtractor( public MediaParserHlsMediaChunkExtractor(
MediaParser mediaParser, MediaParser mediaParser,
...@@ -153,12 +161,14 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt ...@@ -153,12 +161,14 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt
Format format, Format format,
boolean overrideInBandCaptionDeclarations, boolean overrideInBandCaptionDeclarations,
ImmutableList<MediaFormat> muxedCaptionMediaFormats, ImmutableList<MediaFormat> muxedCaptionMediaFormats,
int leadingBytesToSkip) { int leadingBytesToSkip,
PlayerId playerId) {
this.mediaParser = mediaParser; this.mediaParser = mediaParser;
this.outputConsumerAdapter = outputConsumerAdapter; this.outputConsumerAdapter = outputConsumerAdapter;
this.overrideInBandCaptionDeclarations = overrideInBandCaptionDeclarations; this.overrideInBandCaptionDeclarations = overrideInBandCaptionDeclarations;
this.muxedCaptionMediaFormats = muxedCaptionMediaFormats; this.muxedCaptionMediaFormats = muxedCaptionMediaFormats;
this.format = format; this.format = format;
this.playerId = playerId;
pendingSkipBytes = leadingBytesToSkip; pendingSkipBytes = leadingBytesToSkip;
inputReaderAdapter = new InputReaderAdapterV30(); inputReaderAdapter = new InputReaderAdapterV30();
} }
...@@ -203,12 +213,14 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt ...@@ -203,12 +213,14 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt
format, format,
overrideInBandCaptionDeclarations, overrideInBandCaptionDeclarations,
muxedCaptionMediaFormats, muxedCaptionMediaFormats,
playerId,
mediaParser.getParserName()), mediaParser.getParserName()),
outputConsumerAdapter, outputConsumerAdapter,
format, format,
overrideInBandCaptionDeclarations, overrideInBandCaptionDeclarations,
muxedCaptionMediaFormats, muxedCaptionMediaFormats,
/* leadingBytesToSkip= */ 0); /* leadingBytesToSkip= */ 0,
playerId);
} }
@Override @Override
...@@ -223,6 +235,7 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt ...@@ -223,6 +235,7 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt
Format format, Format format,
boolean overrideInBandCaptionDeclarations, boolean overrideInBandCaptionDeclarations,
ImmutableList<MediaFormat> muxedCaptionMediaFormats, ImmutableList<MediaFormat> muxedCaptionMediaFormats,
PlayerId playerId,
String... parserNames) { String... parserNames) {
MediaParser mediaParser = MediaParser mediaParser =
parserNames.length == 1 parserNames.length == 1
...@@ -248,6 +261,9 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt ...@@ -248,6 +261,9 @@ public final class MediaParserHlsMediaChunkExtractor implements HlsMediaChunkExt
mediaParser.setParameter(PARAMETER_TS_IGNORE_AVC_STREAM, true); mediaParser.setParameter(PARAMETER_TS_IGNORE_AVC_STREAM, true);
} }
} }
if (Util.SDK_INT >= 31) {
MediaParserUtil.setLogSessionIdOnMediaParser(mediaParser, playerId);
}
return mediaParser; return mediaParser;
} }
......
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java
...@@ -21,6 +21,7 @@ import android.net.Uri; ...@@ -21,6 +21,7 @@ import android.net.Uri;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.extractor.mp3.Mp3Extractor; import com.google.android.exoplayer2.extractor.mp3.Mp3Extractor;
...@@ -79,7 +80,8 @@ public class DefaultHlsExtractorFactoryTest { ...@@ -79,7 +80,8 @@ public class DefaultHlsExtractorFactoryTest {
/* muxedCaptionFormats= */ null, /* muxedCaptionFormats= */ null,
timestampAdjuster, timestampAdjuster,
ac3ResponseHeaders, ac3ResponseHeaders,
webVttExtractorInput); webVttExtractorInput,
PlayerId.UNSET);
assertThat(result.extractor.getClass()).isEqualTo(WebvttExtractor.class); assertThat(result.extractor.getClass()).isEqualTo(WebvttExtractor.class);
} }
...@@ -103,7 +105,8 @@ public class DefaultHlsExtractorFactoryTest { ...@@ -103,7 +105,8 @@ public class DefaultHlsExtractorFactoryTest {
/* muxedCaptionFormats= */ null, /* muxedCaptionFormats= */ null,
timestampAdjuster, timestampAdjuster,
ac3ResponseHeaders, ac3ResponseHeaders,
ac3ExtractorInput); ac3ExtractorInput,
PlayerId.UNSET);
assertThat(result.extractor.getClass()).isEqualTo(Ac3Extractor.class); assertThat(result.extractor.getClass()).isEqualTo(Ac3Extractor.class);
} }
...@@ -125,7 +128,8 @@ public class DefaultHlsExtractorFactoryTest { ...@@ -125,7 +128,8 @@ public class DefaultHlsExtractorFactoryTest {
/* muxedCaptionFormats= */ null, /* muxedCaptionFormats= */ null,
timestampAdjuster, timestampAdjuster,
ac3ResponseHeaders, ac3ResponseHeaders,
tsExtractorInput); tsExtractorInput,
PlayerId.UNSET);
assertThat(result.extractor.getClass()).isEqualTo(TsExtractor.class); assertThat(result.extractor.getClass()).isEqualTo(TsExtractor.class);
} }
...@@ -148,7 +152,8 @@ public class DefaultHlsExtractorFactoryTest { ...@@ -148,7 +152,8 @@ public class DefaultHlsExtractorFactoryTest {
/* muxedCaptionFormats= */ null, /* muxedCaptionFormats= */ null,
timestampAdjuster, timestampAdjuster,
ac3ResponseHeaders, ac3ResponseHeaders,
mp3ExtractorInput); mp3ExtractorInput,
PlayerId.UNSET);
assertThat(result.extractor.getClass()).isEqualTo(Mp3Extractor.class); assertThat(result.extractor.getClass()).isEqualTo(Mp3Extractor.class);
} }
...@@ -170,7 +175,8 @@ public class DefaultHlsExtractorFactoryTest { ...@@ -170,7 +175,8 @@ public class DefaultHlsExtractorFactoryTest {
/* muxedCaptionFormats= */ null, /* muxedCaptionFormats= */ null,
timestampAdjuster, timestampAdjuster,
ImmutableMap.of("Content-Type", ImmutableList.of(MimeTypes.IMAGE_JPEG)), ImmutableMap.of("Content-Type", ImmutableList.of(MimeTypes.IMAGE_JPEG)),
tsExtractorInput); tsExtractorInput,
PlayerId.UNSET);
assertThat(result.extractor.getClass()).isEqualTo(TsExtractor.class); assertThat(result.extractor.getClass()).isEqualTo(TsExtractor.class);
} }
...@@ -187,7 +193,8 @@ public class DefaultHlsExtractorFactoryTest { ...@@ -187,7 +193,8 @@ public class DefaultHlsExtractorFactoryTest {
/* muxedCaptionFormats= */ null, /* muxedCaptionFormats= */ null,
timestampAdjuster, timestampAdjuster,
ac3ResponseHeaders, ac3ResponseHeaders,
emptyExtractorInput); emptyExtractorInput,
PlayerId.UNSET);
// The format indicates WebVTT so we expect a WebVTT extractor. // The format indicates WebVTT so we expect a WebVTT extractor.
assertThat(result.extractor.getClass()).isEqualTo(WebvttExtractor.class); assertThat(result.extractor.getClass()).isEqualTo(WebvttExtractor.class);
...@@ -205,7 +212,8 @@ public class DefaultHlsExtractorFactoryTest { ...@@ -205,7 +212,8 @@ public class DefaultHlsExtractorFactoryTest {
/* muxedCaptionFormats= */ null, /* muxedCaptionFormats= */ null,
timestampAdjuster, timestampAdjuster,
ac3ResponseHeaders, ac3ResponseHeaders,
emptyExtractorInput); emptyExtractorInput,
PlayerId.UNSET);
// No format info, so we expect an AC-3 Extractor, as per HTTP Content-Type header. // No format info, so we expect an AC-3 Extractor, as per HTTP Content-Type header.
assertThat(result.extractor.getClass()).isEqualTo(Ac3Extractor.class); assertThat(result.extractor.getClass()).isEqualTo(Ac3Extractor.class);
...@@ -223,7 +231,8 @@ public class DefaultHlsExtractorFactoryTest { ...@@ -223,7 +231,8 @@ public class DefaultHlsExtractorFactoryTest {
/* muxedCaptionFormats= */ null, /* muxedCaptionFormats= */ null,
timestampAdjuster, timestampAdjuster,
/* responseHeaders= */ ImmutableMap.of(), /* responseHeaders= */ ImmutableMap.of(),
emptyExtractorInput); emptyExtractorInput,
PlayerId.UNSET);
// No format info, and no HTTP headers, so we expect an fMP4 extractor, as per file extension. // No format info, and no HTTP headers, so we expect an fMP4 extractor, as per file extension.
assertThat(result.extractor.getClass()).isEqualTo(FragmentedMp4Extractor.class); assertThat(result.extractor.getClass()).isEqualTo(FragmentedMp4Extractor.class);
...@@ -241,7 +250,8 @@ public class DefaultHlsExtractorFactoryTest { ...@@ -241,7 +250,8 @@ public class DefaultHlsExtractorFactoryTest {
/* muxedCaptionFormats= */ null, /* muxedCaptionFormats= */ null,
timestampAdjuster, timestampAdjuster,
/* responseHeaders= */ ImmutableMap.of(), /* responseHeaders= */ ImmutableMap.of(),
emptyExtractorInput); emptyExtractorInput,
PlayerId.UNSET);
// There's no information for inferring the file type, we expect the factory to fall back on // There's no information for inferring the file type, we expect the factory to fall back on
// Transport Stream. // Transport Stream.
......
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
...@@ -22,6 +22,7 @@ import static org.mockito.Mockito.when; ...@@ -22,6 +22,7 @@ import static org.mockito.Mockito.when;
import android.net.Uri; import android.net.Uri;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.analytics.PlayerId;
import com.google.android.exoplayer2.drm.DrmSessionEventListener; import com.google.android.exoplayer2.drm.DrmSessionEventListener;
import com.google.android.exoplayer2.drm.DrmSessionManager; import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory; import com.google.android.exoplayer2.source.CompositeSequenceableLoaderFactory;
...@@ -92,7 +93,8 @@ public final class HlsMediaPeriodTest { ...@@ -92,7 +93,8 @@ public final class HlsMediaPeriodTest {
mock(CompositeSequenceableLoaderFactory.class), mock(CompositeSequenceableLoaderFactory.class),
/* allowChunklessPreparation= */ true, /* allowChunklessPreparation= */ true,
HlsMediaSource.METADATA_TYPE_ID3, HlsMediaSource.METADATA_TYPE_ID3,
/* useSessionKeys= */ false); /* useSessionKeys= */ false,
PlayerId.UNSET);
}; };
MediaPeriodAsserts.assertGetStreamKeysAndManifestFilterIntegration( MediaPeriodAsserts.assertGetStreamKeysAndManifestFilterIntegration(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment