commit 7f47fe3a5b8fb86ae8ec877bbb6cd5069751ad28
author qctecmdr <qctecmdr@localhost> Wed Mar 18 07:58:44 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 18 07:58:44 2020 -0700
tree 8365c098337bd3b239cd45c7ada273a47e0ccc5b
parent 0dfb45404ebf29fc60ab8e42a4d4be995456a560
parent dbd205611be70a5e1b6443ee1a3ea83fdb4d3342

Merge "hal: reset default parameters when ignoring non-existing USB sound card"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index ded16ca..bd6dad5 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -7461,6 +7461,12 @@
         devices = AUDIO_DEVICE_OUT_SPEAKER;
         ALOGW("%s: ignore set device to non existing USB card, use output device(%#x)",
               __func__, devices);
+        if (config->format == AUDIO_FORMAT_DEFAULT)
+            config->format = AUDIO_FORMAT_PCM_16_BIT;
+        if (config->sample_rate == 0)
+            config->sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
+        if (config->channel_mask == AUDIO_CHANNEL_NONE)
+            config->channel_mask = AUDIO_CHANNEL_OUT_STEREO;
     }
 
     *stream_out = NULL;