commit ab805eeb44ca3333f91ff49ca9a9aafeaf3896df
author Eric Laurent <elaurent@google.com> Fri Mar 30 12:20:38 2018 -0700
committer Eric Laurent <elaurent@google.com> Mon Apr 02 22:18:43 2018 +0000
tree f5fda54544152d1ee71f03942e0af00524576755
parent a53524288ecd0358da72fd432332fb6fdf2fdf57

audio hal: fix format check for mmap no irq over USB.

Fix regression introduced by commit 0dedc2e7 preventing
MMAP no IRQ playback over USB when requested format is not
supported by USB device.

Bug: 75038760
Test: manual test with Oboe Tester.
Change-Id: Id6620bf23e7d1264a986822f7e157e33ff18e5b3

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 0343717..dfde0a8 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3951,12 +3951,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;
@@ -3974,9 +3978,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;