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

Commit 217a9fa1 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 604e437f on remote branch 

Change-Id: Id8126d1d1a278ff50e432df87e7dd34dc98e87dc
parents ea8133b6 604e437f

configs/atoll/audio_policy_configuration.xml

+6 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- Copyright (c) 2016-2020, The Linux Foundation. All rights reserved

<!-- Copyright (c) 2016-2022, The Linux Foundation. All rights reserved

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project
@@ -80,8 +80,6 @@ 
                <mixPort name="hifi_playback" role="source" />

                <mixPort name="compress_passthrough" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                    <profile name="" format="dynamic"

                             samplingRates="dynamic" channelMasks="dynamic"/>

                </mixPort>

                <mixPort name="direct_pcm" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT">
@@ -187,7 +185,7 @@ 
                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                             channelMasks="AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_2,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                </mixPort>

                <mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">

                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
@@ -258,11 +256,11 @@ 
                </devicePort>

                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -285,11 +283,11 @@ 
                </devicePort>

                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>



                <!-- Input devices declaration, i.e. Source DEVICE PORT -->

configs/bengal/audio_policy_configuration.xml

+6 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- Copyright (c) 2016-2020, The Linux Foundation. All rights reserved

<!-- Copyright (c) 2016-2022, The Linux Foundation. All rights reserved

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project
@@ -80,8 +80,6 @@ 
                <mixPort name="hifi_playback" role="source" />

                <mixPort name="compress_passthrough" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                    <profile name="" format="dynamic"

                             samplingRates="dynamic" channelMasks="dynamic"/>

                </mixPort>

                <mixPort name="direct_pcm" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT">
@@ -181,7 +179,7 @@ 
                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                             channelMasks="AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_2,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                </mixPort>

                <mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">

                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
@@ -257,11 +255,11 @@ 
                </devicePort>

                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -284,11 +282,11 @@ 
                </devicePort>

                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>



                <!-- Input devices declaration, i.e. Source DEVICE PORT -->

configs/holi/audio_policy_configuration.xml

+6 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- Copyright (c) 2016-2020, The Linux Foundation. All rights reserved

<!-- Copyright (c) 2016-2021, The Linux Foundation. All rights reserved

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project
@@ -84,8 +84,6 @@ 
                <mixPort name="hifi_playback" role="source" />

                <mixPort name="compress_passthrough" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                    <profile name="" format="dynamic"

                             samplingRates="dynamic" channelMasks="dynamic"/>

                </mixPort>

                <mixPort name="direct_pcm" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT">
@@ -196,7 +194,7 @@ 
                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                             channelMasks="AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_2,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                </mixPort>

                <mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">

                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
@@ -261,11 +259,11 @@ 
                </devicePort>

                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -288,11 +286,11 @@ 
                </devicePort>

                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>



                <!-- Input devices declaration, i.e. Source DEVICE PORT -->

configs/kona/audio_policy_configuration.xml

+6 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- Copyright (c) 2016-2020, The Linux Foundation. All rights reserved

<!-- Copyright (c) 2016-2021, The Linux Foundation. All rights reserved

     Not a Contribution.

-->

<!-- Copyright (C) 2015 The Android Open Source Project
@@ -79,8 +79,6 @@ 
                <mixPort name="hifi_playback" role="source" />

                <mixPort name="compress_passthrough" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                    <profile name="" format="dynamic"

                             samplingRates="dynamic" channelMasks="dynamic"/>

                </mixPort>

                <mixPort name="direct_pcm" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT">
@@ -180,7 +178,7 @@ 
                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                             channelMasks="AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_2,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                </mixPort>

                <mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">

                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
@@ -256,11 +254,11 @@ 
                </devicePort>

                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -283,11 +281,11 @@ 
                </devicePort>

                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>



                <!-- Input devices declaration, i.e. Source DEVICE PORT -->

configs/lahaina/audio_policy_configuration.xml

+5 −7
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ 
                <mixPort name="hifi_playback" role="source" />

                <mixPort name="compress_passthrough" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                    <profile name="" format="dynamic"

                             samplingRates="dynamic" channelMasks="dynamic"/>

                </mixPort>

                <mixPort name="dsd_compress_passthrough" role="source"

                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
@@ -202,7 +200,7 @@ 
                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                             channelMasks="AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_2,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                </mixPort>

                <mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">

                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
@@ -267,11 +265,11 @@ 
                </devicePort>

                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -294,11 +292,11 @@ 
                </devicePort>

                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>



                <!-- Input devices declaration, i.e. Source DEVICE PORT -->