Skip to content

SDK / exoplayer

Go to a project
Commit d4ca29d7 by christosts Committed by Oliver Woodman
Options

Set master playlist's channelCount only on audio renditions 

PiperOrigin-RevId: 379935363
parent b5a464cb
Inline Side-by-side
Showing with 9 additions and 5 deletions
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
...@@ -1504,16 +1504,20 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -1504,16 +1504,20 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
.setRoleFlags(playlistFormat.roleFlags) .setRoleFlags(playlistFormat.roleFlags)
.setAverageBitrate(propagateBitrates ? playlistFormat.averageBitrate : Format.NO_VALUE) .setAverageBitrate(propagateBitrates ? playlistFormat.averageBitrate : Format.NO_VALUE)
.setPeakBitrate(propagateBitrates ? playlistFormat.peakBitrate : Format.NO_VALUE) .setPeakBitrate(propagateBitrates ? playlistFormat.peakBitrate : Format.NO_VALUE)
.setCodecs(codecs) .setCodecs(codecs);
.setWidth(playlistFormat.width)
.setHeight(playlistFormat.height) if (sampleTrackType == C.TRACK_TYPE_VIDEO) {
.setFrameRate(playlistFormat.frameRate); formatBuilder
.setWidth(playlistFormat.width)
.setHeight(playlistFormat.height)
.setFrameRate(playlistFormat.frameRate);
}
if (sampleMimeType != null) { if (sampleMimeType != null) {
formatBuilder.setSampleMimeType(sampleMimeType); formatBuilder.setSampleMimeType(sampleMimeType);
} }
if (playlistFormat.channelCount != Format.NO_VALUE) { if (playlistFormat.channelCount != Format.NO_VALUE && sampleTrackType == C.TRACK_TYPE_AUDIO) {
formatBuilder.setChannelCount(playlistFormat.channelCount); formatBuilder.setChannelCount(playlistFormat.channelCount);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment