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

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

Merge 3751e3e2 on remote branch 

Change-Id: Iad8cfe3543a49471a53c02c880d33b176ab42cbc
parents 1d159dbe 3751e3e2

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
@@ -580,7 +580,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>
@@ -643,7 +643,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>
@@ -710,7 +710,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>
@@ -776,7 +776,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>
@@ -851,7 +851,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>
@@ -918,7 +918,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>
@@ -985,7 +985,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>
@@ -1053,7 +1053,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>
@@ -1120,7 +1120,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>
@@ -1187,7 +1187,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>
@@ -1254,7 +1254,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>
@@ -1321,7 +1321,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>
@@ -1757,6 +1757,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

configs/msmsteppe/mixer_paths_tavil.xml

+9 −9
Original line number Diff line number Diff line
@@ -342,15 +342,15 @@ 
    <ctl name="ADC2 Volume" value="12" />

    <ctl name="ADC3 Volume" value="0" />

    <ctl name="ADC4 Volume" value="0" />

    <ctl name="DEC0 Volume" value="102" />

    <ctl name="DEC1 Volume" value="102" />

    <ctl name="DEC2 Volume" value="102" />

    <ctl name="DEC3 Volume" value="102" />

    <ctl name="DEC4 Volume" value="102" />

    <ctl name="DEC5 Volume" value="102" />

    <ctl name="DEC6 Volume" value="102" />

    <ctl name="DEC7 Volume" value="102" />

    <ctl name="DEC8 Volume" value="102" />

    <ctl name="DEC0 Volume" value="84" />

    <ctl name="DEC1 Volume" value="84" />

    <ctl name="DEC2 Volume" value="84" />

    <ctl name="DEC3 Volume" value="84" />

    <ctl name="DEC4 Volume" value="84" />

    <ctl name="DEC5 Volume" value="84" />

    <ctl name="DEC6 Volume" value="84" />

    <ctl name="DEC7 Volume" value="84" />

    <ctl name="DEC8 Volume" value="84" />



    <!-- Compander controls -->

    <ctl name="COMP1 Switch" value="1" />

configure.ac

100644 → 100755
+4 −0
Original line number Diff line number Diff line
@@ -81,6 +81,10 @@ if (test x$TARGET_SUPPORT = x8x96autogvmquintcu); then 
         AC_SUBST([TARGET_PLATFORM], ["msm8974"])

         TARGET_CFLAGS="-DPLATFORM_MSM8996"

fi

if (test x$TARGET_SUPPORT = xsdmsteppe); then

         AC_SUBST([TARGET_PLATFORM], ["msm8974"])

         TARGET_CFLAGS="-DPLATFORM_MSMSTEPPE"

fi

AC_SUBST([TARGET_CFLAGS])



AM_CONDITIONAL([QTI_AUDIO_SERVER_ENABLED],[test x$BOARD_SUPPORTS_QTI_AUDIO_SERVER = xtrue])