Merge "audio: support ultrasonic capture 3 ch" into tm-qpr-dev am: 2e48dda005 am: c09805d66d

Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/20743906

Change-Id: I70836a8b860b6ef45faf25b41301f2dd3bed952d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot 2023-01-04 08:40:01 +00:00 committed by Automerger Merge Worker
commit 96524266f5
4 changed files with 4 additions and 4 deletions

View file

@ -123,7 +123,7 @@
<mixPort name="ultrasound input" role="sink" <mixPort name="ultrasound input" role="sink"
flags="AUDIO_INPUT_FLAG_ULTRASOUND"> flags="AUDIO_INPUT_FLAG_ULTRASOUND">
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="96000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/> samplingRates="96000" channelMasks="AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort> </mixPort>
</mixPorts> </mixPorts>
<devicePorts> <devicePorts>

View file

@ -123,7 +123,7 @@
<mixPort name="ultrasound input" role="sink" <mixPort name="ultrasound input" role="sink"
flags="AUDIO_INPUT_FLAG_ULTRASOUND"> flags="AUDIO_INPUT_FLAG_ULTRASOUND">
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="96000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/> samplingRates="96000" channelMasks="AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort> </mixPort>
</mixPorts> </mixPorts>
<devicePorts> <devicePorts>

View file

@ -123,7 +123,7 @@
<mixPort name="ultrasound input" role="sink" <mixPort name="ultrasound input" role="sink"
flags="AUDIO_INPUT_FLAG_ULTRASOUND"> flags="AUDIO_INPUT_FLAG_ULTRASOUND">
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="96000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/> samplingRates="96000" channelMasks="AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort> </mixPort>
</mixPorts> </mixPorts>
<devicePorts> <devicePorts>

View file

@ -921,7 +921,7 @@
<path name="ultrasound-mic"> <path name="ultrasound-mic">
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0"/> <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0"/>
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="3"/> <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="3"/>
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1"/> <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="2"/>
<ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1"/> <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1"/>
</path> </path>