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

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

Merge "Biquad Opt: Commenting unused biquad functions" am: cf11d207 am: 0377530b 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieaef8a8b0f5f6c6ff633d48d9e3b0e01a8e32ea8
parents 9a0db842 0377530b

media/libeffects/lvm/lib/Common/lib/BIQUAD.h

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ typedef struct { 
    LVM_FLOAT G;  /* Gain */

} PK_FLOAT_Coefs_t;



#ifndef BIQUAD_OPT

/**********************************************************************************

   TAPS TYPE DEFINITIONS

***********************************************************************************/
@@ -100,6 +101,7 @@ typedef struct { 
#define BQ_2I_D32F32Cll_TRC_WRA_01_Init Init_BQ_2I_D32F32Cll_TRC_WRA_01

#define BP_1I_D32F32C30_TRC_WRA_02 TWO_BP_1I_D32F32C30_TRC_WRA_02





/**********************************************************************************

   FUNCTION PROTOTYPES: BIQUAD FILTERS

***********************************************************************************/
@@ -168,6 +170,7 @@ void FO_1I_D32F32C31_TRC_WRA_01(Biquad_FLOAT_Instance_t* pInstance, LVM_FLOAT* p 
                                LVM_FLOAT* pDataOut, LVM_INT16 NrSamples);

void FO_Mc_D16F32C15_LShx_TRC_WRA_01(Biquad_FLOAT_Instance_t* pInstance, LVM_FLOAT* pDataIn,

                                     LVM_FLOAT* pDataOut, LVM_INT16 NrFrames, LVM_INT16 NrChannels);



/**********************************************************************************

   FUNCTION PROTOTYPES: BAND PASS FILTERS

***********************************************************************************/
@@ -181,6 +184,7 @@ void BP_1I_D16F32Cll_TRC_WRA_01_Init(Biquad_FLOAT_Instance_t* pInstance, 
                                     Biquad_1I_Order2_FLOAT_Taps_t* pTaps, BP_FLOAT_Coefs_t* pCoef);

void BP_1I_D16F32C30_TRC_WRA_01(Biquad_FLOAT_Instance_t* pInstance, LVM_FLOAT* pDataIn,

                                LVM_FLOAT* pDataOut, LVM_INT16 NrSamples);



/*** 32 bit data path *************************************************************/

void BP_1I_D32F32Cll_TRC_WRA_02_Init(Biquad_FLOAT_Instance_t* pInstance,

                                     Biquad_1I_Order2_FLOAT_Taps_t* pTaps, BP_FLOAT_Coefs_t* pCoef);
@@ -193,6 +197,7 @@ void PK_2I_D32F32CssGss_TRC_WRA_01_Init(Biquad_FLOAT_Instance_t* pInstance, 
                                        PK_FLOAT_Coefs_t* pCoef);

void PK_Mc_D32F32C14G11_TRC_WRA_01(Biquad_FLOAT_Instance_t* pInstance, LVM_FLOAT* pDataIn,

                                   LVM_FLOAT* pDataOut, LVM_INT16 NrFrames, LVM_INT16 NrChannels);

#endif



/**********************************************************************************

   FUNCTION PROTOTYPES: DC REMOVAL FILTERS

media/libeffects/lvm/lib/Common/src/BP_1I_D16F16C14_TRC_WRA_01.cpp

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef BIQUAD_OPT

#include "BIQUAD.h"

#include "BP_1I_D16F16Css_TRC_WRA_01_Private.h"

#include "LVM_Macros.h"
@@ -67,3 +67,4 @@ void BP_1I_D16F16C14_TRC_WRA_01(Biquad_FLOAT_Instance_t* pInstance, LVM_FLOAT* p 
        *pDataOut++ = ynL;  // Write Left output

    }

}

#endif

media/libeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Init.cpp

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */



/*-------------------------------------------------------------------------*/

#ifndef BIQUAD_OPT

#include "BIQUAD.h"

#include "BP_1I_D16F16Css_TRC_WRA_01_Private.h"
@@ -47,5 +48,6 @@ void BP_1I_D16F16Css_TRC_WRA_01_Init(Biquad_FLOAT_Instance_t* pInstance, 
    pBiquadState->coefs[1] = pCoef->B2;

    pBiquadState->coefs[2] = pCoef->B1;

}

#endif

/*-------------------------------------------------------------------------*/

/* End Of File: BP_1I_D16F16Css_TRC_WRA_01_Init.c                              */

media/libeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Private.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#ifndef BIQUAD_OPT

#ifndef _BP_1I_D16F16CSS_TRC_WRA_01_PRIVATE_H_

#define _BP_1I_D16F16CSS_TRC_WRA_01_PRIVATE_H_
@@ -32,3 +33,4 @@ typedef struct _Filter_State_FLOAT { 
} Filter_State_FLOAT;

typedef Filter_State_FLOAT* PFilter_State_FLOAT;

#endif /*_BP_1I_D16F16CSS_TRC_WRA_01_PRIVATE_H_*/

#endif

media/libeffects/lvm/lib/Common/src/BP_1I_D16F32C30_TRC_WRA_01.cpp

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef BIQUAD_OPT

#include "BIQUAD.h"

#include "BP_1I_D16F32Cll_TRC_WRA_01_Private.h"

#include "LVM_Macros.h"
@@ -68,3 +68,4 @@ void BP_1I_D16F32C30_TRC_WRA_01(Biquad_FLOAT_Instance_t* pInstance, LVM_FLOAT* p 
        *pDataOut++ = (ynL);  // Write Left output

    }

}

#endif