From f0b9889ef6e218b1a41bbf18cb0948135fd994ee 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 f87f411187..56e913b357 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 @@ -829,8 +829,6 @@ import java.util.Set; sampleQueueTrackIds[sampleQueueIndex] = id; return sampleQueues[sampleQueueIndex]; } - } else if (tracksEnded) { - return createDummyTrackOutput(id, type); } } else /* sparse track */ { for (int i = 0; i < trackCount; i++) { @@ -838,9 +836,9 @@ import java.util.Set; return sampleQueues[i]; } } - if (tracksEnded) { - return createDummyTrackOutput(id, type); - } + } + if (tracksEnded) { + return createDummyTrackOutput(id, type); } SampleQueue trackOutput = new FormatAdjustingSampleQueue(allocator, overridingDrmInitData); trackOutput.setSampleOffsetUs(sampleOffsetUs);