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

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

Merge "Configs: msm8937: A2dp direct-pcm support on BT4.2"

parents f210a384 1a38071c

configs/msm8937/audio_policy_configuration_sdm429w_law.xml

100644 → 100755
+16 −8
Original line number Diff line number Diff line
@@ -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:
@@ -134,7 +134,7 @@ 
                <mixPort name="voip_rx" role="source"

                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

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

                </mixPort>



                <mixPort name="primary input" role="sink">
@@ -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"
@@ -187,10 +193,6 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </devicePort>

                <devicePort tagName="BT SCO All" type="AUDIO_DEVICE_OUT_ALL_SCO" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </devicePort>

                <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
@@ -268,14 +270,20 @@ 
                       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 All"

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

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

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

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

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

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

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

                       sources="voice_tx"/>

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

                       sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner"/>

                <route type="mix" sink="surround_sound"

                       sources="Built-In Mic,Built-In Back Mic"/>

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

configs/msm8937/mixer_paths_sdm429w.xml

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

<!--

    Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

    Copyright (c) 2019-2021, 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
@@ -591,6 +591,16 @@ 
        <path name="compress-offload-playback2" />

    </path>



    <path name="compress-offload-playback2 bt-a2dp">

        <ctl name="INTERNAL_A2DP_RX Audio Mixer MultiMedia7" value="1" />

    </path>



    <path name="compress-offload-playback2 speaker-and-bt-a2dp">

        <path name="compress-offload-playback2 bt-a2dp" />

        <path name="compress-offload-playback2" />

    </path>





    <path name="compress-offload-playback transmission-fm">

        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="1" />

    </path>