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

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

Promotion of audio-userspace.lnx.2.2-00005. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1087741   I1fad637a9baaff362023f0b203ee7a86bc0f7597   configs: msm8998: Add Split A2DP backend entries
1100102   I23c2d2e80ef84d62e96bb296f9bc1f1dcb772069   qahw: test: Add support for additional format
1098250   I5bddad988428d7788a27d7b323eb1c0036bcf572   mm-audio: avoid library version
1087741   I29ea0d8857fc4b9d837f9954423861be9b43b9a6   hal: Fix audio leak issue on speaker during A2DP and SCO
1081411   I30672f5549c49fcd51ffd6ceed2a11c366e7562f   hal: Enable proxy feature flag
1100102 1100709   I4ffdaa9f89324af7327b3376c401aedb71ba720d   qahw: test: Add bitwidth user option
1100102 1100709   Ia870cb51b9e76700ef67812ee9af1437c76bf18c   audiohal: Modify platform info for msm8916
1105335   I3265ac9f2f17a821d2f8476d4050ed84f9b1170c   hal: msm8916: add support of tasha for LE variant

Change-Id: Id49a4ce8970cb01d7b472836257eac3e839a508b
CRs-Fixed: 1105335, 1081411, 1100709, 1098250, 1087741, 1100102
parents 915644fb c597d106

configs/msm8998/audio_platform_info.xml

+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ 
    </gain_db_to_level_mapping>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_BT_A2DP" backend="bt-a2dp" interface="SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="SLIMBUS_6_RX"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>

configure.ac

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ AM_CONDITIONAL([VORBIS_SUPPORT], [test x$AUDIO_FEATURE_ENABLED_EXTN_VORBIS_DECOD 
AM_CONDITIONAL([WMA_SUPPORT], [test x$AUDIO_FEATURE_ENABLED_EXTN_WMA_DECODER = xtrue])

AM_CONDITIONAL([COMPRESS_INPUT], [test x$AUDIO_FEATURE_ENABLED_COMPRESS_INPUT = xtrue])

AM_CONDITIONAL([AUDIO_HW_EXTN_API], [test x$BOARD_SUPPORTS_QAHW = xtrue])

AM_CONDITIONAL([AFE_PROXY], [test x$AUDIO_FEATURE_ENABLED_PROXY_DEVICE = xtrue])



AC_CONFIG_FILES([ \

        Makefile \

hal/Makefile.am

+5 −1
Original line number Diff line number Diff line
@@ -133,6 +133,10 @@ AM_CFLAGS += -DAUDIO_HW_EXTN_API_ENABLED 
c_sources += audio_hw_extn_api.c

endif



if AFE_PROXY

AM_CFLAGS += -DAFE_PROXY_ENABLED

endif



h_sources = audio_extn/audio_defs.h \

            audio_extn/audio_extn.h \

            audio_hw.h \
@@ -149,5 +153,5 @@ audio_primary_default_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) 
audio_primary_default_la_CFLAGS += -Dstrlcat=g_strlcat

audio_primary_default_la_CFLAGS += -DINT_MAX=0x7fffffff

audio_primary_default_la_CFLAGS += -D__unused=__attribute__\(\(__unused__\)\)

audio_primary_default_la_CFLAGS += -DLINUX_ENABLED $(TARGET_CFLAGS)

audio_primary_default_la_CFLAGS += -DLINUX_ENABLED $(TARGET_CFLAGS) -DAUDIO_EXTN_FORMATS_ENABLED

audio_primary_default_la_LDFLAGS = -module -shared -avoid-version

hal/audio_extn/a2dp.c

+3 −1
Original line number Diff line number Diff line
@@ -788,7 +788,9 @@ void audio_extn_a2dp_set_handoff_mode(bool is_on) 
bool audio_extn_a2dp_is_force_device_switch()

{

    //During encoder reconfiguration mode, force a2dp device switch

    return a2dp.is_handoff_in_progress;

    // Or if a2dp device is selected but earlier start failed ( as a2dp

    // was suspended, force retry.

    return a2dp.is_handoff_in_progress || !a2dp.a2dp_started;

}



void audio_extn_a2dp_get_apptype_params(uint32_t *sample_rate,

hal/audio_hw.c

+11 −4
Original line number Diff line number Diff line
@@ -1051,8 +1051,10 @@ static void check_usecases_codec_backend(struct audio_device *adev, 
            ((usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) ||

             (usecase->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL) ||

             (usecase->devices & AUDIO_DEVICE_OUT_USB_DEVICE) ||

             (force_restart_session)) &&

             (platform_check_backends_match(snd_device, usecase->out_snd_device))) {

             (usecase->devices & AUDIO_DEVICE_OUT_ALL_A2DP) ||

             (usecase->devices & AUDIO_DEVICE_OUT_ALL_SCO)) &&

             ((force_restart_session) ||

             (platform_check_backends_match(snd_device, usecase->out_snd_device)))) {



                ALOGD("%s:becf: check_usecases (%s) is active on (%s) - disabling ..",

                    __func__, use_case_table[usecase->id],
@@ -1398,6 +1400,8 @@ static bool force_device_switch(struct audio_usecase *usecase) 
    }



    // Force all a2dp output devices to reconfigure for proper AFE encode format

    //Also handle a case where in earlier a2dp start failed as A2DP stream was

    //in suspended state, hence try to trigger a retry when we again get a routing request.

    if((usecase->stream.out) &&

       (usecase->stream.out->devices & AUDIO_DEVICE_OUT_ALL_A2DP) &&

        audio_extn_a2dp_is_force_device_switch()) {
@@ -2607,7 +2611,10 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) 
        /* To avoid a2dp to sco overlapping force route BT usecases

         * to speaker based on Phone state

         */

        if ((val & AUDIO_DEVICE_OUT_ALL_A2DP) &&

        if ((((val & AUDIO_DEVICE_OUT_SPEAKER) &&

                  (val & AUDIO_DEVICE_OUT_ALL_A2DP)) ||

              ((adev->snd_dev_ref_cnt[SND_DEVICE_OUT_BT_A2DP] == 0) &&

                  (val & AUDIO_DEVICE_OUT_ALL_A2DP))) &&

            ((adev->mode == AUDIO_MODE_RINGTONE) ||

            (adev->mode == AUDIO_MODE_IN_CALL))) {

            ALOGD("Forcing a2dp routing to speaker for ring/call mode");