kunlun2: audio: Add hotword input for hotword mic concurrency

Bug: 126595113
Bug: 129733664
Bug: 133123985
Bug: 130316160

Test:
 (ST: sound trigger, VO: VoIP, PH: phone call,
  NR: media recording, PL: playback music)
 ST->VO (MO/MT),  ST->PH (MO/MT)
 ST->NR->PH (MO/MT), ST->NR->VO (MO/MT)
 ST->PL->PH (MO/MT), ST->PL->VO (MO/MT)
 ST->NR->PL->PH (MO/MT),  ST->NR->PL->VO (MO/MT)

Change-Id: I11513994c7a34364de38e00fc8ff999efe3dbb6c
Signed-off-by: Jasmine Cha <chajasmine@google.com>
Signed-off-by: SamarV-121 <samarvispute121@gmail.com>
This commit is contained in:
Jasmine Cha 2020-03-28 12:39:12 +01:00 committed by GiaSen
parent a6c5f9d7d5
commit 241e67c81c

View file

@ -169,6 +169,11 @@
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/> channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
</mixPort> </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="voip_tx" role="sink" <mixPort name="voip_tx" role="sink"
flags="AUDIO_INPUT_FLAG_VOIP_TX"> flags="AUDIO_INPUT_FLAG_VOIP_TX">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@ -333,6 +338,8 @@
sources="Telephony Rx"/> sources="Telephony Rx"/>
<route type="mix" sink="primary input" <route type="mix" sink="primary input"
sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In,Telephony Rx"/> sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In,Telephony Rx"/>
<route type="mix" sink="hotword input"
sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In,Telephony Rx"/>
<route type="mix" sink="voip_tx" <route type="mix" sink="voip_tx"
sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/> sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>
<route type="mix" sink="surround_sound" <route type="mix" sink="surround_sound"