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

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

Merge bb795e6a on remote branch 

Change-Id: Id0c7eb50cdc18cd7847b223cc17f3d1aa1b49268
parents 4da3e4fb bb795e6a

configs/atoll/atoll.mk

+4 −0
Original line number Diff line number Diff line
@@ -300,6 +300,10 @@ vendor.audio.use.sw.alac.decoder=true 
PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.use.sw.ape.decoder=true



#enable software decoder for MPEG-H

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.use.sw.mpegh.decoder=true



#enable hw aac encoder by default

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.hw.aac.encoder=true

configs/atoll/audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ 
                <route type="mix" sink="voice_rx"

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

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

                <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/bengal/audio_configs.xml

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

<!--

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

Copyright (c) 2019-2020, 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
@@ -57,7 +57,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
        <!-- AV Configs -->

        <property name="vendor.audio.use.sw.alac.decoder" value="true"/>

        <property name="vendor.audio.use.sw.ape.decoder" value="true"/>

        <property name="vendor.audio.use.sw.mpegh.decoder" value="false"/>

        <property name="vendor.audio.use.sw.mpegh.decoder" value="true"/>

        <property name="vendor.audio.flac.sw.decoder.24bit" value="true"/>

        <property name="vendor.audio.hw.aac.encoder" value="true"/>

        <flag name="aac_adts_offload_enabled" value="true" />

configs/bengal/audio_platform_info_intcodec.xml

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

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

<!-- Copyright (c) 2014, 2016-2020, 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 -->
@@ -97,7 +97,7 @@ 
        <device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" acdb_id="145"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" acdb_id="146"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" acdb_id="147"/>

        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="157"/>

        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="191"/>

    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

configs/bengal/audio_policy_configuration.xml

+11 −4
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
@@ -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:
@@ -203,6 +203,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,AUDIO_CHANNEL_INDEX_MASK_3"/>

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

            </mixPorts>
@@ -348,7 +353,7 @@ 
                <route type="mix" sink="voice_rx"

                       sources="Telephony Rx"/>

                <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,Telephony Rx"/>

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

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

                <route type="mix" sink="voip_tx"
@@ -357,6 +362,8 @@ 
                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>

                <route type="mix" sink="mmap_no_irq_in"

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

                <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="BT A2DP Out"

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

                <route type="mix" sink="BT A2DP Headphones"