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

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

Merge "configs: configure channel number for voip echo reference"

parents 4ab289fa 462a368c

configs/atoll/mixer_paths_idp.xml

+40 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ 
    <!-- HFP end -->

    <!-- echo reference -->

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

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

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

    <!-- usb headset -->

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -432,18 +434,56 @@ 


    <path name="echo-reference">

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

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

    </path>



    <path name="echo-reference handset">

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

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

    </path>



    <path name="echo-reference headphones">

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

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

    </path>



    <path name="echo-reference headset">

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

    </path>



    <path name="echo-reference display-port">

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

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

    </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"/>

    </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"/>

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

configs/atoll/mixer_paths_qrd.xml

+40 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ 
    <!-- HFP end -->

    <!-- echo reference -->

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

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

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

    <!-- usb headset -->

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -420,18 +422,56 @@ 


    <path name="echo-reference">

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

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

    </path>



    <path name="echo-reference handset">

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

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

    </path>



    <path name="echo-reference headphones">

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

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

    </path>



    <path name="echo-reference headset">

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

    </path>



    <path name="echo-reference display-port">

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

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

    </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"/>

    </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"/>

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

configs/atoll/mixer_paths_wcd9375.xml

+23 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ 
    <!-- echo reference -->

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

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

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

    <!-- usb headset -->

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -434,34 +435,56 @@ 


    <path name="echo-reference">

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

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

    </path>



    <path name="echo-reference handset">

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

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

    </path>



    <path name="echo-reference headphones">

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

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

    </path>



    <path name="echo-reference headset">

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

    </path>



    <path name="echo-reference display-port">

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

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

    </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"/>

    </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"/>

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

configs/atoll/mixer_paths_wcd9375qrd.xml

+19 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ 
    <!-- echo reference -->

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

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

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

    <!-- usb headset -->

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -435,38 +436,56 @@ 


    <path name="echo-reference">

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

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

    </path>



    <path name="echo-reference handset">

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

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

    </path>



    <path name="echo-reference headphones">

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

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

    </path>



    <path name="echo-reference headset">

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

    </path>



    <path name="echo-reference display-port">

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

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

    </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"/>

    </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"/>

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

configs/kona/mixer_paths.xml

+18 −0
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ 
    <!-- HFP end -->

    <!-- echo reference -->

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

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

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

    <!-- usb headset -->

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -444,10 +446,17 @@ 


    <path name="echo-reference">

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

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

    </path>



    <path name="echo-reference handset">

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

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

    </path>



    <path name="echo-reference headphones">

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

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

    </path>



    <path name="echo-reference headset">
@@ -456,18 +465,27 @@ 


    <path name="echo-reference display-port">

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

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

    </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"/>

    </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"/>

    </path>



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

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

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

    </path>



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

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

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

    </path>



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