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

Commit 261b939e authored by Derek Chen's avatar Derek Chen
Browse files

configs: msmnile_au: enable auto audio features 

Enable hw ext plugin, bus audio as well as audio control
feature flags.
Update pcm and acdb device IDs for playback and hfp in
platform info xml file.
Update TDM dai channel config to six to support
custom topology upmixing.

Change-Id: I0361626817977b5de0d1ebd23c059d404a710940
parent cdd17c79

configs/msmnile_au/audio_platform_info.xml

+8 −8
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ 
<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->

<audio_platform_info>

    <acdb_ids>

        <device name="SND_DEVICE_OUT_HANDSET" acdb_id="41"/>

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

        <device name="SND_DEVICE_OUT_HEADPHONES" acdb_id="41"/>

        <device name="SND_DEVICE_OUT_HANDSET" acdb_id="60"/>

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

        <device name="SND_DEVICE_OUT_HEADPHONES" acdb_id="60"/>

        <device name="SND_DEVICE_OUT_BT_SCO" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="41"/>

        <device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="60"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="94"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="11"/>
@@ -96,10 +96,10 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="28" />

        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="28" />

        <usecase name="USECASE_AUDIO_RECORD" type="in" id="0" />

        <usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO" type="out" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="out" id="29" />

        <usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="36" />

        <usecase name="USECASE_AUDIO_HFP_SCO" type="out" id="36" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="36" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB" type="out" id="36" />

    </pcm_ids>



    <config_params>

configs/msmnile_au/mixer_paths_adp.xml

+13 −12
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ 
    </path>



    <path name="deep-buffer-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia1" value="1" />

    </path>
@@ -639,7 +639,7 @@ 
    </path>



    <path name="low-latency-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="1" />

    </path>
@@ -706,7 +706,7 @@ 
    </path>



    <path name="audio-ull-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia8" value="1" />

    </path>
@@ -772,7 +772,7 @@ 
    </path>



    <path name="compress-offload-playback">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia4" value="1" />

    </path>
@@ -847,7 +847,7 @@ 
    </path>



    <path name="compress-offload-playback2">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia7" value="1" />

    </path>
@@ -914,7 +914,7 @@ 
    </path>



    <path name="compress-offload-playback3">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>
@@ -981,7 +981,7 @@ 
    </path>



    <path name="compress-offload-playback4">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia11" value="1" />

    </path>
@@ -1049,7 +1049,7 @@ 
    </path>



    <path name="compress-offload-playback5">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia12" value="1" />

    </path>
@@ -1116,7 +1116,7 @@ 
    </path>



    <path name="compress-offload-playback6">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia13" value="1" />

    </path>
@@ -1183,7 +1183,7 @@ 
    </path>



    <path name="compress-offload-playback7">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia14" value="1" />

    </path>
@@ -1250,7 +1250,7 @@ 
    </path>



    <path name="compress-offload-playback8">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia15" value="1" />

    </path>
@@ -1317,7 +1317,7 @@ 
    </path>



    <path name="compress-offload-playback9">

        <ctl name="TERT_TDM_RX_0 Channels" value="Two" />

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />

    </path>
@@ -1753,6 +1753,7 @@ 


    <!-- VoIP Rx settings -->

    <path name="audio-playback-voip">

        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />

        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />

    </path>

configs/msmnile_au/msmnile_au.mk

+5 −11
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := false 
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := false

##AUDIO_FEATURE_FLAGS



AUDIO_FEATURE_ENABLED_EXT_HW_PLUGIN := true

AUDIO_FEATURE_ENABLED_BUS_ADDRESS := true

AUDIO_FEATURE_ENABLED_AUDIO_CONTROL_HAL := true

##AUTOMOTIVE_AUDIO_FEATURE_FLAGS



ifneq ($(strip $(TARGET_USES_RRO)), true)

#Audio Specific device overlays

DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay
@@ -249,14 +254,3 @@ PRODUCT_PACKAGES += \ 
    android.hardware.audio@4.0-impl \

    android.hardware.audio.effect@4.0 \

    android.hardware.audio.effect@4.0-impl
 


PRODUCT_PROPERTY_OVERRIDES += \

persist.audio.calfile0=/vendor/etc/acdbdata/adsp_avs_config.acdb\

persist.audio.calfile1=/vendor/etc/acdbdata/ADP/Bluetooth_cal.acdb\

persist.audio.calfile2=/vendor/etc/acdbdata/ADP/Codec_cal.acdb\

persist.audio.calfile3=/vendor/etc/acdbdata/ADP/General_cal.acdb\

persist.audio.calfile4=/vendor/etc/acdbdata/ADP/Global_cal.acdb\

persist.audio.calfile5=/vendor/etc/acdbdata/ADP/Handset_cal.acdb\

persist.audio.calfile6=/vendor/etc/acdbdata/ADP/Hdmi_cal.acdb\

persist.audio.calfile7=/vendor/etc/acdbdata/ADP/Headset_cal.acdb\

persist.audio.calfile8=/vendor/etc/acdbdata/ADP/Speaker_cal.acdb