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

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

Merge "configs:sm6150: Enable incall music feature for sm6150"

parents fae14417 b89db53f

configs/msmsteppe/audio_platform_info.xml

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="33" />

        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="33" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="12" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="27" />

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsatz.13"/>

configs/msmsteppe/audio_platform_info_intcodec.xml

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" />

        <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="12" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="27" />

    </pcm_ids>

    <config_params>

        <!-- In the below value string, the value indicates default mono -->

configs/msmsteppe/audio_platform_info_qrd.xml

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" />

        <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="12" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="27" />

    </pcm_ids>

    <config_params>

        <!-- In the below value string, the value indicates default mono -->

configs/msmsteppe/audio_policy_configuration.xml

+7 −1
Original line number Diff line number Diff line
@@ -176,6 +176,12 @@ 
                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </mixPort>

                <mixPort name="incall_music_uplink" role="source"

                        flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="surround_sound" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
@@ -347,7 +353,7 @@ 
                <route type="mix" sink="USB Headset 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"/>

                       sources="voice_tx,incall_music_uplink"/>

                <route type="mix" sink="voice_rx"

                       sources="Telephony Rx"/>

                <route type="mix" sink="primary input"

configs/msmsteppe/mixer_paths_idp.xml

+38 −35
Original line number Diff line number Diff line
@@ -1816,76 +1816,79 @@ 
        <ctl name="MultiMedia2 Mixer USB_AUDIO_TX" value="1" />

    </path>



    <path name="incall-music-uplink">

    <path name="incall_music_uplink">

        <ctl name="Incall_Music Audio Mixer MultiMedia9" value="1" />

    </path>



    <path name="incall-music-uplink speaker">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink speaker">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink handset">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink handset">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink handset-hac">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink handset-hac">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink display-port">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink display-port">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink bt-sco">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink bt-sco">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink bt-sco-wb">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink bt-sco-wb">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink speaker-and-display-port">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink speaker-and-display-port">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink afe-proxy">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink afe-proxy">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink usb-headphones">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink usb-headphones">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink usb-headset">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink usb-headset">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink speaker-and-usb-headphones">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink speaker-and-usb-headphones">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink headphones">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink headphones">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink speaker-and-headphones">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink speaker-and-headphones">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink speaker-and-bt-sco">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink speaker-and-bt-sco">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink voice-tty-hco-handset">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink voice-tty-hco-handset">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink speaker-and-bt-a2dp">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink speaker-and-bt-a2dp">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall-music-uplink bt-a2dp">

        <path name="incall-music-uplink" />

    <path name="incall_music_uplink bt-a2dp">

        <path name="incall_music_uplink" />

    </path>

    <path name="incall_music_uplink afe-proxy">

        <path name="incall_music_uplink" />

    </path>



   <path name="spkr-rx-calib">