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

Commit b16d8e56 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Cyan_Hsieh
Browse files

Merge "audio: correct routing order for voip output" into rvc-dev 

Change-Id: Iab8dc85d3e56f0f83c5eab2bebec57015131afa3
Change-Id: I4831f4c0de871d00fd6814f6aebd1b2fd7a5bd3b
Change-Id: I10b87d2c8a6db80be2dbe18509e81b59639c480c
Change-Id: I76688ffa3c5a6f457545a8d5698061079b586e5f
Change-Id: Ic7748e05052415e3aed436d494bcb778a7017df0
Change-Id: Ia5067a0ca2035f9788bac8126066cc2d83fad8a4
parents 08baa680 25bfecaf

audio/audio_policy_configuration.xml

+5 −5
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ 
            </attachedDevices>

            <defaultOutputDevice>Speaker</defaultOutputDevice>

            <mixPorts>

                <mixPort name="voip_rx" role="source"

                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </mixPort>

                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -68,11 +73,6 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="voip_rx" role="source"

                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </mixPort>

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

                        flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"