loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use getMaxSupportedChannelCountForPassthrough to assign channel Count

Browse Source
This commit is contained in:
Cedric T 2023-05-03 14:03:15 +08:00 committed by Tianyi Feng
parent b73d2cc736
commit 22b45b75f7
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioCapabilities.java
View File

@ -73,7 +73,7 @@ public final class AudioCapabilities {
new ImmutableMap.Builder<Integer, Integer>() new ImmutableMap.Builder<Integer, Integer>()
.put(C.ENCODING_AC3, 6) .put(C.ENCODING_AC3, 6)
.put(C.ENCODING_AC4, 6) .put(C.ENCODING_AC4, 6)
.put(C.ENCODING_DTS, 6) .put(C.ENCODING_DTS, 10)
.put(C.ENCODING_E_AC3_JOC, 6) .put(C.ENCODING_E_AC3_JOC, 6)
.put(C.ENCODING_E_AC3, 8) .put(C.ENCODING_E_AC3, 8)
.put(C.ENCODING_DTS_HD, 8) .put(C.ENCODING_DTS_HD, 8)
@ -212,7 +212,8 @@ public final class AudioCapabilities {
return null; return null;
} }
int channelCount; int channelCount;
if (format.channelCount == Format.NO_VALUE || encoding == C.ENCODING_E_AC3_JOC) { if (format.channelCount == Format.NO_VALUE || encoding == C.ENCODING_E_AC3_JOC
|| encoding == C.ENCODING_DTS) {
// In HLS chunkless preparation, the format channel count and sample rate may be unset. See // In HLS chunkless preparation, the format channel count and sample rate may be unset. See
// https://github.com/google/ExoPlayer/issues/10204 and b/222127949 for more details. // https://github.com/google/ExoPlayer/issues/10204 and b/222127949 for more details.
// For E-AC3 JOC, the format is object based so the format channel count is arbitrary. // For E-AC3 JOC, the format is object based so the format channel count is arbitrary.
@ -221,13 +222,7 @@ public final class AudioCapabilities {
channelCount = getMaxSupportedChannelCountForPassthrough(encoding, sampleRate); channelCount = getMaxSupportedChannelCountForPassthrough(encoding, sampleRate);
} else { } else {
channelCount = format.channelCount; channelCount = format.channelCount;
if (format.sampleMimeType == MimeTypes.AUDIO_DTS_X) { if (channelCount > maxChannelCount) {
if (channelCount > 10) {
// To fix wrong reporting from device. ChannelCount is reported as 8 for DTS:X P2
// on some devices.
return null;
}
} else if (channelCount > maxChannelCount) {
return null; return null;
} }
} }