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

Commit 1bfc7bd3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "configs: enable use of dp for voip/voice"

parents 7479fa06 d941eaec

configs/sdm845/audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ 
                <route type="mix" sink="Line"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx,mmap_no_irq_out"/>

                <route type="mix" sink="HDMI"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough"/>

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough,voip_rx"/>

                <route type="mix" sink="Proxy"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>

                <route type="mix" sink="FM"

configs/sdm845/mixer_paths_tavil.xml

+28 −0
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ 
    <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="0" />

    <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode1" value="0" />

    <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="0" />

    <!-- Multimode Voice1 Display-Port -->

    <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="0" />

    <!-- Miltimode Voice1 end-->



    <!-- Multimode Voice2 -->
@@ -243,6 +245,8 @@ 
    <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2" value="0" />

    <ctl name="USB_AUDIO_RX_Voice Mixer VoiceMMode2" value="0" />

    <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="0" />

    <!-- Multimode Voice2 Display-Port -->

    <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="0" />

    <!-- Multimode Voice2 end-->



    <!-- Voice external ec. reference -->
@@ -535,6 +539,10 @@ 
        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />

    </path>



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

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

    </path>



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

    </path>
@@ -1621,6 +1629,16 @@ 
        <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call display-port-and-usb-headset-mic">

        <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call display-port">

        <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />

    </path>



    <path name="voicemmode2-call">

        <ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
@@ -1656,6 +1674,16 @@ 
        <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call display-port-and-usb-headset-mic">

        <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call display-port">

        <ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />

    </path>



    <!-- VoIP Rx settings -->

    <path name="audio-playback-voip">

        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />

configs/sdm845/sdm845.mk

+3 −0
Original line number Diff line number Diff line
@@ -231,6 +231,9 @@ vendor.audio_hal.period_multiplier=3 
PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.adm.buffering.ms=2



#enable use of display-port for voice usecases

vendor.audio.enable.dp.for.voice=false



# for HIDL related packages

PRODUCT_PACKAGES += \

    android.hardware.audio@2.0-service \