commit 2fedf4a7c44b70c2ca47f34ee047a8b7a6195b0d
author qctecmdr <qctecmdr@localhost> Wed Nov 10 04:05:18 2021 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Nov 10 04:05:18 2021 -0800
tree ab465ce31c7b36f4f403a17c21f928348c9fbb23
parent b88c613c1b3738da37acd40c182b8f54a1478b26
parent 89da904ccbaf37da7a5760007bca5e20aacfa7b9

Merge "configs: add 24kHz sampling rate for mmap"

configs/common_au/audio_policy_configuration.xml

diff --git a/configs/common_au/audio_policy_configuration.xml b/configs/common_au/audio_policy_configuration.xml
index 5881470..bfb6362 100644
--- a/configs/common_au/audio_policy_configuration.xml
+++ b/configs/common_au/audio_policy_configuration.xml
@@ -128,7 +128,7 @@
                 </mixPort>
                 <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="8000,16000,24000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="voip_rx" role="source"
                          flags="AUDIO_OUTPUT_FLAG_VOIP_RX">

configs/msmnile_au/audio_policy_configuration.xml

diff --git a/configs/msmnile_au/audio_policy_configuration.xml b/configs/msmnile_au/audio_policy_configuration.xml
index 04685f4..e4533ac 100644
--- a/configs/msmnile_au/audio_policy_configuration.xml
+++ b/configs/msmnile_au/audio_policy_configuration.xml
@@ -110,7 +110,7 @@
                 </mixPort>
                 <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="8000,16000,24000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="compress_passthrough" role="source"
                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

configs/msmsteppe_au/audio_policy_configuration.xml

diff --git a/configs/msmsteppe_au/audio_policy_configuration.xml b/configs/msmsteppe_au/audio_policy_configuration.xml
index 1df2ce3..ea6e0e3 100644
--- a/configs/msmsteppe_au/audio_policy_configuration.xml
+++ b/configs/msmsteppe_au/audio_policy_configuration.xml
@@ -110,7 +110,7 @@
                 </mixPort>
                 <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="8000,16000,24000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="compress_passthrough" role="source"
                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index f42d644..6c35054 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -9627,6 +9627,7 @@
        in audio_policy_configuration.xml for mmap_no_irq_in */
     bool valid_mmap_record_rate = (config->sample_rate == 8000 ||
                                 config->sample_rate == 16000 ||
+                                config->sample_rate == 24000 ||
                                 config->sample_rate == 32000 ||
                                 config->sample_rate == 48000);
     if (valid_mmap_record_rate &&