From 12a5e8f4671423957aca40070493c39211e15723 Mon Sep 17 00:00:00 2001
From: Robert Lee <lerobert@google.com>
Date: Thu, 24 Jun 2021 07:20:40 +0000
Subject: [PATCH] audio: update audio table

<Change List>
For audio_platform_configuration.xml to both O6 & R4,
1. Add below devices for input_backend_cfg_mic_mapping to fix b/188696633.
     - <backend_cfg in_cfg="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG">
     - <backend_cfg in_cfg="IN_CAMCORDER_PORTRAIT_BE_CFG">
     - <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG">
     - <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG">
     - <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG">
     - <backend_cfg in_cfg="IN_VOICE_RECOGN_MIC_BE_CFG">
     - <backend_cfg in_cfg="IN_UNPROCESSED_MIC_BE_CFG">
     - <backend_cfg in_cfg="IN_UNPROCESSED_DUAL_MIC_BE_CFG">
     - <backend_cfg in_cfg="IN_UNPROCESSED_TRIPLE_MIC_BE_CFG">

<Validation Results>
All the regression are positive, which is validated based on SD1A.210614.001 build.
1. Fix freeze issue when running Diagnostic Tool for microphone test.
2. Built-in mic capturing with expected gain setup and active mic numbers in different mic source(mic/VR/unprocessed/camcorder).
3. Built-in speaker playout with expected gain setup in speaker & speaker-safe mode.
4. Both uplink & downlink for telephony works in HA/HH mode.

Bug: 174448901
Test: Builds pass and verified by hardware
Change-Id: Ifb14911eb25ef2b0f42d29b609ae6f9b74ddaa44
Signed-off-by: Robert Lee <lerobert@google.com>
---
 .../config/audio_platform_configuration.xml   | 62 +++++++++++++++++++
 .../config/audio_platform_configuration.xml   | 62 +++++++++++++++++++
 2 files changed, 124 insertions(+)

diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml
index 57c3857..9943bf9 100644
--- a/audio/oriole/config/audio_platform_configuration.xml
+++ b/audio/oriole/config/audio_platform_configuration.xml
@@ -81,6 +81,46 @@
                 <mic_info mic_device_id="builtin_mic_3"
                     channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
             </backend_cfg>
+            <backend_cfg in_cfg="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_3"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_CAMCORDER_PORTRAIT_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_3"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_3"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_3"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_3"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+            </backend_cfg>
             <backend_cfg in_cfg="IN_HANDSET_MIC_BE_CFG">
                 <mic_info mic_device_id="builtin_mic_1"
                     channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
@@ -107,6 +147,28 @@
                 <mic_info mic_device_id="builtin_mic_3"
                     channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
             </backend_cfg>
+            <backend_cfg in_cfg="IN_VOICE_RECOGN_MIC_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_UNPROCESSED_MIC_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_UNPROCESSED_DUAL_MIC_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_UNPROCESSED_TRIPLE_MIC_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                <mic_info mic_device_id="builtin_mic_3"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+            </backend_cfg>
     </input_backend_cfg_mic_mapping>
 
     <usecase_attr>
diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml
index 57c3857..9943bf9 100644
--- a/audio/raven/config/audio_platform_configuration.xml
+++ b/audio/raven/config/audio_platform_configuration.xml
@@ -81,6 +81,46 @@
                 <mic_info mic_device_id="builtin_mic_3"
                     channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
             </backend_cfg>
+            <backend_cfg in_cfg="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_3"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_CAMCORDER_PORTRAIT_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_3"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_3"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_3"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                <mic_info mic_device_id="builtin_mic_3"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+            </backend_cfg>
             <backend_cfg in_cfg="IN_HANDSET_MIC_BE_CFG">
                 <mic_info mic_device_id="builtin_mic_1"
                     channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
@@ -107,6 +147,28 @@
                 <mic_info mic_device_id="builtin_mic_3"
                     channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
             </backend_cfg>
+            <backend_cfg in_cfg="IN_VOICE_RECOGN_MIC_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_UNPROCESSED_MIC_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_UNPROCESSED_DUAL_MIC_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+            </backend_cfg>
+            <backend_cfg in_cfg="IN_UNPROCESSED_TRIPLE_MIC_BE_CFG">
+                <mic_info mic_device_id="builtin_mic_1"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                <mic_info mic_device_id="builtin_mic_2"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
+                <mic_info mic_device_id="builtin_mic_3"
+                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
+            </backend_cfg>
     </input_backend_cfg_mic_mapping>
 
     <usecase_attr>