diff options
| author | Carter Hsu <carterhsu@google.com> | 2019-05-31 01:13:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-31 01:13:47 +0000 |
| commit | 6f28bfbe18b24aacd79b67eb8f4f623363ea0578 (patch) | |
| tree | ba3f39c45af04618c741182b61f13019182e03f3 | |
| parent | e8e2c36aa51c05aa6123a09ab3ccd516bfb54681 (diff) | |
| parent | 928955b4642a44c0e9cc027b2d0aad2e3d8f5e60 (diff) | |
| download | device_google_wahoo-6f28bfbe18b24aacd79b67eb8f4f623363ea0578.tar.gz device_google_wahoo-6f28bfbe18b24aacd79b67eb8f4f623363ea0578.tar.bz2 device_google_wahoo-6f28bfbe18b24aacd79b67eb8f4f623363ea0578.zip | |
Merge "audio: enable soundtrigger concurrent cpature" into qt-dev
| -rw-r--r-- | audio_policy_configuration.xml | 7 | ||||
| -rw-r--r-- | audio_policy_configuration_bluetooth_legacy_hal.xml | 7 | ||||
| -rw-r--r-- | sound_trigger_platform_info.xml | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/audio_policy_configuration.xml b/audio_policy_configuration.xml index 4ad3f6d2..38b267df 100644 --- a/audio_policy_configuration.xml +++ b/audio_policy_configuration.xml @@ -84,6 +84,11 @@ samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/> </mixPort> + <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD" maxActiveCount="0" > + <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" + samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" + channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> + </mixPort> <mixPort name="fast input" role="sink" flags="AUDIO_INPUT_FLAG_FAST"> <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" @@ -159,6 +164,8 @@ sources="voice_tx,incall_music_uplink"/> <route type="mix" sink="primary input" sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> + <route type="mix" sink="hotword input" + sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="fast input" sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="voice_rx" diff --git a/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio_policy_configuration_bluetooth_legacy_hal.xml index 5dac2925..26dbdeda 100644 --- a/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -84,6 +84,11 @@ samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/> </mixPort> + <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD" maxActiveCount="0" > + <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" + samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" + channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> + </mixPort> <mixPort name="fast input" role="sink" flags="AUDIO_INPUT_FLAG_FAST"> <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" @@ -159,6 +164,8 @@ sources="voice_tx,incall_music_uplink"/> <route type="mix" sink="primary input" sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> + <route type="mix" sink="hotword input" + sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="fast input" sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="voice_rx" diff --git a/sound_trigger_platform_info.xml b/sound_trigger_platform_info.xml index a863bbb4..8a478465 100644 --- a/sound_trigger_platform_info.xml +++ b/sound_trigger_platform_info.xml @@ -33,6 +33,7 @@ <param max_ape_sessions="8" /> <param enable_failure_detection="false" /> <param support_device_switch="false" /> + <param concurrent_capture="true" /> </common_config> <acdb_ids> <param DEVICE_HANDSET_MIC_APE="100" /> |