commit 164bfc779d9ef3d58cdcf83ab3afb4f88699a15e
author Eric Laurent <elaurent@google.com> Mon Apr 02 23:53:15 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 02 23:53:15 2018 +0000
tree 7f2c528f205c7883f84ed2667c1b7f3194f8cb32
parent c367c42856361ef11c27d77df319865aa9539719
parent 723c9260293a48dba8e39e5bf504b8801c206db3

Merge "audio hal: fix format check for mmap no irq over USB." into pi-dev
am: 723c926029

Change-Id: I3d80c91b289fc740bbf229a21608fbbd7936a6e8

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index f3e8f82..adaf44e 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3981,12 +3981,16 @@
         (audio_is_linear_pcm(config->format) || config->format == AUDIO_FORMAT_DEFAULT) &&
         (flags == AUDIO_OUTPUT_FLAG_NONE ||
         (flags & AUDIO_OUTPUT_FLAG_DIRECT) != 0)) {
+        audio_format_t req_format = config->format;
+        audio_channel_mask_t req_channel_mask = config->channel_mask;
+        uint32_t req_sample_rate = config->sample_rate;
+
         pthread_mutex_lock(&adev->lock);
         if (is_hdmi) {
             ret = read_hdmi_channel_masks(out);
             if (config->sample_rate == 0)
                 config->sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
-            if (config->channel_mask == 0)
+            if (config->channel_mask == AUDIO_CHANNEL_NONE)
                 config->channel_mask = AUDIO_CHANNEL_OUT_5POINT1;
             if (config->format == AUDIO_FORMAT_DEFAULT)
                 config->format = AUDIO_FORMAT_PCM_16_BIT;
@@ -4004,9 +4008,18 @@
             ALOGV("plugged dev USB ret %d", ret);
         }
         pthread_mutex_unlock(&adev->lock);
-        if (ret != 0)
-            goto error_open;
+        if (ret != 0) {
+            // For MMAP NO IRQ, allow conversions in ADSP
+            if (is_hdmi || (flags & AUDIO_OUTPUT_FLAG_MMAP_NOIRQ) == 0)
+                goto error_open;
 
+            if (req_sample_rate != 0 && config->sample_rate != req_sample_rate)
+                config->sample_rate = req_sample_rate;
+            if (req_channel_mask != AUDIO_CHANNEL_NONE && config->channel_mask != req_channel_mask)
+                config->channel_mask = req_channel_mask;
+            if (req_format != AUDIO_FORMAT_DEFAULT && config->format != req_format)
+                config->format = req_format;
+        }
 
         out->sample_rate = config->sample_rate;
         out->channel_mask = config->channel_mask;