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

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

Merge 1aee8389 on remote branch 

Change-Id: Ia5a8e22292c8c085f9aed8eab0fc41a1e7fd4639
parents 40210e75 1aee8389

configs/kona/audio_configs.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
        <!-- APM Configs -->

        <property name="audio.deep_buffer.media" value="true"/>

        <property name="audio.offload.disable" value="false"/>

        <property name="audio.offload.min.duration.secs" value="60"/>

        <property name="audio.offload.min.duration.secs" value="30"/>

        <property name="audio.offload.video" value="true"/>

        <property name="persist.vendor.audio.sva.conc.enabled" value="false"/>

        <property name="persist.vendor.audio.va_concurrency_enabled" value="false"/>

configs/kona/audio_platform_info_qrd.xml

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 
        <param key="true_32_bit" value="true"/>

        <param key="native_audio_mode" value="true"/>

        <param key="hfp_pcm_dev_id" value="39"/>

        <param key="input_mic_max_count" value="2"/>

        <param key="input_mic_max_count" value="4"/>

    </config_params>

    <acdb_ids>

        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>

configs/kona/audio_policy_configuration.xml

+0 −7
Original line number Diff line number Diff line
@@ -173,11 +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="surround_sound" role="sink">

                    <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,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6"/>

                </mixPort>

                <mixPort name="usb_surround_sound" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"
@@ -374,8 +369,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="surround_sound"

                       sources="Built-In Mic,Built-In Back Mic"/>

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

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

                <route type="mix" sink="record_24"

configs/kona/audio_tuning_mixer.txt

0 → 100644
+67 −0
Original line number Diff line number Diff line 
# Copyright (c) 2019, 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

# met:

#     * Redistributions of source code must retain the above copyright

#       notice, this list of conditions and the following disclaimer.

#     * Redistributions in binary form must reproduce the above

#       copyright notice, this list of conditions and the following

#       disclaimer in the documentation and/or other materials provided

#       with the distribution.

#     * Neither the name of The Linux Foundation nor the names of its

#       contributors may be used to endorse or promote products derived

#       from this software without specific prior written permission.

#

# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#RAS_TEST_SPKR_PHONE_SPKR_STEREO

acdb_dev_id:136

!Playback

Rxdevice:0



enable

WSA_CDC_DMA_RX_0 Channels:Two

WSA RX0 MUX:AIF1_PB

WSA RX1 MUX:AIF1_PB

WSA_RX0 INP0:RX0

WSA_RX1 INP0:RX1

WSA_COMP1 Switch:1

WSA_COMP2 Switch:1

SpkrLeft COMP Switch:1

SpkrRight COMP Switch:1

SpkrLeft BOOST Switch:1

SpkrRight BOOST Switch:1

SpkrLeft VISENSE Switch:1

SpkrRight VISENSE Switch:1

SpkrLeft SWR DAC_Port Switch:1

SpkrRight SWR DAC_Port Switch:1

WSA_RX0 Digital Volume:62

WSA_RX1 Digital Volume:62

WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:1



disable

WSA RX0 MUX:ZERO

WSA RX1 MUX:ZERO

WSA_RX0 INP0:ZERO

WSA_RX1 INP0:ZERO

WSA_COMP1 Switch:0

WSA_COMP2 Switch:0

SpkrLeft COMP Switch:0

SpkrRight COMP Switch:0

SpkrLeft BOOST Switch:0

SpkrRight BOOST Switch:0

SpkrLeft VISENSE Switch:0

SpkrRight VISENSE Switch:0

SpkrLeft SWR DAC_Port Switch:0

SpkrRight SWR DAC_Port Switch:0

WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:0

configs/kona/kona.mk

+46 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ PRODUCT_COPY_FILES += \ 
    vendor/qcom/opensource/audio-hal/primary-hal/configs/kona/mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qrd.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/kona/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/kona/audio_configs_stock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs_stock.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/kona/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \

    frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml



#XML Audio configuration files
@@ -286,6 +287,51 @@ persist.vendor.audio.voicecall.speaker.stereo=true 
PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.bt.aac_frm_ctl.enabled=true



#add dynamic feature flags here

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.feature.a2dp_offload.enable=true \

vendor.audio.feature.afe_proxy.enable=true \

vendor.audio.feature.anc_headset.enable=true \

vendor.audio.feature.audio_sphere.enable=true \

vendor.audio.feature.battery_listener.enable=true \

vendor.audio.feature.compr_cap.enable=false \

vendor.audio.feature.compress_in.enable=true \

vendor.audio.feature.compress_meta_data.enable=true \

vendor.audio.feature.compr_voip.enable=false \

vendor.audio.feature.concurrent_capture.enable=true \

vendor.audio.feature.custom_stereo.enable=true \

vendor.audio.feature.display_port.enable=true \

vendor.audio.feature.dsm_feedback.enable=false \

vendor.audio.feature.dynamic_ecns.enable=true \

vendor.audio.feature.ext_hw_plugin.enable=true \

vendor.audio.feature.external_dsp.enable=false \

vendor.audio.feature.external_speaker.enable=false \

vendor.audio.feature.external_speaker_tfa.enable=false \

vendor.audio.feature.fluence.enable=true \

vendor.audio.feature.fm.enable=true \

vendor.audio.feature.hdmi_edid.enable=true \

vendor.audio.feature.hdmi_passthrough.enable=true \

vendor.audio.feature.hfp.enable=true \

vendor.audio.feature.hifi_audio.enable=false \

vendor.audio.feature.hwdep_cal.enable=false \

vendor.audio.feature.incall_music.enable=true \

vendor.audio.feature.keep_alive.enable=true \

vendor.audio.feature.kpi_optimize.enable=true \

vendor.audio.feature.maxx_audio.enable=false \

vendor.audio.feature.ras.enable=true \

vendor.audio.feature.record_play_concurency.enable=false \

vendor.audio.feature.src_trkn.enable=true \

vendor.audio.feature.spkr_prot.enable=true \

vendor.audio.feature.ssrec.enable=true \

vendor.audio.feature.usb_offload.enable=true \

vendor.audio.feature.usb_offload_burst_mode.enable=true \

vendor.audio.feature.usb_offload_sidetone_volume.enable=false \

vendor.audio.feature.deepbuffer_as_primary.enable=false \

vendor.audio.feature.vbat.enable=true \

vendor.audio.feature.wsa.enable=false \

vendor.audio.feature.audiozoom.enable=false \

vendor.audio.feature.snd_mon.enable=true



# for HIDL related packages

PRODUCT_PACKAGES += \

    android.hardware.audio@2.0-service \