ingres: audio: Use deep buffer calibration for voice recognition streams
Stock doesn't use the voice recognition stream and supposedly our acdb data
does not include these streams, leading to the stream failing to open.
04-11 00:28:40.627 1280 5170 E ACDB : hardware/qcom-caf/sm8450/audio/graphservices/acdb/src/acdb_command.c:AcdbCmdGetGraphAlias:4253 Error[19]: Unable to find the graph key vector
Change-Id: I805b6f69cd914a16212c6494b12d41cb9598085b
diff --git a/audio/usecaseKvManager.xml b/audio/usecaseKvManager.xml
index ceeb3fe..7bc73ab 100644
--- a/audio/usecaseKvManager.xml
+++ b/audio/usecaseKvManager.xml
@@ -84,7 +84,11 @@
</keys_and_values>
</stream>
<!-- Deep Buffer stream -->
- <stream type="PAL_STREAM_DEEP_BUFFER">
+ <!--
+ This device has no separate PAL_STREAM_VOICE_RECOGNITION calibration,
+ so fall back to the deep buffer values.
+ -->
+ <stream type="PAL_STREAM_DEEP_BUFFER,PAL_STREAM_VOICE_RECOGNITION">
<keys_and_values Direction="RX" Instance="1">
<!-- STREAMRX - PCM_DEEP_BUFFER -->
<graph_kv key="0xA1000000" value="0xA1000001"/>
@@ -110,14 +114,6 @@
<graph_kv key="0xAB000000" value="0x2"/>
</keys_and_values>
</stream>
- <stream type="PAL_STREAM_VOICE_RECOGNITION">
- <keys_and_values Direction="TX" Instance="1">
- <!-- STREAMTX - VOICE_RECOGNITION_RECORD -->
- <graph_kv key="0xB1000000" value="0xB1000011"/>
- <!-- INSTANCE - INSTANCE_1 -->
- <graph_kv key="0xAB000000" value="0x1"/>
- </keys_and_values>
- </stream>
<!-- Compressed-playback stream -->
<stream type="PAL_STREAM_COMPRESSED">
<keys_and_values Direction="RX" Instance="1">
@@ -833,13 +829,11 @@
</devicepp>
<!-- IN Handset MIC DevicePPs -->
<devicepp id="PAL_DEVICE_IN_HANDSET_MIC">
- <keys_and_values StreamType="PAL_STREAM_VOICE_RECOGNITION">
- <!-- DEVICETX - HANDSETMIC -->
- <graph_kv key="0xA3000000" value="0xA3000004"/>
- <!-- DEVICEPP_TX - DEVICEPP_TX_VOICE_RECOGNITION -->
- <graph_kv key="0xAD000000" value="0xAD000017"/>
- </keys_and_values>
- <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER">
+ <!--
+ This device has no separate PAL_STREAM_VOICE_RECOGNITION calibration,
+ so fall back to the deep buffer values.
+ -->
+ <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER,PAL_STREAM_VOICE_RECOGNITION">
<!-- DEVICETX - HANDSETMIC -->
<graph_kv key="0xA3000000" value="0xA3000004"/>
<!-- DEVICEPP_TX - DEVICEPP_TX_AUDIO_FLUENCE_SMECNS -->
@@ -914,13 +908,11 @@
</devicepp>
<!-- IN Speaker MIC DevicePPs -->
<devicepp id="PAL_DEVICE_IN_SPEAKER_MIC">
- <keys_and_values StreamType="PAL_STREAM_VOICE_RECOGNITION">
- <!-- DEVICETX - Speaker MIC -->
- <graph_kv key="0xA3000000" value="0xA3000001"/>
- <!-- DEVICEPP_TX - DEVICEPP_TX_VOICE_RECOGNITION -->
- <graph_kv key="0xAD000000" value="0xAD000017"/>
- </keys_and_values>
- <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER">
+ <!--
+ This device has no separate PAL_STREAM_VOICE_RECOGNITION calibration,
+ so fall back to the deep buffer values.
+ -->
+ <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER,PAL_STREAM_VOICE_RECOGNITION">
<!-- DEVICETX - SPEAKER_MIC -->
<graph_kv key="0xA3000000" value="0xA3000001"/>
<!-- DEVICEPP_TX - DEVICEPP_TX_AUDIO_FLUENCE_SMECNS -->
@@ -995,7 +987,11 @@
</devicepp>
<!-- IN BT_SCO_Headset DevicePPs -->
<devicepp id="PAL_DEVICE_IN_BLUETOOTH_SCO_HEADSET">
- <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER">
+ <!--
+ This device has no separate PAL_STREAM_VOICE_RECOGNITION calibration,
+ so fall back to the deep buffer values.
+ -->
+ <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER,PAL_STREAM_VOICE_RECOGNITION">
<!-- DEVICETX - BT_TX -->
<graph_kv key="0xA3000000" value="0xA3000002"/>
<!-- DEVICEPP_TX - DEVICEPP_TX_AUDIO_FLUENCE_SMECNS -->
@@ -1013,16 +1009,14 @@
<!-- DEVICEPP_TX - DEVICEPP_TX_VOIP_FLUENCE_SMECNS -->
<graph_kv key="0xAD000000" value="0xAD000007"/>
</keys_and_values>
- <keys_and_values StreamType="PAL_STREAM_VOICE_RECOGNITION">
- <!-- DEVICETX - BT_TX -->
- <graph_kv key="0xA3000000" value="0xA3000002"/>
- <!-- DEVICEPP_TX - DEVICEPP_TX_VOICE_RECOGNITION -->
- <graph_kv key="0xAD000000" value="0xAD000017"/>
- </keys_and_values>
</devicepp>
<!--IN Wired headset_IN DevicePPs -->
<devicepp id="PAL_DEVICE_IN_WIRED_HEADSET">
- <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER">
+ <!--
+ This device has no separate PAL_STREAM_VOICE_RECOGNITION calibration,
+ so fall back to the deep buffer values.
+ -->
+ <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER,PAL_STREAM_VOICE_RECOGNITION">
<!-- DEVICETX - HEADPHONE_MIC -->
<graph_kv key="0xA3000000" value="0xA3000003"/>
<!-- DEVICEPP_TX - DEVICEPP_TX_AUDIO_FLUENCE_SMECNS -->
@@ -1040,16 +1034,14 @@
<!-- DEVICEPP_TX - DEVICEPP_TX_VOIP_FLUENCE_SMECNS -->
<graph_kv key="0xAD000000" value="0xAD000007"/>
</keys_and_values>
- <keys_and_values StreamType="PAL_STREAM_VOICE_RECOGNITION">
- <!-- DEVICETX - HEADPHONE_MIC -->
- <graph_kv key="0xA3000000" value="0xA3000003"/>
- <!-- DEVICEPP_TX - DEVICEPP_TX_VOICE_RECOGNITION -->
- <graph_kv key="0xAD000000" value="0xAD000017"/>
- </keys_and_values>
</devicepp>
<!-- IN USB device and USB headset DevicePPs -->
<devicepp id="PAL_DEVICE_IN_USB_DEVICE,PAL_DEVICE_IN_USB_HEADSET">
- <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER">
+ <!--
+ This device has no separate PAL_STREAM_VOICE_RECOGNITION calibration,
+ so fall back to the deep buffer values.
+ -->
+ <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER,PAL_STREAM_VOICE_RECOGNITION">
<!-- DEVICETX - USB_TX -->
<graph_kv key="0xA3000000" value="0xA3000005"/>
<!-- DEVICEPP_TX - DEVICEPP_TX_AUDIO_FLUENCE_SMECNS -->
@@ -1067,12 +1059,6 @@
<!-- DEVICEPP_TX - DEVICEPP_TX_VOIP_FLUENCE_SMECNS -->
<graph_kv key="0xAD000000" value="0xAD000007"/>
</keys_and_values>
- <keys_and_values StreamType="PAL_STREAM_VOICE_RECOGNITION">
- <!-- DEVICETX - USB_Tx -->
- <graph_kv key="0xA3000000" value="0xA3000005"/>
- <!-- DEVICEPP_TX - DEVICEPP_TX_VOICE_RECOGNITION -->
- <graph_kv key="0xAD000000" value="0xAD000017"/>
- </keys_and_values>
</devicepp>
<!-- IN Handset_VA_MIC DevicePPs -->
<devicepp id="PAL_DEVICE_IN_HANDSET_VA_MIC">