Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97f732e3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "configs: Add echo reference for voip/voice call in bt-sco path"

parents 1fcfe702 de54b0bd

configs/atoll/mixer_paths.xml

+27 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.    -->

<!-- Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.    -->

<!--                                                                        -->

<!-- Redistribution and use in source and binary forms, with or without     -->

<!-- modification, are permitted provided that the following conditions are -->
@@ -489,6 +489,19 @@ 
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT1" />

    </path>



    <path name="echo-reference bt-sco">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />

        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference bt-sco-wb">

        <path name="echo-reference bt-sco" />

    </path>



    <path name="echo-reference bt-sco-swb">

        <path name="echo-reference bt-sco" />

    </path>



    <path name="echo-reference headphones-44.1">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />

        <ctl name="EC Reference Channels" value="Two"/>
@@ -519,6 +532,19 @@ 
        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference-voip bt-sco">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />

        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference-voip bt-sco-wb">

        <path name="echo-reference-voip bt-sco" />

    </path>



    <path name="echo-reference-voip bt-sco-swb">

        <path name="echo-reference-voip bt-sco" />

    </path>



    <path name="deep-buffer-playback">

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>

configs/atoll/mixer_paths_qrd.xml

+27 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.    -->

<!-- Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.    -->

<!--                                                                        -->

<!-- Redistribution and use in source and binary forms, with or without     -->

<!-- modification, are permitted provided that the following conditions are -->
@@ -489,6 +489,19 @@ 
        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference bt-sco">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />

        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference bt-sco-wb">

        <path name="echo-reference bt-sco" />

    </path>



    <path name="echo-reference bt-sco-swb">

        <path name="echo-reference bt-sco" />

    </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"/>
@@ -514,6 +527,19 @@ 
        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference-voip bt-sco">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />

        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference-voip bt-sco-wb">

        <path name="echo-reference-voip bt-sco" />

    </path>



    <path name="echo-reference-voip bt-sco-swb">

        <path name="echo-reference-voip bt-sco" />

    </path>



    <path name="deep-buffer-playback">

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>

configs/bengal/mixer_paths.xml

+26 −0
Original line number Diff line number Diff line
@@ -428,6 +428,19 @@ 
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />

    </path>



    <path name="echo-reference bt-sco">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />

        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference bt-sco-wb">

        <path name="echo-reference bt-sco" />

    </path>



    <path name="echo-reference bt-sco-swb">

        <path name="echo-reference bt-sco" />

    </path>



    <path name="echo-reference-voip">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_1" />

    </path>
@@ -436,6 +449,19 @@ 
        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />

    </path>



    <path name="echo-reference-voip bt-sco">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />

        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference-voip bt-sco-wb">

        <path name="echo-reference-voip bt-sco" />

    </path>



    <path name="echo-reference-voip bt-sco-swb">

        <path name="echo-reference-voip bt-sco" />

    </path>



    <path name="deep-buffer-playback">

        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia1" value="1" />

    </path>

configs/bengal/mixer_paths_qrd.xml

+27 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.    -->

<!-- Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.    -->

<!--                                                                        -->

<!-- Redistribution and use in source and binary forms, with or without     -->

<!-- modification, are permitted provided that the following conditions are -->
@@ -426,6 +426,19 @@ 
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />

    </path>



    <path name="echo-reference bt-sco">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />

        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference bt-sco-wb">

        <path name="echo-reference bt-sco" />

    </path>



    <path name="echo-reference bt-sco-swb">

        <path name="echo-reference bt-sco" />

    </path>



    <path name="echo-reference-voip">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_1" />

    </path>
@@ -438,6 +451,19 @@ 
        <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />

    </path>



    <path name="echo-reference-voip bt-sco">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />

        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference-voip bt-sco-wb">

        <path name="echo-reference-voip bt-sco" />

    </path>



    <path name="echo-reference-voip bt-sco-swb">

        <path name="echo-reference-voip bt-sco" />

    </path>



    <path name="deep-buffer-playback">

        <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia1" value="1" />

    </path>

configs/kona/mixer_paths.xml

+26 −0
Original line number Diff line number Diff line
@@ -493,6 +493,19 @@ 
        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference bt-sco">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />

        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference bt-sco-wb">

        <path name="echo-reference bt-sco" />

    </path>



    <path name="echo-reference bt-sco-swb">

        <path name="echo-reference bt-sco" />

    </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="Two"/>
@@ -508,6 +521,19 @@ 
        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference-voip bt-sco">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />

        <ctl name="EC Reference Channels" value="Two"/>

    </path>



    <path name="echo-reference-voip bt-sco-wb">

        <path name="echo-reference-voip bt-sco" />

    </path>



    <path name="echo-reference-voip bt-sco-swb">

        <path name="echo-reference-voip bt-sco" />

    </path>



    <path name="deep-buffer-playback">

        <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>