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

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

Merge "audio: Dynamic USB profile changes"

parents 590a3d97 484e8d2a

configs/msm8998/audio_policy_configuration.xml

+4 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="hifi_playback" role="source" />

                <mixPort name="compress_passthrough" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                    <profile name="" format="dynamic"
@@ -200,6 +201,7 @@ 
                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>

                </mixPort>

                <mixPort name="hifi_input" role="sink" />

            </mixPorts>



            <devicePorts>
@@ -329,7 +331,7 @@ 
                <route type="mix" sink="BT SCO All"

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

                <route type="mix" sink="USB Device Out"

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

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

                <route type="mix" sink="Telephony Tx"

                       sources="voice_tx"/>

                <route type="mix" sink="voice_rx"
@@ -348,6 +350,7 @@ 
                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>

                <route type="mix" sink="BT A2DP Speaker"

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

                <route type="mix" sink="hifi_input" sources="USB Device In" />

            </routes>



        </module>

configs/msm8998/mixer_paths_skuk.xml

+23 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ 
    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />

    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />

    <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
@@ -204,6 +205,7 @@ 
    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />

    <!-- usb headset -->

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

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

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

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

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="0" />
@@ -2594,4 +2596,25 @@ 
        <path name="audio-ull-playback bt-a2dp" />

        <path name="audio-ull-playback" />

    </path>



    <path name="hifi-playback display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-playback afe-proxy">

        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-playback usb-headset">

        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-playback usb-headphones">

        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-record usb-headset-mic">

        <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />

    </path>



</mixer>

configs/msm8998/mixer_paths_tasha.xml

+23 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ 
    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />

    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />

    <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
@@ -389,6 +390,7 @@ 
    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />

    <!-- usb headset -->

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

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

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

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

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="0" />
@@ -2935,4 +2937,25 @@ 
        <path name="audio-ull-playback bt-a2dp" />

        <path name="audio-ull-playback" />

    </path>



    <path name="hifi-playback display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-playback afe-proxy">

        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-playback usb-headset">

        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-playback usb-headphones">

        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-record usb-headset-mic">

        <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />

    </path>



</mixer>

configs/msm8998/mixer_paths_tavil.xml

+22 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ 
    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />

    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />

    <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
@@ -212,6 +213,7 @@ 
    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />

    <!-- usb headset -->

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

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

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

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

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="0" />
@@ -2801,4 +2803,24 @@ 
       <ctl name="MultiMedia16 Mixer USB_AUDIO_TX" value="1" />

    </path>



    <path name="hifi-playback display-port">

        <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-playback afe-proxy">

        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-playback usb-headset">

        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-playback usb-headphones">

        <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia2" value="1" />

    </path>



    <path name="hifi-record usb-headset-mic">

        <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />

    </path>



</mixer>

configs/sdm660/audio_policy_configuration.xml

+4 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="hifi_playback" role="source" />

                <mixPort name="compress_passthrough" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                    <profile name="" format="dynamic"
@@ -191,6 +192,7 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>

                </mixPort>

                <mixPort name="hifi_input" role="sink" />

            </mixPorts>



            <devicePorts>
@@ -320,7 +322,7 @@ 
                <route type="mix" sink="BT SCO All"

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

                <route type="mix" sink="USB Device Out"

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

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

                <route type="mix" sink="Telephony Tx"

                       sources="voice_tx"/>

                <route type="mix" sink="voice_rx"
@@ -337,6 +339,7 @@ 
                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>

                <route type="mix" sink="BT A2DP Speaker"

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

                <route type="mix" sink="hifi_input" sources="USB Device In" />

            </routes>



        </module>