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

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

Merge 459f1235 on remote branch 

Change-Id: I8cbc4652e35c2b046b68ce065321cd93ea8a4e8a
parents da475308 459f1235

configs/atoll/atoll.mk

+2 −7
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true 
AUDIO_FEATURE_ENABLED_USB_TUNNEL := true

AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true

AUDIO_FEATURE_ENABLED_3D_AUDIO := true

AUDIO_FEATURE_ENABLED_AHAL_EXT := true

AUDIO_FEATURE_ENABLED_AHAL_EXT := false

AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true

DOLBY_ENABLE := false

endif
@@ -185,8 +185,6 @@ PRODUCT_COPY_FILES += \ 
    vendor/qcom/opensource/audio-hal/primary-hal/configs/atoll/mixer_paths_wcd937x.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_wcd937x.xml \

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

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

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

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

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

    frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml
@@ -420,10 +418,7 @@ PRODUCT_PACKAGES += \ 
    android.hardware.audio.common@4.0-util \

    android.hardware.audio@4.0-impl \

    android.hardware.audio.effect@4.0 \

    android.hardware.audio.effect@4.0-impl \

    vendor.qti.hardware.audiohalext@1.0 \

    vendor.qti.hardware.audiohalext@1.0-impl \

    vendor.qti.hardware.audiohalext-utils

    android.hardware.audio.effect@4.0-impl



# enable audio hidl hal 5.0

PRODUCT_PACKAGES += \

configs/atoll/audio_configs.xml

deleted100644 → 0
+0 −72
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.



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,

WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

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

IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

<configs>

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

        <property name="vendor.audio.av.streaming.offload.enable" value="false"/>

        <property name="vendor.audio.offload.track.enable" value="true"/>

        <property name="vendor.audio.offload.multiple.enabled" value="false"/>

        <property name="vendor.audio.rec.playback.conc.disabled" value="false"/>

        <property name="vendor.voice.conc.fallbackpath" value=""/>

        <property name="vendor.voice.dsd.playback.conc.disabled" value="true"/>

        <property name="vendor.voice.path.for.pcm.voip" value="true"/>

        <property name="vendor.voice.playback.conc.disabled" value="false"/>

        <property name="vendor.voice.record.conc.disabled" value="false"/>

        <property name="vendor.voice.voip.conc.disabled" value="false"/>

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

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

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

        <flag name="voice_concurrency" value="false" />

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

        <flag name="compress_voip_enabled" value="false" />

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

        <flag name="record_play_concurrency" value="false" />



        <!-- 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.flac.sw.decoder.24bit" value="true"/>

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

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

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

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

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

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

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

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

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

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

</configs>

configs/atoll/audio_configs_stock.xml

deleted100644 → 0
+0 −32
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.



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,

WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

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

IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

<configs>

        <!-- AHAL Configs -->

</configs>

configs/atoll/audio_io_policy.conf

+21 −0
Original line number Diff line number Diff line
@@ -102,4 +102,25 @@ inputs { 
    bit_width 32

    app_type 69949

  }

  record_compress_16 {

    flags AUDIO_INPUT_FLAG_COMPRESS

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000

    bit_width 16

    app_type 69938

  }

  record_compress_24 {

    flags AUDIO_INPUT_FLAG_COMPRESS

    formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT

    sampling_rates 44100|48000|88200|96000|176400|192000

    bit_width 24

    app_type 69948

  }

  record_compress_32 {

    flags AUDIO_INPUT_FLAG_COMPRESS

    formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT

    sampling_rates 44100|48000|88200|96000|176400|192000

    bit_width 32

    app_type 69949

  }

}

configs/bengal/audio_configs.xml

deleted100644 → 0
+0 −72
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!--

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

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,

WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

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

IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

<configs>

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

        <property name="vendor.audio.av.streaming.offload.enable" value="false"/>

        <property name="vendor.audio.offload.track.enable" value="true"/>

        <property name="vendor.audio.offload.multiple.enabled" value="false"/>

        <property name="vendor.audio.rec.playback.conc.disabled" value="false"/>

        <property name="vendor.voice.conc.fallbackpath" value=""/>

        <property name="vendor.voice.dsd.playback.conc.disabled" value="true"/>

        <property name="vendor.voice.path.for.pcm.voip" value="true"/>

        <property name="vendor.voice.playback.conc.disabled" value="false"/>

        <property name="vendor.voice.record.conc.disabled" value="false"/>

        <property name="vendor.voice.voip.conc.disabled" value="false"/>

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

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

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

        <flag name="voice_concurrency" value="false" />

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

        <flag name="compress_voip_enabled" value="false" />

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

        <flag name="record_play_concurrency" value="false" />



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

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

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

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

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

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

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

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

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

</configs>