summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorCarter Hsu <carterhsu@google.com>2023-12-26 09:56:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-12-26 09:56:17 +0000
commit397cab2166839652eb3e90cd06129338b75fd272 (patch)
tree1d158bf3a3c0093a66f23330da7e234803c09401 /audio
parenteb8b431a836302c3956bd4cd79ba1da2de08416e (diff)
parentbfa3513cdc6acf4e43dcb302b28f1cbec3c8c53d (diff)
downloadshusky-397cab2166839652eb3e90cd06129338b75fd272.tar.gz
Merge "audio: support incall capture dl/ul concurrent recording" into main
Diffstat (limited to 'audio')
-rw-r--r--audio/husky/config/audio_policy_configuration.xml2
-rw-r--r--audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml2
-rw-r--r--audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml2
-rw-r--r--audio/husky/config/audio_policy_configuration_le_offload_disabled.xml2
-rw-r--r--audio/shiba/config/audio_policy_configuration.xml2
-rw-r--r--audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml2
-rw-r--r--audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml2
-rw-r--r--audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml2
8 files changed, 8 insertions, 8 deletions
diff --git a/audio/husky/config/audio_policy_configuration.xml b/audio/husky/config/audio_policy_configuration.xml
index a9120dd..ac241e4 100644
--- a/audio/husky/config/audio_policy_configuration.xml
+++ b/audio/husky/config/audio_policy_configuration.xml
@@ -97,7 +97,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
- <mixPort name="incall capture" role="sink">
+ <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml
index d0dbd1e..7175981 100644
--- a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -97,7 +97,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
- <mixPort name="incall capture" role="sink">
+ <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 5c5602c..0755fec 100644
--- a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -90,7 +90,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
- <mixPort name="incall capture" role="sink">
+ <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml
index 82b3017..bfd76a7 100644
--- a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml
@@ -97,7 +97,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
- <mixPort name="incall capture" role="sink">
+ <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/shiba/config/audio_policy_configuration.xml b/audio/shiba/config/audio_policy_configuration.xml
index a9120dd..9c8f2f9 100644
--- a/audio/shiba/config/audio_policy_configuration.xml
+++ b/audio/shiba/config/audio_policy_configuration.xml
@@ -97,7 +97,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
- <mixPort name="incall capture" role="sink">
+ <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml
index d0dbd1e..7175981 100644
--- a/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -97,7 +97,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
- <mixPort name="incall capture" role="sink">
+ <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 5c5602c..0755fec 100644
--- a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -90,7 +90,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
- <mixPort name="incall capture" role="sink">
+ <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml
index 82b3017..0f6f636 100644
--- a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml
@@ -97,7 +97,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
- <mixPort name="incall capture" role="sink">
+ <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/>