diff options
| author | Andrew Hexen <SyberHexen@gmail.com> | 2020-06-08 13:01:21 -0700 |
|---|---|---|
| committer | Andrew Hexen <syberhexen@gmail.com> | 2020-07-05 04:15:28 +0200 |
| commit | 3ee32e77bc9929514ffdfd608789ebbe57e67aaa (patch) | |
| tree | 2dfa7d0cb1249905267a54daeab93a673d32e408 | |
| parent | 4ae3b19025b0ebd439e4d6fc451e43005d9e759f (diff) | |
river: audio: Fixup compress-voip paths
Signed-off-by: Andrew Hexen <SyberHexen@gmail.com>
Change-Id: I2ffd1fbc29bc435dd03c19b50d81959c15b503a6
| -rw-r--r-- | audio/mixer_paths.xml | 22 | ||||
| -rw-r--r-- | audio/mixer_paths_madera_epout.xml | 14 |
2 files changed, 24 insertions, 12 deletions
diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml index 92ad054..587b92f 100644 --- a/audio/mixer_paths.xml +++ b/audio/mixer_paths.xml @@ -506,6 +506,12 @@ <path name="compress-voip-call speaker"> <path name="compress-voip-call" /> + <path name="speaker" /> + </path> + + <path name="compress-voip-call speaker-and-headphones"> + <path name="compress-voip-call speaker" /> + <path name="headphones" /> </path> <path name="compress-voip-call bt-sco"> @@ -513,15 +519,15 @@ <ctl name="Voip_Tx Mixer SEC_AUX_PCM_TX_Voip" value="1" /> </path> - <path name="compress-voip-call bt-sco-wb"> - <ctl name="BT SampleRate" value="KHZ_16" /> - <path name="compress-voip-call bt-sco" /> - </path> + <path name="compress-voip-call bt-sco-wb"> + <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" /> + <path name="compress-voip-call bt-sco" /> + </path> - <path name="compress-voip-call afe-proxy"> - <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="1" /> - <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="1" /> - </path> + <path name="compress-voip-call afe-proxy"> + <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="1" /> + <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="1" /> + </path> <path name="multi-channel-playback afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" /> diff --git a/audio/mixer_paths_madera_epout.xml b/audio/mixer_paths_madera_epout.xml index ec2e8ae..159f765 100644 --- a/audio/mixer_paths_madera_epout.xml +++ b/audio/mixer_paths_madera_epout.xml @@ -506,15 +506,21 @@ <path name="compress-voip-call speaker"> <path name="compress-voip-call" /> + <path name="speaker" /> </path> - <path name="compress-voip-call bt-sco"> - <ctl name="SEC_AUX_PCM_RX_Voice Mixer Voip" value="1" /> - <ctl name="Voip_Tx Mixer SEC_AUX_PCM_TX_Voip" value="1" /> + <path name="compress-voip-call speaker-and-headphones"> + <path name="compress-voip-call speaker" /> + <path name="headphones" /> </path> + <path name="compress-voip-call bt-sco"> + <ctl name="SEC_AUX_PCM_RX_Voice Mixer Voip" value="1" /> + <ctl name="Voip_Tx Mixer SEC_AUX_PCM_TX_Voip" value="1" /> + </path> + <path name="compress-voip-call bt-sco-wb"> - <ctl name="BT SampleRate" value="KHZ_16" /> + <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" /> <path name="compress-voip-call bt-sco" /> </path> |