davinci: audio: Adjust echo reference speaker path names for caf audio HAL

* Xiaomi's audio HAL uses the "echo-reference-voip speaker" path during voip
  calls in speaker mode, while the CAF hal uses the "echo-reference-voip" path.

* That led to an echo in voip speaker calls since xiaomi appends speaker
  to the path name and hence the echo reference wasn't set up properly, because
  xiaomi did not apply their echo-reference edits to the default path.

* To fix this we can apply xiaomi's "echo-reference speaker" and
  "echo-reference-voip speaker" as "echo-reference" and "echo-reference-voip".

* Remove the "echo-reference speaker" and "echo-reference-voip speaker" paths
  because they are the same as "echo-reference" and "echo-reference-voip" and
  even if the HAL will support speaker paths one day, it would not be needed for
  us since we don't need to differ between speaker and no suffix.

Change-Id: I9c2d42db6870c7f3579f5d96756a8bd4063022c8
This commit is contained in:
Arian
2020-08-17 12:43:42 +02:00
parent dcacd0142a
commit 374b2dc57a

View File

@@ -883,7 +883,9 @@
</path>
<path name="echo-reference">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="WSA_CDC_DMA_RX_0" />
<ctl name="EC Reference Channels" value="One"/>
<ctl name="EC Reference Bit Format" value="S24_LE"/>
<ctl name="AUDIO_REF_EC_UL1 MUX" value="I2S_RX" />
</path>
<path name="echo-reference headphones">
@@ -914,7 +916,8 @@
</path>
<path name="echo-reference-voip">
<ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
<ctl name="EC Reference Channels" value="One"/>
<ctl name="AUDIO_REF_EC_UL10 MUX" value="I2S_RX" />
</path>
<path name="echo-reference-voip headphones">
@@ -930,17 +933,6 @@
<ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />
</path>
<path name="echo-reference-voip speaker">
<ctl name="EC Reference Channels" value="One"/>
<ctl name="AUDIO_REF_EC_UL10 MUX" value="I2S_RX" />
</path>
<path name="echo-reference speaker">
<ctl name="EC Reference Channels" value="One"/>
<ctl name="EC Reference Bit Format" value="S24_LE"/>
<ctl name="AUDIO_REF_EC_UL1 MUX" value="I2S_RX" />
</path>
<path name="echo-reference-voip bt-sco-headset">
<ctl name="EC Reference Channels" value="One"/>
<ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />