loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicated tracksEnded check in HlsSampleStreamWrapper

Browse Source 
PiperOrigin-RevId: 271364512
This commit is contained in:
ibaker 2019-09-26 17:18:03 +01:00 committed by Oliver Woodman
parent b57c356fbf
commit f0b9889ef6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
View File

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