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

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

Merge "config: move "fast input" and "quad mic" to the bottom"

parents 9d78c354 74399204

configs/atoll/audio_policy_configuration.xml

+9 −9
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
@@ -173,12 +173,6 @@ 
                             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="fast input" role="sink"

                         flags="AUDIO_INPUT_FLAG_FAST">

                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                              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="voip_tx" role="sink"

                         flags="AUDIO_INPUT_FLAG_VOIP_TX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -216,6 +210,12 @@ 
                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>

                </mixPort>

                <mixPort name="hifi_input" role="sink" />

                <mixPort name="fast input" role="sink"

                         flags="AUDIO_INPUT_FLAG_FAST">

                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                              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>

            </mixPorts>



            <devicePorts>
@@ -361,8 +361,6 @@ 
                       sources="Telephony Rx"/>

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

                       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="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"
@@ -378,6 +376,8 @@ 
                <route type="mix" sink="BT A2DP Speaker"

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

                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />

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

            </routes>



        </module>

configs/kona/audio_policy_configuration.xml

+15 −15
Original line number Diff line number Diff line
@@ -172,17 +172,6 @@ 
                             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="fast input" role="sink"

                         flags="AUDIO_INPUT_FLAG_FAST">

                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                              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"
@@ -220,6 +209,17 @@ 
                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>

                </mixPort>

                <mixPort name="hifi_input" role="sink" />

                <mixPort name="fast input" role="sink"

                         flags="AUDIO_INPUT_FLAG_FAST">

                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                              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>

            </mixPorts>



            <devicePorts>
@@ -367,10 +367,6 @@ 
                       sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>

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

                       sources="USB Device In,USB Headset In"/>

                <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="record_24"
@@ -384,6 +380,10 @@ 
                <route type="mix" sink="BT A2DP Speaker"

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

                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />

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

            </routes>



        </module>

configs/lito/audio_policy_configuration.xml

+15 −15
Original line number Diff line number Diff line
@@ -173,17 +173,6 @@ 
                             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="fast input" role="sink"

                         flags="AUDIO_INPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             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"
@@ -221,6 +210,17 @@ 
                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>

                </mixPort>

                <mixPort name="hifi_input" role="sink" />

                <mixPort name="fast input" role="sink"

                         flags="AUDIO_INPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             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>

            </mixPorts>



            <devicePorts>
@@ -368,10 +368,6 @@ 
                       sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>

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

                       sources="USB Device In,USB Headset In"/>

                <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="record_24"
@@ -385,6 +381,10 @@ 
                <route type="mix" sink="BT A2DP Speaker"

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

                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />

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

            </routes>



        </module>