diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-08 03:26:34 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-08 03:26:34 -0800 |
| commit | 3b01dda6d0201e63b05db231e7746e1118eb4fae (patch) | |
| tree | ae9a7fe89c7448f87ae3e3bae8485cc3fe9dbfc2 | |
| parent | 8e61c2a8d2039a36a7ff974e2c7b6969557d40b3 (diff) | |
| parent | dce0eca34eab2016d6d11cb32f072db4079a4461 (diff) | |
| download | android_system_media-3b01dda6d0201e63b05db231e7746e1118eb4fae.tar.gz android_system_media-3b01dda6d0201e63b05db231e7746e1118eb4fae.tar.bz2 android_system_media-3b01dda6d0201e63b05db231e7746e1118eb4fae.zip | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/system/media into HEAD
Android 6.0.1 release 3
| -rw-r--r-- | alsa_utils/alsa_device_profile.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/alsa_utils/alsa_device_profile.c b/alsa_utils/alsa_device_profile.c index dd238e74..054c77a6 100644 --- a/alsa_utils/alsa_device_profile.c +++ b/alsa_utils/alsa_device_profile.c @@ -288,6 +288,12 @@ static unsigned profile_enum_channel_counts(alsa_device_profile* profile, unsign profile->channel_counts[num_counts++] = std_channel_counts[index]; } } + // if we have no match with the standard counts, we use the largest (preferred) std count. + if (num_counts == 0) { + ALOGW("usb device does not match std channel counts, setting to %d", + std_channel_counts[0]); + profile->channel_counts[num_counts++] = std_channel_counts[0]; + } profile->channel_counts[num_counts] = 0; return num_counts; /* return # of supported counts */ } |