From 5ebb3d44812322ee9788feec5ebf5a49b51cccd5 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 27 Mar 2017 06:52:34 -0700 Subject: [PATCH] Correct allowTimeBeyondBuffer values for skipToKeyframeBefore calls The only case where we should pass false is if we want to know whether the passed time is within the buffered media. This is relevant within seekTo implementations only. This is related to (but does not fix) issue #2582 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=151315676 --- .../exoplayer2/extractor/DefaultTrackOutput.java | 14 -------------- .../exoplayer2/source/ExtractorMediaPeriod.java | 8 ++++++-- .../exoplayer2/source/chunk/ChunkSampleStream.java | 6 +++--- .../source/hls/HlsSampleStreamWrapper.java | 2 +- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java index 8aff8858a1..d57b55bfd2 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java @@ -227,20 +227,6 @@ public final class DefaultTrackOutput implements TrackOutput { return infoQueue.getLargestQueuedTimestampUs(); } - /** - * Attempts to skip to the keyframe before or at the specified time. Succeeds only if the buffer - * contains a keyframe with a timestamp of {@code timeUs} or earlier, and if {@code timeUs} falls - * within the currently buffered media. - *

- * This method is equivalent to {@code skipToKeyframeBefore(timeUs, false)}. - * - * @param timeUs The seek time. - * @return Whether the skip was successful. - */ - public boolean skipToKeyframeBefore(long timeUs) { - return skipToKeyframeBefore(timeUs, false); - } - /** * Attempts to skip to the keyframe before or at the specified time. Succeeds only if the buffer * contains a keyframe with a timestamp of {@code timeUs} or earlier. If diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java index d843943710..d54e881183 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java @@ -301,7 +301,7 @@ import java.io.IOException; boolean seekInsideBuffer = !isPendingReset(); for (int i = 0; seekInsideBuffer && i < trackCount; i++) { if (trackEnabledStates[i]) { - seekInsideBuffer = sampleQueues.valueAt(i).skipToKeyframeBefore(positionUs); + seekInsideBuffer = sampleQueues.valueAt(i).skipToKeyframeBefore(positionUs, false); } } // If we failed to seek within the sample queues, we need to restart. @@ -340,6 +340,10 @@ import java.io.IOException; loadingFinished, lastSeekPositionUs); } + /* package */ void skipToKeyframeBefore(int track, long timeUs) { + sampleQueues.valueAt(track).skipToKeyframeBefore(timeUs, true); + } + // Loader.Callback implementation. @Override @@ -566,7 +570,7 @@ import java.io.IOException; @Override public void skipToKeyframeBefore(long timeUs) { - sampleQueues.valueAt(track).skipToKeyframeBefore(timeUs); + ExtractorMediaPeriod.this.skipToKeyframeBefore(track, timeUs); } } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java index 93d86a8de1..6a62afe2fb 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java @@ -193,7 +193,7 @@ public class ChunkSampleStream implements SampleStream, S // TODO: For this to work correctly, the embedded streams must not discard anything from their // sample queues beyond the current read position of the primary stream. for (DefaultTrackOutput embeddedSampleQueue : embeddedSampleQueues) { - embeddedSampleQueue.skipToKeyframeBefore(positionUs); + embeddedSampleQueue.skipToKeyframeBefore(positionUs, true); } } else { // We failed, and need to restart. @@ -252,7 +252,7 @@ public class ChunkSampleStream implements SampleStream, S @Override public void skipToKeyframeBefore(long timeUs) { - primarySampleQueue.skipToKeyframeBefore(timeUs); + primarySampleQueue.skipToKeyframeBefore(timeUs, true); } // Loader.Callback implementation. @@ -449,7 +449,7 @@ public class ChunkSampleStream implements SampleStream, S @Override public void skipToKeyframeBefore(long timeUs) { - sampleQueue.skipToKeyframeBefore(timeUs); + sampleQueue.skipToKeyframeBefore(timeUs, true); } @Override diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java index 8bd966f177..f2cf7d2ddb 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java @@ -313,7 +313,7 @@ import java.util.LinkedList; } /* package */ void skipToKeyframeBefore(int group, long timeUs) { - sampleQueues.valueAt(group).skipToKeyframeBefore(timeUs); + sampleQueues.valueAt(group).skipToKeyframeBefore(timeUs, true); } private boolean finishedReadingChunk(HlsMediaChunk chunk) {