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

Commit 904cf308 authored by Andy Hung's avatar Andy Hung Committed by android-build-merger
Browse files

Merge "libeffects: Fix for crash during playback on bluetooth headset" into qt-dev 

am: 3eaf1bcf

Change-Id: Icbe356524150170420b0db49e77ec019bbdbc1e1
parents bc16d4f2 3eaf1bcf

media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp

+16 −0
Original line number Diff line number Diff line
@@ -650,6 +650,9 @@ int LvmBundle_init(EffectContext *pContext){ 
    params.SpeakerType            = LVM_HEADPHONES;



    pContext->pBundledContext->SampleRate = LVM_FS_44100;

#ifdef SUPPORT_MC

    pContext->pBundledContext->ChMask = AUDIO_CHANNEL_OUT_STEREO;

#endif



    /* Concert Sound parameters */

    params.VirtualizerOperatingMode   = LVM_MODE_OFF;
@@ -695,6 +698,11 @@ int LvmBundle_init(EffectContext *pContext){ 
    params.TE_OperatingMode       = LVM_TE_OFF;

    params.TE_EffectLevel         = 0;



#ifdef SUPPORT_MC

    params.NrChannels             =

        audio_channel_count_from_out_mask(AUDIO_CHANNEL_OUT_STEREO);

    params.ChMask                 = AUDIO_CHANNEL_OUT_STEREO;

#endif

    /* Activate the initial settings */

    LvmStatus = LVM_SetControlParameters(pContext->pBundledContext->hInstance,

                                         &params);
@@ -1297,7 +1305,12 @@ int Effect_setConfig(EffectContext *pContext, effect_config_t *pConfig){ 
        return -EINVAL;

    }



#ifdef SUPPORT_MC

    if (pContext->pBundledContext->SampleRate != SampleRate ||

        pContext->pBundledContext->ChMask != pConfig->inputCfg.channels) {

#else

    if(pContext->pBundledContext->SampleRate != SampleRate){

#endif



        LVM_ControlParams_t     ActiveParams;

        LVM_ReturnStatus_en     LvmStatus = LVM_SUCCESS;
@@ -1323,6 +1336,9 @@ int Effect_setConfig(EffectContext *pContext, effect_config_t *pConfig){ 
        LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "Effect_setConfig")

        ALOGV("\tEffect_setConfig Succesfully called LVM_SetControlParameters\n");

        pContext->pBundledContext->SampleRate = SampleRate;

#ifdef SUPPORT_MC

        pContext->pBundledContext->ChMask = pConfig->inputCfg.channels;

#endif



        LvmEffect_limitLevel(pContext);

media/libeffects/lvm/wrapper/Bundle/EffectBundle.h

+3 −0
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ struct BundledEffectContext{ 
    LVM_FLOAT                       *pInputBuffer;

    LVM_FLOAT                       *pOutputBuffer;

#endif

#ifdef SUPPORT_MC

    LVM_INT32                       ChMask;

#endif

};



/* SessionContext : One session */