ingres: audio: Fix invalid voice recognition stream KVs
Voice recognition streams are limited to one instance [1] and are only
available in TX direction. For some reason this broke apps like babbel,
thus split the stream definitions for voice recognition and deep buffer
again and only copy the relevant KVs from deep buffer to voice
recognition.
[1]: https://github.com/LineageOS/android_vendor_qcom_opensource_arpal-lx/blob/9cd03fda13439121d7e490ad47d494e83170c383/resource_manager/src/ResourceManager.cpp#L132
This fixes commit f8c84cbb52791517a225bebb6802b8b10f2c2e50 ("ingres:
audio: Use deep buffer calibration for voice recognition streams")
Change-Id: Ieff33dd1bbb7c74f21e7bcf557cb5034135b4c9d
diff --git a/audio/usecaseKvManager.xml b/audio/usecaseKvManager.xml
index 5b24224..4d466db 100644
--- a/audio/usecaseKvManager.xml
+++ b/audio/usecaseKvManager.xml
@@ -84,11 +84,7 @@
</keys_and_values>
</stream>
<!-- Deep Buffer stream -->
- <!--
- 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">
+ <stream type="PAL_STREAM_DEEP_BUFFER">
<keys_and_values Direction="RX" Instance="1">
<!-- STREAMRX - PCM_DEEP_BUFFER -->
<graph_kv key="0xA1000000" value="0xA1000001"/>
@@ -114,6 +110,18 @@
<graph_kv key="0xAB000000" value="0x2"/>
</keys_and_values>
</stream>
+ <!--
+ This device has no separate PAL_STREAM_VOICE_RECOGNITION calibration,
+ so fall back to the deep buffer values.
+ -->
+ <stream type="PAL_STREAM_VOICE_RECOGNITION">
+ <keys_and_values Direction="TX" Instance="1">
+ <!-- STREAMTX - PCM_RECORD -->
+ <graph_kv key="0xB1000000" value="0xB1000001"/>
+ <!-- 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">