Skip to content

SDK / exoplayer

Go to a project
Commit 0ceff589 by aquilescanta Committed by Andrew Lewis
Options

HLS Bugfix: Avoid loading initialization segment when reusing extractor 

This bug affects any playlist that uses initialization segments. In practice,
almost exclusively fragmented mp4 segmented playlists are affected.

The bottom line is that extractors are chosen for reuse after the
initialization segment connection is open. However, reused extractors
do not need re-parsing the init segment, so loading the initialization is
wasteful.

PiperOrigin-RevId: 234479467
parent e97910a6
Inline Side-by-side
Showing with 80 additions and 38 deletions
RELEASENOTES.md
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
* Form an adaptive track group out of audio renditions with matching name. * Form an adaptive track group out of audio renditions with matching name.
* Support encrypted initialization segments * Support encrypted initialization segments
([#5441](https://github.com/google/ExoPlayer/issues/5441)). ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
* Prevent unnecessary reloads of the initialization segment for reused
extractors.
* DASH: * DASH:
* Fix issue handling large `EventStream` presentation timestamps * Fix issue handling large `EventStream` presentation timestamps
([#5490](https://github.com/google/ExoPlayer/issues/5490)). ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
...@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source.hls; ...@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source.hls;
import android.net.Uri; import android.net.Uri;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Pair;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
...@@ -71,7 +70,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory { ...@@ -71,7 +70,7 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
} }
@Override @Override
public Pair<Extractor, Boolean> createExtractor( public Result createExtractor(
Extractor previousExtractor, Extractor previousExtractor,
Uri uri, Uri uri,
Format format, Format format,
...@@ -84,21 +83,15 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory { ...@@ -84,21 +83,15 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
if (previousExtractor != null) { if (previousExtractor != null) {
// A extractor has already been successfully used. Return one of the same type. // A extractor has already been successfully used. Return one of the same type.
if (previousExtractor instanceof TsExtractor if (isReusable(previousExtractor)) {
|| previousExtractor instanceof FragmentedMp4Extractor) {
// TS and fMP4 extractors can be reused.
return buildResult(previousExtractor); return buildResult(previousExtractor);
} else if (previousExtractor instanceof WebvttExtractor) {
return buildResult(new WebvttExtractor(format.language, timestampAdjuster));
} else if (previousExtractor instanceof AdtsExtractor) {
return buildResult(new AdtsExtractor());
} else if (previousExtractor instanceof Ac3Extractor) {
return buildResult(new Ac3Extractor());
} else if (previousExtractor instanceof Mp3Extractor) {
return buildResult(new Mp3Extractor());
} else { } else {
throw new IllegalArgumentException( Result result =
"Unexpected previousExtractor type: " + previousExtractor.getClass().getSimpleName()); buildResultForSameExtractorType(previousExtractor, format, timestampAdjuster);
if (result == null) {
throw new IllegalArgumentException(
"Unexpected previousExtractor type: " + previousExtractor.getClass().getSimpleName());
}
} }
} }
...@@ -249,12 +242,28 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory { ...@@ -249,12 +242,28 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
new DefaultTsPayloadReaderFactory(payloadReaderFactoryFlags, muxedCaptionFormats)); new DefaultTsPayloadReaderFactory(payloadReaderFactoryFlags, muxedCaptionFormats));
} }
private static Pair<Extractor, Boolean> buildResult(Extractor extractor) { private static Result buildResultForSameExtractorType(
return new Pair<>( Extractor previousExtractor, Format format, TimestampAdjuster timestampAdjuster) {
if (previousExtractor instanceof WebvttExtractor) {
return buildResult(new WebvttExtractor(format.language, timestampAdjuster));
} else if (previousExtractor instanceof AdtsExtractor) {
return buildResult(new AdtsExtractor());
} else if (previousExtractor instanceof Ac3Extractor) {
return buildResult(new Ac3Extractor());
} else if (previousExtractor instanceof Mp3Extractor) {
return buildResult(new Mp3Extractor());
} else {
return null;
}
}
private static Result buildResult(Extractor extractor) {
return new Result(
extractor, extractor,
extractor instanceof AdtsExtractor extractor instanceof AdtsExtractor
|| extractor instanceof Ac3Extractor || extractor instanceof Ac3Extractor
|| extractor instanceof Mp3Extractor); || extractor instanceof Mp3Extractor,
isReusable(extractor));
} }
private static boolean sniffQuietly(Extractor extractor, ExtractorInput input) private static boolean sniffQuietly(Extractor extractor, ExtractorInput input)
...@@ -270,4 +279,8 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory { ...@@ -270,4 +279,8 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
return result; return result;
} }
private static boolean isReusable(Extractor previousExtractor) {
return previousExtractor instanceof TsExtractor
|| previousExtractor instanceof FragmentedMp4Extractor;
}
} }
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package com.google.android.exoplayer2.source.hls; package com.google.android.exoplayer2.source.hls;
import android.net.Uri; import android.net.Uri;
import android.util.Pair;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
...@@ -32,6 +31,33 @@ import java.util.Map; ...@@ -32,6 +31,33 @@ import java.util.Map;
*/ */
public interface HlsExtractorFactory { public interface HlsExtractorFactory {
/** Holds an {@link Extractor} and associated parameters. */
final class Result {
/** The created extractor; */
public final Extractor extractor;
/** Whether the segments for which {@link #extractor} is created are packed audio segments. */
public final boolean isPackedAudioExtractor;
/**
* Whether {@link #extractor} may be reused for following continuous (no immediately preceding
* discontinuities) segments of the same variant.
*/
public final boolean isReusable;
/**
* Creates a result.
*
* @param extractor See {@link #extractor}.
* @param isPackedAudioExtractor See {@link #isPackedAudioExtractor}.
* @param isReusable See {@link #isReusable}.
*/
public Result(Extractor extractor, boolean isPackedAudioExtractor, boolean isReusable) {
this.extractor = extractor;
this.isPackedAudioExtractor = isPackedAudioExtractor;
this.isReusable = isReusable;
}
}
HlsExtractorFactory DEFAULT = new DefaultHlsExtractorFactory(); HlsExtractorFactory DEFAULT = new DefaultHlsExtractorFactory();
/** /**
...@@ -51,13 +77,11 @@ public interface HlsExtractorFactory { ...@@ -51,13 +77,11 @@ 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)}.
* @return A pair containing the {@link Extractor} and a boolean that indicates whether it is a * @return A {@link Result}.
* packed audio extractor. The first element may be {@code previousExtractor} if the factory
* has determined it can be re-used.
* @throws InterruptedException If the thread is interrupted while sniffing. * @throws InterruptedException If the thread is interrupted while sniffing.
* @throws IOException If an I/O error is encountered while sniffing. * @throws IOException If an I/O error is encountered while sniffing.
*/ */
Pair<Extractor, Boolean> createExtractor( Result createExtractor(
Extractor previousExtractor, Extractor previousExtractor,
Uri uri, Uri uri,
Format format, Format format,
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
...@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source.hls; ...@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source.hls;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.util.Pair;
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.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData;
...@@ -133,9 +132,11 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -133,9 +132,11 @@ import java.util.concurrent.atomic.AtomicInteger;
scratchId3Data = previousChunk.scratchId3Data; scratchId3Data = previousChunk.scratchId3Data;
shouldSpliceIn = previousChunk.hlsUrl != hlsUrl || !previousChunk.loadCompleted; shouldSpliceIn = previousChunk.hlsUrl != hlsUrl || !previousChunk.loadCompleted;
previousExtractor = previousExtractor =
previousChunk.discontinuitySequenceNumber != discontinuitySequenceNumber || shouldSpliceIn previousChunk.isExtractorReusable
? null && previousChunk.discontinuitySequenceNumber == discontinuitySequenceNumber
: previousChunk.extractor; && !shouldSpliceIn
? previousChunk.extractor
: null;
} else { } else {
id3Decoder = new Id3Decoder(); id3Decoder = new Id3Decoder();
scratchId3Data = new ParsableByteArray(Id3Decoder.ID3_HEADER_LENGTH); scratchId3Data = new ParsableByteArray(Id3Decoder.ID3_HEADER_LENGTH);
...@@ -204,6 +205,7 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -204,6 +205,7 @@ import java.util.concurrent.atomic.AtomicInteger;
private final boolean initSegmentEncrypted; private final boolean initSegmentEncrypted;
private Extractor extractor; private Extractor extractor;
private boolean isExtractorReusable;
private HlsSampleStreamWrapper output; private HlsSampleStreamWrapper output;
private int initSegmentBytesLoaded; private int initSegmentBytesLoaded;
private int nextLoadPosition; private int nextLoadPosition;
...@@ -287,6 +289,12 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -287,6 +289,12 @@ import java.util.concurrent.atomic.AtomicInteger;
@Override @Override
public void load() throws IOException, InterruptedException { public void load() throws IOException, InterruptedException {
if (extractor == null && previousExtractor != null) {
extractor = previousExtractor;
isExtractorReusable = true;
initLoadCompleted = initDataSpec != null;
output.init(uid, shouldSpliceIn, /* reusingExtractor= */ true);
}
maybeLoadInitData(); maybeLoadInitData();
if (!loadCanceled) { if (!loadCanceled) {
if (!hasGapTag) { if (!hasGapTag) {
...@@ -380,7 +388,7 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -380,7 +388,7 @@ import java.util.concurrent.atomic.AtomicInteger;
long id3Timestamp = peekId3PrivTimestamp(extractorInput); long id3Timestamp = peekId3PrivTimestamp(extractorInput);
extractorInput.resetPeekPosition(); extractorInput.resetPeekPosition();
Pair<Extractor, Boolean> extractorData = HlsExtractorFactory.Result result =
extractorFactory.createExtractor( extractorFactory.createExtractor(
previousExtractor, previousExtractor,
dataSpec.uri, dataSpec.uri,
...@@ -390,21 +398,16 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -390,21 +398,16 @@ import java.util.concurrent.atomic.AtomicInteger;
timestampAdjuster, timestampAdjuster,
dataSource.getResponseHeaders(), dataSource.getResponseHeaders(),
extractorInput); extractorInput);
extractor = extractorData.first; extractor = result.extractor;
boolean reusingExtractor = extractor == previousExtractor; isExtractorReusable = result.isReusable;
boolean isPackedAudioExtractor = extractorData.second; if (result.isPackedAudioExtractor) {
if (isPackedAudioExtractor) {
output.setSampleOffsetUs( output.setSampleOffsetUs(
id3Timestamp != C.TIME_UNSET id3Timestamp != C.TIME_UNSET
? timestampAdjuster.adjustTsTimestamp(id3Timestamp) ? timestampAdjuster.adjustTsTimestamp(id3Timestamp)
: startTimeUs); : startTimeUs);
} }
initLoadCompleted = reusingExtractor && initDataSpec != null; output.init(uid, shouldSpliceIn, /* reusingExtractor= */ false);
extractor.init(output);
output.init(uid, shouldSpliceIn, reusingExtractor);
if (!reusingExtractor) {
extractor.init(output);
}
} }
return extractorInput; return extractorInput;
......
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