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

Commit c333619d 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 3365ae09 6a2179f0

configs/sdm710/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 -->
@@ -101,6 +101,8 @@ 
        <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="35" />

        <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/sdm710/audio_policy_configuration.xml

+9 −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
@@ -161,7 +161,12 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>

                </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="primary input" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
@@ -325,6 +330,8 @@ 
                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough"/>

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

configs/sdm710/sdm710.mk

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ AUDIO_FEATURE_ENABLED_KEEP_ALIVE := false 
AUDIO_FEATURE_ENABLED_DISPLAY_PORT := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false

AUDIO_FEATURE_ENABLED_HFP := true

AUDIO_FEATURE_ENABLED_INCALL_MUSIC := false

AUDIO_FEATURE_ENABLED_INCALL_MUSIC := true

AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true

AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true

AUDIO_FEATURE_ENABLED_SPKR_PROTECTION := true