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

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

Merge "configs : enable incall music and add incall music profile"

parents aac5c3ce 0074cac9

configs/msm8937/audio_platform_info_intcodec.xml

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

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

<!-- Copyright (c) 2015 - 2016, 2018, 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 -->
@@ -47,6 +47,8 @@ 
        <usecase name="USECASE_VOICEMMODE1_CALL" type="out" id="34"/>

        <usecase name="USECASE_VOICEMMODE2_CALL" type="in" id="35"/>

        <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="35"/>

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

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

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsa881x.0f"/>

configs/msm8937/audio_platform_info_mtp.xml

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

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

<!-- Copyright (c) 2015 - 2016, 2018, 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 -->
@@ -47,6 +47,8 @@ 
        <usecase name="USECASE_VOICEMMODE1_CALL" type="out" id="34"/>

        <usecase name="USECASE_VOICEMMODE2_CALL" type="in" id="35"/>

        <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="35"/>

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

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

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsa881x.0f"/>

configs/msm8937/audio_platform_info_tasha.xml

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

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

<!-- Copyright (c) 2015 - 2016, 2018, 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 -->
@@ -50,6 +50,8 @@ 
        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="37"/>

        <usecase name="USECASE_QCHAT_CALL" type="in" id="42"/>

        <usecase name="USECASE_QCHAT_CALL" type="out" id="42"/>

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

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

    </pcm_ids>

    <acdb_ids>

        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" acdb_id="14"/>

configs/msm8937/audio_platform_info_tashalite.xml

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

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

<!-- Copyright (c) 2015 - 2016, 2018, 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 -->
@@ -50,6 +50,8 @@ 
        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="37"/>

        <usecase name="USECASE_QCHAT_CALL" type="in" id="42"/>

        <usecase name="USECASE_QCHAT_CALL" type="out" id="42"/>

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

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

    </pcm_ids>

    <acdb_ids>

        <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" acdb_id="14"/>

configs/msm8937/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-2017, The Linux Foundation. All rights reserved

<!-- Copyright (c) 2016-2017, 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:
@@ -142,6 +142,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"
@@ -249,6 +255,8 @@ 
                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>

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

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

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

                       sources="voice_tx,incall_music_uplink"/>

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

                       sources="primary output"/>

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