From d9b60edabf45060aaa7d3d010a49b9128ff54a95 Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 26 Sep 2019 17:18:03 +0100 Subject: [PATCH] Remove duplicated tracksEnded check in HlsSampleStreamWrapper PiperOrigin-RevId: 271364512 --- .../exoplayer2/source/hls/HlsSampleStreamWrapper.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 d234cc2d60..2418b53469 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 @@ -801,8 +801,6 @@ import java.util.Map; sampleQueueTrackIds[sampleQueueIndex] = id; return sampleQueues[sampleQueueIndex]; } - } else if (tracksEnded) { - return createDummyTrackOutput(id, type); } } else /* sparse track */ { for (int i = 0; i < trackCount; i++) { @@ -810,9 +808,9 @@ import java.util.Map; return sampleQueues[i]; } } - if (tracksEnded) { - return createDummyTrackOutput(id, type); - } + } + if (tracksEnded) { + return createDummyTrackOutput(id, type); } SampleQueue trackOutput = new PrivTimestampStrippingSampleQueue(allocator); trackOutput.setSampleOffsetUs(sampleOffsetUs);