From ed563183cd442029e25196d659134e0d1297954c Mon Sep 17 00:00:00 2001 From: christosts Date: Thu, 17 Jun 2021 13:18:15 +0100 Subject: [PATCH] Set master playlist's channelCount only on audio renditions PiperOrigin-RevId: 379935363 --- .../source/hls/HlsSampleStreamWrapper.java | 14 +++++++++----- 1 file changed, 9 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 0bca1b2198..6e16abc519 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 @@ -1500,16 +1500,20 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; .setRoleFlags(playlistFormat.roleFlags) .setAverageBitrate(propagateBitrates ? playlistFormat.averageBitrate : Format.NO_VALUE) .setPeakBitrate(propagateBitrates ? playlistFormat.peakBitrate : Format.NO_VALUE) - .setCodecs(codecs) - .setWidth(playlistFormat.width) - .setHeight(playlistFormat.height) - .setFrameRate(playlistFormat.frameRate); + .setCodecs(codecs); + + if (sampleTrackType == C.TRACK_TYPE_VIDEO) { + formatBuilder + .setWidth(playlistFormat.width) + .setHeight(playlistFormat.height) + .setFrameRate(playlistFormat.frameRate); + } if (sampleMimeType != null) { formatBuilder.setSampleMimeType(sampleMimeType); } - if (playlistFormat.channelCount != Format.NO_VALUE) { + if (playlistFormat.channelCount != Format.NO_VALUE && sampleTrackType == C.TRACK_TYPE_AUDIO) { formatBuilder.setChannelCount(playlistFormat.channelCount); }