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

Commit 8f61475f authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "libeffects: Fix LVDBE biquad instance creation" am: 261d874a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1624705

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba87e45787e280649cdc8d021cd0ca87c190bc75
parents 3e4db4ae 261d874a

media/libeffects/lvm/lib/Bass/src/LVDBE_Control.cpp

+5 −3
Original line number Diff line number Diff line
@@ -277,13 +277,15 @@ LVDBE_ReturnStatus_en LVDBE_Control(LVDBE_Handle_t hInstance, LVDBE_Params_t* pP 
    /*

     * Create biquad instance

     */

    if (pInstance->Params.NrChannels != pParams->NrChannels) {

        pInstance->pHPFBiquad.reset(

                new android::audio_utils::BiquadFilter<LVM_FLOAT>(pParams->NrChannels));



    }

    /*

     * Update the filters

     */

    if ((pInstance->Params.SampleRate != pParams->SampleRate) ||

        (pInstance->Params.NrChannels != pParams->NrChannels) ||

        (pInstance->Params.CentreFrequency != pParams->CentreFrequency)) {

        LVDBE_SetFilters(pInstance, /* Instance pointer */

                         pParams);  /* New parameters */

media/libeffects/lvm/lib/Bass/src/LVDBE_Init.cpp

+2 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ LVDBE_ReturnStatus_en LVDBE_Init(LVDBE_Handle_t* phInstance, LVDBE_Capabilities_ 
    pInstance->Params.SampleRate = LVDBE_FS_8000;

    pInstance->Params.VolumeControl = LVDBE_VOLUME_OFF;

    pInstance->Params.VolumedB = 0;

    pInstance->Params.NrChannels = FCC_2;



    /*

     * Create pointer to data and coef memory
@@ -91,7 +92,7 @@ LVDBE_ReturnStatus_en LVDBE_Init(LVDBE_Handle_t* phInstance, LVDBE_Capabilities_ 
     * Create biquad instance

     */

    pInstance->pHPFBiquad.reset(

            new android::audio_utils::BiquadFilter<LVM_FLOAT>(LVM_MAX_CHANNELS));

            new android::audio_utils::BiquadFilter<LVM_FLOAT>(pInstance->Params.NrChannels));

    pInstance->pBPFBiquad.reset(new android::audio_utils::BiquadFilter<LVM_FLOAT>(FCC_1));



    /*