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

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

Merge "config : msm8998 : add call screen support configurations"

parents b00a1082 61c3215d

configs/msm8998/audio_platform_info.xml

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

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

<!-- Copyright (c) 2014, 2016-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 -->
@@ -66,6 +66,8 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_SILENCE" type="out" id="27" />

        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="33" />

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

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

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

    </pcm_ids>

    <config_params>

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

configs/msm8998/audio_policy_configuration.xml

+10 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

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

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

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project
@@ -21,7 +21,7 @@ 
    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->



    <!-- Global configuration Decalaration -->

    <globalConfiguration speaker_drc_enabled="true"/>

    <globalConfiguration speaker_drc_enabled="true" call_screen_mode_supported="true"/>





    <!-- Modules section:
@@ -167,6 +167,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="voip_tx" role="sink"

                         flags="AUDIO_INPUT_FLAG_VOIP_TX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -327,6 +333,8 @@ 
                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>

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

                       sources="primary output"/>

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

                       sources="voice_tx,incall_music_uplink"/>

                <route type="mix" sink="BT SCO"

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

                <route type="mix" sink="BT SCO Headset"

configs/msm8998/mixer_paths.xml

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

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

<!-- Copyright (c) 2015-2016, 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 -->
@@ -231,6 +231,9 @@ 
    <!-- Multimode Voice1 USB headset -->

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

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

    <!-- Multimode Voice1 proxy-Port -->

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

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

    <!-- Miltimode Voice1 end-->



    <!-- Multimode Voice2 -->
@@ -244,6 +247,9 @@ 
    <!-- Multimode Voice2 USB headset -->

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

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

    <!-- Multimode Voice2 proxy-Port -->

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

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

    <!-- Multimode Voice2 end-->



    <!-- RT Proxy Cal -->
@@ -261,6 +267,7 @@ 
    <!-- Incall Music -->

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

    <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="0" />

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

    <!-- Incall Music End -->



    <!-- compress-voip-call start -->
@@ -1096,6 +1103,10 @@ 
        <path name="incall-rec-uplink-compress" />

    </path>



    <path name="incall-rec-uplink call-proxy-in">

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

    </path>



    <path name="incall-rec-downlink">

        <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="1" />

    </path>
@@ -1136,6 +1147,10 @@ 
        <path name="incall-rec-downlink-compress" />

    </path>



    <path name="incall-rec-downlink call-proxy-in">

        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink">

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

        <path name="incall-rec-downlink" />
@@ -1178,6 +1193,10 @@ 
        <path name="incall-rec-uplink-and-downlink-compress" />

    </path>



    <path name="incall-rec-uplink-and-downlink call-proxy-in">

        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="incall_music_uplink">

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

    </path>
@@ -1347,6 +1366,11 @@ 
        <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />

    </path>



    <path name="voicemmode1-call call-proxy">

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

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

    </path>



    <path name="voicemmode1-call hdmi">

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

        <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
@@ -1377,6 +1401,11 @@ 
        <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />

    </path>



    <path name="voicemmode2-call call-proxy">

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

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

    </path>



    <path name="voicemmode2-call hdmi">

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

        <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
@@ -2245,4 +2274,183 @@ 
    <path name="voice-tx">

    </path>



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



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



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



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



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



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



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

        <path name="incall_music_uplink" />

    </path>



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



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

        <path name="incall_music_uplink" />

    </path>



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

        <path name="incall_music_uplink" />

    </path>



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

        <path name="incall_music_uplink" />

    </path>



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



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



        <path name="incall_music_uplink" />

    </path>



    <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="incall_music_uplink call-proxy">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink2">

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

    </path>



    <path name="incall_music_uplink2 speaker">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 handset">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 handset-hac">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 display-port">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 bt-sco">

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 afe-proxy">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 usb-headphones">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 usb-headset">

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 headphones">

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 bt-a2dp">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 afe-proxy">

        <path name="incall_music_uplink2" />

    </path>



    <path name="call-proxy">

    </path>



    <path name="call-proxy-in">

    </path>



</mixer>

configs/msm8998/mixer_paths_dtp.xml

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

<!--

    Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

    Copyright (c) 2015-2016, 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
@@ -351,6 +351,9 @@ 
    <!-- Multimode Voice1 USB headset -->

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

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

    <!-- Multimode Voice1 proxy-Port -->

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

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

    <!-- Miltimode Voice1 end-->



    <!-- Multimode Voice2 -->
@@ -364,6 +367,9 @@ 
    <!-- Multimode Voice2 USB headset -->

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

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

    <!-- Multimode Voice2 proxy-Port -->

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

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

    <!-- Multimode Voice2 end-->



    <!-- Voice external ec. reference -->
@@ -387,6 +393,7 @@ 
    <!-- Incall Music -->

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

    <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="0" />

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

    <!-- Incall Music End -->



    <!-- compress-voip-call start -->
@@ -1387,6 +1394,10 @@ 
        <path name="incall-rec-downlink-compress" />

    </path>



    <path name="incall-rec-downlink call-proxy-in">

        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink">

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

        <path name="incall-rec-downlink" />
@@ -1429,6 +1440,10 @@ 
        <path name="incall-rec-uplink-and-downlink-compress" />

    </path>



    <path name="incall-rec-uplink-and-downlink call-proxy-in">

        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="hfp-sco">

        <ctl name="HFP_PRI_AUX_UL_HL Switch" value="1" />

        <ctl name="SLIMBUS_0_RX Port Mixer AUX_PCM_UL_TX" value="1" />
@@ -1548,6 +1563,11 @@ 
        <path name="voicemmode1-call"/>

    </path>



    <path name="voicemmode1-call call-proxy">

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

        <ctl name="VoiceMMode1_Tx Mixer PROXY_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" />
@@ -1583,6 +1603,11 @@ 
        <path name="voicemmode2-call"/>

    </path>



    <path name="voicemmode2-call call-proxy">

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

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

    </path>



    <path name="listen-voice-wakeup-1">

        <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" />

        <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
@@ -2404,4 +2429,183 @@ 
        <ctl name="SLIMBUS_DL_HL Switch" value="1" />

    </path>



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



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



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



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



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



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



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

        <path name="incall_music_uplink" />

    </path>



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



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

        <path name="incall_music_uplink" />

    </path>



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

        <path name="incall_music_uplink" />

    </path>



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

        <path name="incall_music_uplink" />

    </path>



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



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



        <path name="incall_music_uplink" />

    </path>



    <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="incall_music_uplink call-proxy">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink2">

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

    </path>



    <path name="incall_music_uplink2 speaker">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 handset">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 handset-hac">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 display-port">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 bt-sco">

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 afe-proxy">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 usb-headphones">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 usb-headset">

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 headphones">

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



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

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 bt-a2dp">

        <path name="incall_music_uplink2" />

    </path>



    <path name="incall_music_uplink2 afe-proxy">

        <path name="incall_music_uplink2" />

    </path>



    <path name="call-proxy">

    </path>



    <path name="call-proxy-in">

    </path>



</mixer>

configs/msm8998/mixer_paths_skuk.xml

+205 −1

File changed.

Preview size limit exceeded, changes collapsed.