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

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

Merge "lito: Enable MPEGH features"

parents 86c64d7f 8600ebda

configs/lito/audio_configs.xml

+1 −1
Original line number Diff line number Diff line
@@ -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/lito/audio_platform_info_intcodec.xml

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,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/lito/audio_platform_info_qrd.xml

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

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

        <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"/>
@@ -100,7 +100,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/lito/lito.mk

+9 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := true 
AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_MPEGH_SW_DECODER := true

AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true

AUDIO_FEATURE_ENABLED_SSR := true

AUDIO_FEATURE_ENABLED_DTS_EAGLE := false
@@ -208,6 +209,14 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
PRODUCT_PROPERTY_OVERRIDES += \

    vendor.audio_hal.period_size=192



##Ambisonic Capture

PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.audio.ambisonic.capture=false \

persist.vendor.audio.ambisonic.auto.profile=false



PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.audio.apptype.multirec.enabled=false



##fluencetype can be "fluence" or "fluencepro" or "none"

PRODUCT_PROPERTY_OVERRIDES += \

ro.vendor.audio.sdk.fluencetype=none\

configs/lito/mixer_paths_qrd.xml

+5 −1
Original line number Diff line number Diff line
@@ -3324,13 +3324,17 @@ 
         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

         <ctl name="TX DMIC MUX2" value="DMIC3" />

         <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

         <ctl name="TX DMIC MUX3" value="DMIC4" />

         <ctl name="TX DMIC MUX3" value="DMIC5" />

    </path>



    <path name="voice-speaker-qmic">

         <path name="speaker-qmic" />

    </path>



   <path name="quad-mic">

         <path name="speaker-qmic" />

   </path>



    <path name="unprocessed-quad-mic">

        <path name="quad-mic" />

    </path>