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

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

Merge "configs: Quad mic configuration from application picks up invalid ... 

Merge "configs: Quad mic configuration from application picks up invalid          (single mic) topology due to addition of fast input profile.          Add dedicated profile for quad mic use case to make sure HAL          selects proper topology (quad mic)."
parents 43ade1ee 1664718b

configs/kona/audio_policy_configuration.xml

+7 −0
Original line number Diff line number Diff line
@@ -179,6 +179,11 @@ 
                              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="quad mic" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="48000"

                        channelMasks="AUDIO_CHANNEL_INDEX_MASK_4"/>

                </mixPort>

                <mixPort name="voip_tx" role="sink"

                         flags="AUDIO_INPUT_FLAG_VOIP_TX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -363,6 +368,8 @@ 
                       sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In,Telephony Rx"/>

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

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>

                <route type="mix" sink="quad mic"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>

                <route type="mix" sink="voip_tx"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>

                <route type="mix" sink="usb_surround_sound"

configs/lito/audio_policy_configuration.xml

+7 −0
Original line number Diff line number Diff line
@@ -179,6 +179,11 @@ 
                             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="quad mic" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                        samplingRates="48000"

                        channelMasks="AUDIO_CHANNEL_INDEX_MASK_4"/>

                </mixPort>

                <mixPort name="voip_tx" role="sink"

                         flags="AUDIO_INPUT_FLAG_VOIP_TX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -363,6 +368,8 @@ 
                       sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In,Telephony Rx"/>

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

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>

                <route type="mix" sink="quad mic"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>

                <route type="mix" sink="voip_tx"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>

                <route type="mix" sink="usb_surround_sound"