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

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

Merge "hal: configs: add support for audio media codecs"

parents 3f532384 5557016c

configs/common/media_codecs_vendor_audio.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8" ?>

<!-- Copyright (C) 2015-2020 The Linux Foundation. All rights reserved.

     Not a contribution.

     Copyright (C) 2012 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<Included>

    <Decoders>

        <MediaCodec name="OMX.google.opus.decoder" type="audio/opus" update="true" rank="100"/>

        <!-- SimpleOMXComponet based software decoder-->

        <MediaCodec name="OMX.qti.audio.decoder.flac" type="audio/flac" rank="0">

            <Limit name="concurrent-instances" max="10" />

        </MediaCodec>

    </Decoders>

</Included>

configs/lahaina/lahaina.mk

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

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

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

    vendor/qcom/opensource/audio-hal/primary-hal/configs/common/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.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
@@ -309,6 +310,12 @@ vendor.audio.volume.headset.gain.depcal=true 
#enable dualmic fluence for voice communication

PRODUCT_PROPERTY_OVERRIDES += \

persist.audio.fluence.voicecomm=true



ifneq ($(GENERIC_ODM_IMAGE),true)

$(warning "Enabling codec2.0 SW only for non-generic odm build variant")

#Rank OMX SW codecs lower than OMX HW codecs

PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank=0

endif

endif



USE_XML_AUDIO_POLICY_CONF := 1