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

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

Merge "Fix biquad coeffs in StereoWidening modules" am: 378c3eb0 am: 8c1b314c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f2b5bfaefae127c829650c3b85a9f83dfb12072
parents 993bb6a8 8c1b314c

media/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.cpp

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ LVCS_ReturnStatus_en LVCS_EqualiserInit(LVCS_Handle_t hInstance, LVCS_Params_t* 


        std::array<LVM_FLOAT, android::audio_utils::kBiquadNumCoefs> coefs = {

                pEqualiserCoefTable[Offset].A0, pEqualiserCoefTable[Offset].A1,

                pEqualiserCoefTable[Offset].A2, -(pEqualiserCoefTable[Offset].B1),

                -(pEqualiserCoefTable[Offset].B2)};

                pEqualiserCoefTable[Offset].A2, pEqualiserCoefTable[Offset].B1,

                pEqualiserCoefTable[Offset].B2};

        pInstance->pEqBiquad.reset(new android::audio_utils::BiquadFilter<LVM_FLOAT>(

                (pParams->NrChannels == FCC_1) ? FCC_1 : FCC_2, coefs));

    }

media/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.cpp

+2 −2
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ LVCS_ReturnStatus_en LVCS_ReverbGeneratorInit(LVCS_Handle_t hInstance, LVCS_Para 


        std::array<LVM_FLOAT, android::audio_utils::kBiquadNumCoefs> coefs = {

                pReverbCoefTable[Offset].A0, pReverbCoefTable[Offset].A1,

                pReverbCoefTable[Offset].A2, -(pReverbCoefTable[Offset].B1),

                -(pReverbCoefTable[Offset].B2)};

                pReverbCoefTable[Offset].A2, pReverbCoefTable[Offset].B1,

                pReverbCoefTable[Offset].B2};

        pInstance->pRevBiquad.reset(new android::audio_utils::BiquadFilter<LVM_FLOAT>(

                (pParams->NrChannels == FCC_1) ? FCC_1 : FCC_2, coefs));

media/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ LVCS_ReturnStatus_en LVCS_SEnhancerInit(LVCS_Handle_t hInstance, LVCS_Params_t* 


        std::array<LVM_FLOAT, android::audio_utils::kBiquadNumCoefs> coefs = {

                LVCS_SEMidCoefTable[Offset].A0, LVCS_SEMidCoefTable[Offset].A1, 0.0,

                -(LVCS_SEMidCoefTable[Offset].B1), 0.0};

                LVCS_SEMidCoefTable[Offset].B1, 0.0};

        pInstance->pSEMidBiquad.reset(

                new android::audio_utils::BiquadFilter<LVM_FLOAT>(FCC_1, coefs));
@@ -77,7 +77,7 @@ LVCS_ReturnStatus_en LVCS_SEnhancerInit(LVCS_Handle_t hInstance, LVCS_Params_t* 


        /* Side filter */

        coefs = {pSESideCoefs[Offset].A0, pSESideCoefs[Offset].A1, pSESideCoefs[Offset].A2,

                 -(pSESideCoefs[Offset].B1), -(pSESideCoefs[Offset].B2)};

                 pSESideCoefs[Offset].B1, pSESideCoefs[Offset].B2};

        pInstance->pSESideBiquad.reset(

                new android::audio_utils::BiquadFilter<LVM_FLOAT>(FCC_1, coefs));

    }