loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-11 09:39:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set master playlist's channelCount only on audio renditions

Browse Source 
PiperOrigin-RevId: 379935363
This commit is contained in:
christosts 2021-06-17 13:18:15 +01:00 committed by Ian Baker
parent f3e62343fc
commit ed563183cd
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1500,16 +1500,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);
} }