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

Fix channel count propagation on HLS traditional preparation

Browse Source 
PiperOrigin-RevId: 235189983
This commit is contained in:
aquilescanta 2019-02-22 15:39:36 +00:00 committed by Oliver Woodman
parent 3e03e71cf9
commit eea1ce3e0a
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/core/src/main/java/com/google/android/exoplayer2/Format.java
View File

@ -1047,6 +1047,7 @@ public final class Format implements Parcelable {
int bitrate, int bitrate,
int width, int width,
int height, int height,
int channelCount,
@C.SelectionFlags int selectionFlags, @C.SelectionFlags int selectionFlags,
@Nullable String language) { @Nullable String language) {
return new Format( return new Format(

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

@ -1094,6 +1094,10 @@ import java.util.List;
return sampleFormat; return sampleFormat;
} }
int bitrate = propagateBitrate ? playlistFormat.bitrate : Format.NO_VALUE; int bitrate = propagateBitrate ? playlistFormat.bitrate : Format.NO_VALUE;
int channelCount =
playlistFormat.channelCount != Format.NO_VALUE
? playlistFormat.channelCount
: sampleFormat.channelCount;
int sampleTrackType = MimeTypes.getTrackType(sampleFormat.sampleMimeType); int sampleTrackType = MimeTypes.getTrackType(sampleFormat.sampleMimeType);
String codecs = Util.getCodecsOfType(playlistFormat.codecs, sampleTrackType); String codecs = Util.getCodecsOfType(playlistFormat.codecs, sampleTrackType);
String mimeType = MimeTypes.getMediaMimeType(codecs); String mimeType = MimeTypes.getMediaMimeType(codecs);
@ -1108,6 +1112,7 @@ import java.util.List;
bitrate, bitrate,
playlistFormat.width, playlistFormat.width,
playlistFormat.height, playlistFormat.height,
channelCount,
playlistFormat.selectionFlags, playlistFormat.selectionFlags,
playlistFormat.language); playlistFormat.language);
} }