sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Expand passthrough channel count workaround to all devices

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=206893078
This commit is contained in:
andrewlewis 2018-08-01 01:04:23 -07:00 committed by Oliver Woodman
parent f08ad55892
commit 429bf4d099
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
View file

@ -1129,11 +1129,14 @@ public final class DefaultAudioSink implements AudioSink {
} }
private static int getChannelConfig(int channelCount, boolean isInputPcm) { private static int getChannelConfig(int channelCount, boolean isInputPcm) {
// Workaround for overly strict channel configuration checks on nVidia Shield. if (Util.SDK_INT <= 28 && !isInputPcm) {
if (Util.SDK_INT <= 23 && "foster".equals(Util.DEVICE) && "NVIDIA".equals(Util.MANUFACTURER)) { // In passthrough mode the channel count used to configure the audio track doesn't affect how
// the stream is handled, except that some devices do overly-strict channel configuration
// checks. Therefore we override the channel count so that a known-working channel
// configuration is chosen in all cases. See [Internal: b/29116190].
if (channelCount == 7) { if (channelCount == 7) {
channelCount = 8; channelCount = 8;
} else if (channelCount == 3 || channelCount == 5) { } else if (channelCount == 3 || channelCount == 4 || channelCount == 5) {
channelCount = 6; channelCount = 6;
} }
} }