- * The splice is performed such that for each track the samples read from the next extractor - * start with a keyframe, and continue from where the samples read from this extractor finish. - * A successful splice may discard samples from either or both extractors. - *
- * Splice configuration may fail if the next extractor is not yet in a state that allows the - * splice to be performed. Calling this method is a noop if the splice has already been - * configured. Hence this method should be called repeatedly during the window within which a - * splice can be performed. - * - * @param nextExtractor The extractor being spliced to. - */ - public final void configureSpliceTo(HlsExtractorWrapper nextExtractor) { - if (spliceConfigured || !nextExtractor.shouldSpliceIn || !nextExtractor.isPrepared()) { - // The splice is already configured, or the next extractor doesn't want to be spliced in, or - // the next extractor isn't ready to be spliced in. - return; - } - boolean spliceConfigured = true; - int trackCount = getTrackCount(); - for (int i = 0; i < trackCount; i++) { - DefaultTrackOutput currentSampleQueue = sampleQueues.valueAt(i); - DefaultTrackOutput nextSampleQueue = nextExtractor.sampleQueues.valueAt(i); - spliceConfigured &= currentSampleQueue.configureSpliceTo(nextSampleQueue); - } - this.spliceConfigured = spliceConfigured; - return; - } - - /** - * Gets the number of available tracks. - *
- * This method should only be called after the extractor has been prepared. - * - * @return The number of available tracks. - */ - public int getTrackCount() { - return sampleQueues.size(); - } - - /** - * Gets the {@link MediaFormat} of the specified track. - *
- * This method must only be called after the extractor has been prepared. - * - * @param track The track index. - * @return The corresponding format. - */ - public MediaFormat getMediaFormat(int track) { - return sampleQueues.valueAt(track).getFormat(); - } - /** * Whether the extractor is prepared. * @@ -167,8 +113,69 @@ public final class HlsExtractorWrapper implements ExtractorOutput { return largestParsedTimestampUs; } + /** + * Attempts to configure a splice from this extractor to the next. + *
+ * The splice is performed such that for each track the samples read from the next extractor + * start with a keyframe, and continue from where the samples read from this extractor finish. + * A successful splice may discard samples from either or both extractors. + *
+ * Splice configuration may fail if the next extractor is not yet in a state that allows the + * splice to be performed. Calling this method is a noop if the splice has already been + * configured. Hence this method should be called repeatedly during the window within which a + * splice can be performed. + *
+ * This method must only be called after the extractor has been prepared. + * + * @param nextExtractor The extractor being spliced to. + */ + public final void configureSpliceTo(HlsExtractorWrapper nextExtractor) { + Assertions.checkState(isPrepared()); + if (spliceConfigured || !nextExtractor.shouldSpliceIn || !nextExtractor.isPrepared()) { + // The splice is already configured, or the next extractor doesn't want to be spliced in, or + // the next extractor isn't ready to be spliced in. + return; + } + boolean spliceConfigured = true; + int trackCount = getTrackCount(); + for (int i = 0; i < trackCount; i++) { + DefaultTrackOutput currentSampleQueue = sampleQueues.valueAt(i); + DefaultTrackOutput nextSampleQueue = nextExtractor.sampleQueues.valueAt(i); + spliceConfigured &= currentSampleQueue.configureSpliceTo(nextSampleQueue); + } + this.spliceConfigured = spliceConfigured; + return; + } + + /** + * Gets the number of available tracks. + *
+ * This method must only be called after the extractor has been prepared. + * + * @return The number of available tracks. + */ + public int getTrackCount() { + Assertions.checkState(isPrepared()); + return sampleQueues.size(); + } + + /** + * Gets the {@link MediaFormat} of the specified track. + *
+ * This method must only be called after the extractor has been prepared. + * + * @param track The track index. + * @return The corresponding format. + */ + public MediaFormat getMediaFormat(int track) { + Assertions.checkState(isPrepared()); + return sampleQueues.valueAt(track).getFormat(); + } + /** * Gets the next sample for the specified track. + *
+ * This method must only be called after the extractor has been prepared. * * @param track The track from which to read. * @param holder A {@link SampleHolder} into which the sample should be read. @@ -181,6 +188,8 @@ public final class HlsExtractorWrapper implements ExtractorOutput { /** * Discards samples for the specified track up to the specified time. + *
+ * This method must only be called after the extractor has been prepared. * * @param track The track from which samples should be discarded. * @param timeUs The time up to which samples should be discarded, in microseconds. @@ -193,6 +202,8 @@ public final class HlsExtractorWrapper implements ExtractorOutput { /** * Whether samples are available for reading from {@link #getSample(int, SampleHolder)} for the * specified track. + *
+ * This method must only be called after the extractor has been prepared. * * @return True if samples are available for reading from {@link #getSample(int, SampleHolder)} * for the specified track. False otherwise. diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java index 85b52757f2..e96b9e3d07 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java @@ -80,9 +80,10 @@ public class HlsSampleSource implements SampleSource, SampleSourceReader, Loader private long lastSeekPositionUs; private long pendingResetPositionUs; - private TsChunk previousTsLoadable; - private Chunk currentLoadable; private boolean loadingFinished; + private Chunk currentLoadable; + private TsChunk currentTsLoadable; + private TsChunk previousTsLoadable; private Loader loader; private IOException currentLoadableException; @@ -259,6 +260,10 @@ public class HlsSampleSource implements SampleSource, SampleSourceReader, Loader } HlsExtractorWrapper extractor = getCurrentExtractor(); + if (!extractor.isPrepared()) { + maybeThrowLoadableException(); + return NOTHING_READ; + } if (downstreamFormat == null || !downstreamFormat.equals(extractor.format)) { // Notify a change in the downstream format. @@ -277,11 +282,10 @@ public class HlsSampleSource implements SampleSource, SampleSourceReader, Loader // We're finished reading from the extractor for this particular track, so advance to the // next one for the current read. extractor = extractors.get(++extractorIndex); - } - - if (!extractor.isPrepared()) { - maybeThrowLoadableException(); - return NOTHING_READ; + if (!extractor.isPrepared()) { + maybeThrowLoadableException(); + return NOTHING_READ; + } } MediaFormat mediaFormat = extractor.getMediaFormat(track); @@ -351,6 +355,10 @@ public class HlsSampleSource implements SampleSource, SampleSourceReader, Loader public void onLoadCompleted(Loadable loadable) { long now = SystemClock.elapsedRealtime(); long loadDurationMs = now - currentLoadStartTimeMs; + if (currentTsLoadable != null) { + previousTsLoadable = currentTsLoadable; + currentTsLoadable = null; + } chunkSource.onChunkLoadCompleted(currentLoadable); if (isTsChunk(currentLoadable)) { TsChunk tsChunk = (TsChunk) loadable; @@ -462,6 +470,7 @@ public class HlsSampleSource implements SampleSource, SampleSourceReader, Loader } private void clearCurrentLoadable() { + currentTsLoadable = null; currentLoadable = null; currentLoadableException = null; currentLoadableExceptionCount = 0; @@ -510,7 +519,7 @@ public class HlsSampleSource implements SampleSource, SampleSourceReader, Loader } notifyLoadStarted(tsChunk.dataSpec.length, tsChunk.type, tsChunk.trigger, tsChunk.format, tsChunk.startTimeUs, tsChunk.endTimeUs); - previousTsLoadable = tsChunk; + currentTsLoadable = tsChunk; } else { notifyLoadStarted(currentLoadable.dataSpec.length, currentLoadable.type, currentLoadable.trigger, currentLoadable.format, -1, -1); @@ -525,6 +534,8 @@ public class HlsSampleSource implements SampleSource, SampleSourceReader, Loader private long getNextLoadPositionUs() { if (isPendingReset()) { return pendingResetPositionUs; + } else if (loader.isLoading()) { + return currentTsLoadable.isLastChunk ? -1 : currentTsLoadable.endTimeUs; } else { return previousTsLoadable.isLastChunk ? -1 : previousTsLoadable.endTimeUs; }