Merge "libeffects: Rename .c files at lvm/lib to .cpp"

gugelfrei
Andy Hung 4 years ago committed by Gerrit Code Review
commit 70ee7b5eb4

@ -10,107 +10,107 @@ cc_library_static {
vendor: true,
srcs: [
"StereoWidening/src/LVCS_BypassMix.c",
"StereoWidening/src/LVCS_Control.c",
"StereoWidening/src/LVCS_Equaliser.c",
"StereoWidening/src/LVCS_Init.c",
"StereoWidening/src/LVCS_Process.c",
"StereoWidening/src/LVCS_ReverbGenerator.c",
"StereoWidening/src/LVCS_StereoEnhancer.c",
"StereoWidening/src/LVCS_Tables.c",
"Bass/src/LVDBE_Control.c",
"Bass/src/LVDBE_Init.c",
"Bass/src/LVDBE_Process.c",
"Bass/src/LVDBE_Tables.c",
"Bundle/src/LVM_API_Specials.c",
"Bundle/src/LVM_Buffers.c",
"Bundle/src/LVM_Init.c",
"Bundle/src/LVM_Process.c",
"Bundle/src/LVM_Tables.c",
"Bundle/src/LVM_Control.c",
"SpectrumAnalyzer/src/LVPSA_Control.c",
"SpectrumAnalyzer/src/LVPSA_Init.c",
"SpectrumAnalyzer/src/LVPSA_Memory.c",
"SpectrumAnalyzer/src/LVPSA_Process.c",
"SpectrumAnalyzer/src/LVPSA_QPD_Init.c",
"SpectrumAnalyzer/src/LVPSA_QPD_Process.c",
"SpectrumAnalyzer/src/LVPSA_Tables.c",
"Eq/src/LVEQNB_CalcCoef.c",
"Eq/src/LVEQNB_Control.c",
"Eq/src/LVEQNB_Init.c",
"Eq/src/LVEQNB_Process.c",
"Eq/src/LVEQNB_Tables.c",
"Common/src/InstAlloc.c",
"Common/src/DC_2I_D16_TRC_WRA_01.c",
"Common/src/DC_2I_D16_TRC_WRA_01_Init.c",
"Common/src/FO_2I_D16F32C15_LShx_TRC_WRA_01.c",
"Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Init.c",
"Common/src/FO_1I_D16F16C15_TRC_WRA_01.c",
"Common/src/FO_1I_D16F16Css_TRC_WRA_01_Init.c",
"Common/src/BP_1I_D16F32C30_TRC_WRA_01.c",
"Common/src/BP_1I_D16F16C14_TRC_WRA_01.c",
"Common/src/BP_1I_D32F32C30_TRC_WRA_02.c",
"Common/src/BP_1I_D16F16Css_TRC_WRA_01_Init.c",
"Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Init.c",
"Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Init.c",
"Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Init.c",
"Common/src/BQ_2I_D32F32C30_TRC_WRA_01.c",
"Common/src/BQ_2I_D16F32C15_TRC_WRA_01.c",
"Common/src/BQ_2I_D16F32C14_TRC_WRA_01.c",
"Common/src/BQ_2I_D16F32C13_TRC_WRA_01.c",
"Common/src/BQ_2I_D16F32Css_TRC_WRA_01_init.c",
"Common/src/BQ_2I_D16F16C15_TRC_WRA_01.c",
"Common/src/BQ_2I_D16F16C14_TRC_WRA_01.c",
"Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Init.c",
"Common/src/BQ_1I_D16F16C15_TRC_WRA_01.c",
"Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Init.c",
"Common/src/BQ_1I_D16F32C14_TRC_WRA_01.c",
"Common/src/BQ_1I_D16F32Css_TRC_WRA_01_init.c",
"Common/src/PK_2I_D32F32C30G11_TRC_WRA_01.c",
"Common/src/PK_2I_D32F32C14G11_TRC_WRA_01.c",
"Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Init.c",
"Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Init.c",
"Common/src/Int16LShiftToInt32_16x32.c",
"Common/src/From2iToMono_16.c",
"Common/src/Copy_16.c",
"Common/src/MonoTo2I_16.c",
"Common/src/MonoTo2I_32.c",
"Common/src/LoadConst_16.c",
"Common/src/LoadConst_32.c",
"Common/src/dB_to_Lin32.c",
"Common/src/Shift_Sat_v16xv16.c",
"Common/src/Shift_Sat_v32xv32.c",
"Common/src/Abs_32.c",
"Common/src/Int32RShiftToInt16_Sat_32x16.c",
"Common/src/From2iToMono_32.c",
"Common/src/mult3s_16x16.c",
"Common/src/Mult3s_32x16.c",
"Common/src/NonLinComp_D16.c",
"Common/src/DelayMix_16x16.c",
"Common/src/MSTo2i_Sat_16x16.c",
"Common/src/From2iToMS_16x16.c",
"Common/src/Mac3s_Sat_16x16.c",
"Common/src/Mac3s_Sat_32x16.c",
"Common/src/Add2_Sat_16x16.c",
"Common/src/Add2_Sat_32x32.c",
"Common/src/LVC_MixSoft_1St_2i_D16C31_SAT.c",
"Common/src/LVC_MixSoft_1St_D16C31_SAT.c",
"Common/src/LVC_Mixer_VarSlope_SetTimeConstant.c",
"Common/src/LVC_Mixer_SetTimeConstant.c",
"Common/src/LVC_Mixer_SetTarget.c",
"Common/src/LVC_Mixer_GetTarget.c",
"Common/src/LVC_Mixer_Init.c",
"Common/src/LVC_Core_MixHard_1St_2i_D16C31_SAT.c",
"Common/src/LVC_Core_MixSoft_1St_2i_D16C31_WRA.c",
"Common/src/LVC_Core_MixInSoft_D16C31_SAT.c",
"Common/src/LVC_Mixer_GetCurrent.c",
"Common/src/LVC_MixSoft_2St_D16C31_SAT.c",
"Common/src/LVC_Core_MixSoft_1St_D16C31_WRA.c",
"Common/src/LVC_Core_MixHard_2St_D16C31_SAT.c",
"Common/src/LVC_MixInSoft_D16C31_SAT.c",
"Common/src/AGC_MIX_VOL_2St1Mon_D32_WRA.c",
"Common/src/LVM_Timer.c",
"Common/src/LVM_Timer_Init.c",
"StereoWidening/src/LVCS_BypassMix.cpp",
"StereoWidening/src/LVCS_Control.cpp",
"StereoWidening/src/LVCS_Equaliser.cpp",
"StereoWidening/src/LVCS_Init.cpp",
"StereoWidening/src/LVCS_Process.cpp",
"StereoWidening/src/LVCS_ReverbGenerator.cpp",
"StereoWidening/src/LVCS_StereoEnhancer.cpp",
"StereoWidening/src/LVCS_Tables.cpp",
"Bass/src/LVDBE_Control.cpp",
"Bass/src/LVDBE_Init.cpp",
"Bass/src/LVDBE_Process.cpp",
"Bass/src/LVDBE_Tables.cpp",
"Bundle/src/LVM_API_Specials.cpp",
"Bundle/src/LVM_Buffers.cpp",
"Bundle/src/LVM_Init.cpp",
"Bundle/src/LVM_Process.cpp",
"Bundle/src/LVM_Tables.cpp",
"Bundle/src/LVM_Control.cpp",
"SpectrumAnalyzer/src/LVPSA_Control.cpp",
"SpectrumAnalyzer/src/LVPSA_Init.cpp",
"SpectrumAnalyzer/src/LVPSA_Memory.cpp",
"SpectrumAnalyzer/src/LVPSA_Process.cpp",
"SpectrumAnalyzer/src/LVPSA_QPD_Init.cpp",
"SpectrumAnalyzer/src/LVPSA_QPD_Process.cpp",
"SpectrumAnalyzer/src/LVPSA_Tables.cpp",
"Eq/src/LVEQNB_CalcCoef.cpp",
"Eq/src/LVEQNB_Control.cpp",
"Eq/src/LVEQNB_Init.cpp",
"Eq/src/LVEQNB_Process.cpp",
"Eq/src/LVEQNB_Tables.cpp",
"Common/src/InstAlloc.cpp",
"Common/src/DC_2I_D16_TRC_WRA_01.cpp",
"Common/src/DC_2I_D16_TRC_WRA_01_Init.cpp",
"Common/src/FO_2I_D16F32C15_LShx_TRC_WRA_01.cpp",
"Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Init.cpp",
"Common/src/FO_1I_D16F16C15_TRC_WRA_01.cpp",
"Common/src/FO_1I_D16F16Css_TRC_WRA_01_Init.cpp",
"Common/src/BP_1I_D16F32C30_TRC_WRA_01.cpp",
"Common/src/BP_1I_D16F16C14_TRC_WRA_01.cpp",
"Common/src/BP_1I_D32F32C30_TRC_WRA_02.cpp",
"Common/src/BP_1I_D16F16Css_TRC_WRA_01_Init.cpp",
"Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Init.cpp",
"Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Init.cpp",
"Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Init.cpp",
"Common/src/BQ_2I_D32F32C30_TRC_WRA_01.cpp",
"Common/src/BQ_2I_D16F32C15_TRC_WRA_01.cpp",
"Common/src/BQ_2I_D16F32C14_TRC_WRA_01.cpp",
"Common/src/BQ_2I_D16F32C13_TRC_WRA_01.cpp",
"Common/src/BQ_2I_D16F32Css_TRC_WRA_01_init.cpp",
"Common/src/BQ_2I_D16F16C15_TRC_WRA_01.cpp",
"Common/src/BQ_2I_D16F16C14_TRC_WRA_01.cpp",
"Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Init.cpp",
"Common/src/BQ_1I_D16F16C15_TRC_WRA_01.cpp",
"Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Init.cpp",
"Common/src/BQ_1I_D16F32C14_TRC_WRA_01.cpp",
"Common/src/BQ_1I_D16F32Css_TRC_WRA_01_init.cpp",
"Common/src/PK_2I_D32F32C30G11_TRC_WRA_01.cpp",
"Common/src/PK_2I_D32F32C14G11_TRC_WRA_01.cpp",
"Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Init.cpp",
"Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Init.cpp",
"Common/src/Int16LShiftToInt32_16x32.cpp",
"Common/src/From2iToMono_16.cpp",
"Common/src/Copy_16.cpp",
"Common/src/MonoTo2I_16.cpp",
"Common/src/MonoTo2I_32.cpp",
"Common/src/LoadConst_16.cpp",
"Common/src/LoadConst_32.cpp",
"Common/src/dB_to_Lin32.cpp",
"Common/src/Shift_Sat_v16xv16.cpp",
"Common/src/Shift_Sat_v32xv32.cpp",
"Common/src/Abs_32.cpp",
"Common/src/Int32RShiftToInt16_Sat_32x16.cpp",
"Common/src/From2iToMono_32.cpp",
"Common/src/mult3s_16x16.cpp",
"Common/src/Mult3s_32x16.cpp",
"Common/src/NonLinComp_D16.cpp",
"Common/src/DelayMix_16x16.cpp",
"Common/src/MSTo2i_Sat_16x16.cpp",
"Common/src/From2iToMS_16x16.cpp",
"Common/src/Mac3s_Sat_16x16.cpp",
"Common/src/Mac3s_Sat_32x16.cpp",
"Common/src/Add2_Sat_16x16.cpp",
"Common/src/Add2_Sat_32x32.cpp",
"Common/src/LVC_MixSoft_1St_2i_D16C31_SAT.cpp",
"Common/src/LVC_MixSoft_1St_D16C31_SAT.cpp",
"Common/src/LVC_Mixer_VarSlope_SetTimeConstant.cpp",
"Common/src/LVC_Mixer_SetTimeConstant.cpp",
"Common/src/LVC_Mixer_SetTarget.cpp",
"Common/src/LVC_Mixer_GetTarget.cpp",
"Common/src/LVC_Mixer_Init.cpp",
"Common/src/LVC_Core_MixHard_1St_2i_D16C31_SAT.cpp",
"Common/src/LVC_Core_MixSoft_1St_2i_D16C31_WRA.cpp",
"Common/src/LVC_Core_MixInSoft_D16C31_SAT.cpp",
"Common/src/LVC_Mixer_GetCurrent.cpp",
"Common/src/LVC_MixSoft_2St_D16C31_SAT.cpp",
"Common/src/LVC_Core_MixSoft_1St_D16C31_WRA.cpp",
"Common/src/LVC_Core_MixHard_2St_D16C31_SAT.cpp",
"Common/src/LVC_MixInSoft_D16C31_SAT.cpp",
"Common/src/AGC_MIX_VOL_2St1Mon_D32_WRA.cpp",
"Common/src/LVM_Timer.cpp",
"Common/src/LVM_Timer_Init.cpp",
],
local_include_dirs: [
@ -135,7 +135,7 @@ cc_library_static {
header_libs: [
"libhardware_headers"
],
cflags: [
cppflags: [
"-fvisibility=hidden",
"-DBUILD_FLOAT",
"-DHIGHER_FS",
@ -159,42 +159,42 @@ cc_library_static {
vendor: true,
srcs: [
"Reverb/src/LVREV_ApplyNewSettings.c",
"Reverb/src/LVREV_ClearAudioBuffers.c",
"Reverb/src/LVREV_GetControlParameters.c",
"Reverb/src/LVREV_GetInstanceHandle.c",
"Reverb/src/LVREV_GetMemoryTable.c",
"Reverb/src/LVREV_Process.c",
"Reverb/src/LVREV_SetControlParameters.c",
"Reverb/src/LVREV_Tables.c",
"Common/src/Abs_32.c",
"Common/src/InstAlloc.c",
"Common/src/LoadConst_16.c",
"Common/src/LoadConst_32.c",
"Common/src/From2iToMono_32.c",
"Common/src/Mult3s_32x16.c",
"Common/src/FO_1I_D32F32C31_TRC_WRA_01.c",
"Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Init.c",
"Common/src/DelayAllPass_Sat_32x16To32.c",
"Common/src/Copy_16.c",
"Common/src/Mac3s_Sat_32x16.c",
"Common/src/DelayWrite_32.c",
"Common/src/Shift_Sat_v32xv32.c",
"Common/src/Add2_Sat_32x32.c",
"Common/src/JoinTo2i_32x32.c",
"Common/src/MonoTo2I_32.c",
"Common/src/LVM_FO_HPF.c",
"Common/src/LVM_FO_LPF.c",
"Common/src/LVM_Polynomial.c",
"Common/src/LVM_Power10.c",
"Common/src/LVM_GetOmega.c",
"Common/src/MixSoft_2St_D32C31_SAT.c",
"Common/src/MixSoft_1St_D32C31_WRA.c",
"Common/src/MixInSoft_D32C31_SAT.c",
"Common/src/LVM_Mixer_TimeConstant.c",
"Common/src/Core_MixHard_2St_D32C31_SAT.c",
"Common/src/Core_MixSoft_1St_D32C31_WRA.c",
"Common/src/Core_MixInSoft_D32C31_SAT.c",
"Reverb/src/LVREV_ApplyNewSettings.cpp",
"Reverb/src/LVREV_ClearAudioBuffers.cpp",
"Reverb/src/LVREV_GetControlParameters.cpp",
"Reverb/src/LVREV_GetInstanceHandle.cpp",
"Reverb/src/LVREV_GetMemoryTable.cpp",
"Reverb/src/LVREV_Process.cpp",
"Reverb/src/LVREV_SetControlParameters.cpp",
"Reverb/src/LVREV_Tables.cpp",
"Common/src/Abs_32.cpp",
"Common/src/InstAlloc.cpp",
"Common/src/LoadConst_16.cpp",
"Common/src/LoadConst_32.cpp",
"Common/src/From2iToMono_32.cpp",
"Common/src/Mult3s_32x16.cpp",
"Common/src/FO_1I_D32F32C31_TRC_WRA_01.cpp",
"Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Init.cpp",
"Common/src/DelayAllPass_Sat_32x16To32.cpp",
"Common/src/Copy_16.cpp",
"Common/src/Mac3s_Sat_32x16.cpp",
"Common/src/DelayWrite_32.cpp",
"Common/src/Shift_Sat_v32xv32.cpp",
"Common/src/Add2_Sat_32x32.cpp",
"Common/src/JoinTo2i_32x32.cpp",
"Common/src/MonoTo2I_32.cpp",
"Common/src/LVM_FO_HPF.cpp",
"Common/src/LVM_FO_LPF.cpp",
"Common/src/LVM_Polynomial.cpp",
"Common/src/LVM_Power10.cpp",
"Common/src/LVM_GetOmega.cpp",
"Common/src/MixSoft_2St_D32C31_SAT.cpp",
"Common/src/MixSoft_1St_D32C31_WRA.cpp",
"Common/src/MixInSoft_D32C31_SAT.cpp",
"Common/src/LVM_Mixer_TimeConstant.cpp",
"Common/src/Core_MixHard_2St_D32C31_SAT.cpp",
"Common/src/Core_MixSoft_1St_D32C31_WRA.cpp",
"Common/src/Core_MixInSoft_D32C31_SAT.cpp",
],
local_include_dirs: [
@ -206,7 +206,7 @@ cc_library_static {
"Common/lib",
],
cflags: [
cppflags: [
"-fvisibility=hidden",
"-DBUILD_FLOAT",
"-DHIGHER_FS",

@ -55,9 +55,6 @@
#ifndef __LVDBE_H__
#define __LVDBE_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/****************************************************************************************/
@ -477,8 +474,5 @@ LVDBE_ReturnStatus_en LVDBE_Process(LVDBE_Handle_t hInstance,
LVM_UINT16 NumSamples);
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __LVDBE_H__ */

@ -131,7 +131,7 @@ void LVDBE_SetFilters(LVDBE_Instance_t *pInstance,
sizeof(pInstance->pData->HPFTaps)/sizeof(LVM_INT16)); /* Number of words */
#else
LoadConst_Float(0, /* Clear the history, value 0 */
(void *)&pInstance->pData->HPFTaps, /* Destination Cast to void: \
(LVM_FLOAT *)&pInstance->pData->HPFTaps, /* Destination Cast to void: \
no dereferencing in function*/
sizeof(pInstance->pData->HPFTaps) / sizeof(LVM_FLOAT)); /* Number of words */
#endif
@ -156,7 +156,7 @@ void LVDBE_SetFilters(LVDBE_Instance_t *pInstance,
sizeof(pInstance->pData->BPFTaps)/sizeof(LVM_INT16)); /* Number of words */
#else
LoadConst_Float(0, /* Clear the history, value 0 */
(void *)&pInstance->pData->BPFTaps, /* Destination Cast to void: \
(LVM_FLOAT *)&pInstance->pData->BPFTaps, /* Destination Cast to void: \
no dereferencing in function*/
sizeof(pInstance->pData->BPFTaps) / sizeof(LVM_FLOAT)); /* Number of words */
#endif

@ -232,8 +232,10 @@ LVDBE_ReturnStatus_en LVDBE_Init(LVDBE_Handle_t *phInstance,
/*
* Set pointer to data and coef memory
*/
pInstance->pData = pMemoryTable->Region[LVDBE_MEMREGION_PERSISTENT_DATA].pBaseAddress;
pInstance->pCoef = pMemoryTable->Region[LVDBE_MEMREGION_PERSISTENT_COEF].pBaseAddress;
pInstance->pData =
(LVDBE_Data_FLOAT_t *)pMemoryTable->Region[LVDBE_MEMREGION_PERSISTENT_DATA].pBaseAddress;
pInstance->pCoef =
(LVDBE_Coef_FLOAT_t *)pMemoryTable->Region[LVDBE_MEMREGION_PERSISTENT_COEF].pBaseAddress;
/*

@ -27,9 +27,6 @@
#ifndef __LVDBE_PRIVATE_H__
#define __LVDBE_PRIVATE_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/****************************************************************************************/
@ -164,8 +161,5 @@ void LVDBE_SetFilters(LVDBE_Instance_t *pInstance,
LVDBE_Params_t *pParams);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __LVDBE_PRIVATE_H__ */

@ -24,6 +24,7 @@
#include "LVDBE.h"
#include "LVDBE_Coeffs.h" /* Filter coefficients */
#include "LVDBE_Tables.h"
#include "BIQUAD.h"

@ -24,9 +24,6 @@
#ifndef __LVBDE_TABLES_H__
#define __LVBDE_TABLES_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include "BIQUAD.h"
#include "LVM_Types.h"
@ -128,8 +125,5 @@ extern const LVM_FLOAT LVDBE_VolumeTCTable[];
extern const LVM_INT16 LVDBE_MixerTCTable[];
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __LVBDE_TABLES_H__ */

@ -53,9 +53,6 @@
#ifndef __LVM_H__
#define __LVM_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/****************************************************************************************/
@ -633,9 +630,6 @@ LVM_ReturnStatus_en LVM_SetVolumeNoSmoothing( LVM_Handle_t hInstance,
LVM_ControlParams_t *pParams);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __LVM_H__ */

@ -72,7 +72,7 @@ LVM_ReturnStatus_en LVM_GetSpectrum(
return LVM_SUCCESS;
}
hPSAInstance = pInstance->hPSAInstance;
hPSAInstance = (pLVPSA_Handle_t *)pInstance->hPSAInstance;
if((pCurrentPeaks == LVM_NULL) ||
(pPastPeaks == LVM_NULL))

@ -198,7 +198,7 @@ LVM_ReturnStatus_en LVM_SetControlParameters(LVM_Handle_t hInstance,
/*
* PSA parameters
*/
if( (pParams->PSA_PeakDecayRate > LVPSA_SPEED_HIGH) ||
if (((LVPSA_LevelDetectSpeed_en)pParams->PSA_PeakDecayRate > LVPSA_SPEED_HIGH) ||
(pParams->PSA_Enable > LVM_PSA_ON))
{
return (LVM_OUTOFRANGE);
@ -333,7 +333,7 @@ void LVM_SetTrebleBoost(LVM_Instance_t *pInstance,
* Clear the taps
*/
LoadConst_Float((LVM_FLOAT)0, /* Value */
(void *)&pInstance->pTE_Taps->TrebleBoost_Taps, /* Destination.\
(LVM_FLOAT *)&pInstance->pTE_Taps->TrebleBoost_Taps, /* Destination.\
Cast to void: no dereferencing in function */
(LVM_UINT16)(sizeof(pInstance->pTE_Taps->TrebleBoost_Taps) / \
sizeof(LVM_FLOAT))); /* Number of words */
@ -514,7 +514,8 @@ void LVM_SetHeadroom(LVM_Instance_t *pInstance,
LVM_INT16 MaxGain = 0;
if ((pParams->EQNB_OperatingMode == LVEQNB_ON) && (pInstance->HeadroomParams.Headroom_OperatingMode == LVM_HEADROOM_ON))
if (((LVEQNB_Mode_en)pParams->EQNB_OperatingMode == LVEQNB_ON)
&& (pInstance->HeadroomParams.Headroom_OperatingMode == LVM_HEADROOM_ON))
{
/* Find typical headroom value */
for(jj = 0; jj < pInstance->HeadroomParams.NHeadroomBands; jj++)
@ -717,7 +718,7 @@ LVM_ReturnStatus_en LVM_ApplyNewSettings(LVM_Handle_t hInstance)
{
LVDBE_ReturnStatus_en DBE_Status;
LVDBE_Params_t DBE_Params;
LVDBE_Handle_t *hDBEInstance = pInstance->hDBEInstance;
LVDBE_Handle_t *hDBEInstance = (LVDBE_Handle_t *)pInstance->hDBEInstance;
/*
@ -770,7 +771,7 @@ LVM_ReturnStatus_en LVM_ApplyNewSettings(LVM_Handle_t hInstance)
{
LVEQNB_ReturnStatus_en EQNB_Status;
LVEQNB_Params_t EQNB_Params;
LVEQNB_Handle_t *hEQNBInstance = pInstance->hEQNBInstance;
LVEQNB_Handle_t *hEQNBInstance = (LVEQNB_Handle_t *)pInstance->hEQNBInstance;
/*
@ -847,7 +848,7 @@ LVM_ReturnStatus_en LVM_ApplyNewSettings(LVM_Handle_t hInstance)
{
LVCS_ReturnStatus_en CS_Status;
LVCS_Params_t CS_Params;
LVCS_Handle_t *hCSInstance = pInstance->hCSInstance;
LVCS_Handle_t *hCSInstance = (LVCS_Handle_t *)pInstance->hCSInstance;
LVM_Mode_en CompressorMode=LVM_MODE_ON;
/*
@ -898,8 +899,8 @@ LVM_ReturnStatus_en LVM_ApplyNewSettings(LVM_Handle_t hInstance)
/*
* Set the control flag
*/
if ((LocalParams.OperatingMode == LVM_MODE_ON) &&
(LocalParams.VirtualizerOperatingMode != LVCS_OFF))
if (((LVM_Mode_en)LocalParams.OperatingMode == LVM_MODE_ON) &&
((LVCS_Modes_en)LocalParams.VirtualizerOperatingMode != LVCS_OFF))
{
pInstance->CS_Active = LVM_TRUE;
}
@ -933,7 +934,7 @@ LVM_ReturnStatus_en LVM_ApplyNewSettings(LVM_Handle_t hInstance)
{
LVPSA_RETURN PSA_Status;
LVPSA_ControlParams_t PSA_Params;
pLVPSA_Handle_t *hPSAInstance = pInstance->hPSAInstance;
pLVPSA_Handle_t *hPSAInstance = (pLVPSA_Handle_t *)pInstance->hPSAInstance;
/*

@ -634,7 +634,8 @@ LVM_ReturnStatus_en LVM_GetInstanceHandle(LVM_Handle_t *phInstance,
/*
* Managed buffers required
*/
pInstance->pBufferManagement = InstAlloc_AddMember(&AllocMem[LVM_MEMREGION_PERSISTENT_SLOW_DATA],
pInstance->pBufferManagement = (LVM_Buffer_t *)
InstAlloc_AddMember(&AllocMem[LVM_MEMREGION_PERSISTENT_SLOW_DATA],
sizeof(LVM_Buffer_t));
#ifdef BUILD_FLOAT
BundleScratchSize = (LVM_INT32)
@ -644,8 +645,10 @@ LVM_ReturnStatus_en LVM_GetInstanceHandle(LVM_Handle_t *phInstance,
#else
BundleScratchSize = (LVM_INT32)(6 * (MIN_INTERNAL_BLOCKSIZE + InternalBlockSize) * sizeof(LVM_INT16));
#endif
pInstance->pBufferManagement->pScratch = InstAlloc_AddMember(&AllocMem[LVM_MEMREGION_TEMPORARY_FAST], /* Scratch 1 buffer */
(LVM_UINT32)BundleScratchSize);
pInstance->pBufferManagement->pScratch = (LVM_FLOAT *)
InstAlloc_AddMember(
&AllocMem[LVM_MEMREGION_TEMPORARY_FAST], /* Scratch 1 buffer */
(LVM_UINT32)BundleScratchSize);
#ifdef BUILD_FLOAT
LoadConst_Float(0, /* Clear the input delay buffer */
(LVM_FLOAT *)&pInstance->pBufferManagement->InDelayBuffer,
@ -760,10 +763,12 @@ LVM_ReturnStatus_en LVM_GetInstanceHandle(LVM_Handle_t *phInstance,
/*
* Set the default EQNB pre-gain and pointer to the band definitions
*/
pInstance->pEQNB_BandDefs = InstAlloc_AddMember(&AllocMem[LVM_MEMREGION_PERSISTENT_FAST_DATA],
(pInstParams->EQNB_NumBands * sizeof(LVM_EQNB_BandDef_t)));
pInstance->pEQNB_UserDefs = InstAlloc_AddMember(&AllocMem[LVM_MEMREGION_PERSISTENT_FAST_DATA],
(pInstParams->EQNB_NumBands * sizeof(LVM_EQNB_BandDef_t)));
pInstance->pEQNB_BandDefs =
(LVM_EQNB_BandDef_t *)InstAlloc_AddMember(&AllocMem[LVM_MEMREGION_PERSISTENT_FAST_DATA],
(pInstParams->EQNB_NumBands * sizeof(LVM_EQNB_BandDef_t)));
pInstance->pEQNB_UserDefs =
(LVM_EQNB_BandDef_t *)InstAlloc_AddMember(&AllocMem[LVM_MEMREGION_PERSISTENT_FAST_DATA],
(pInstParams->EQNB_NumBands * sizeof(LVM_EQNB_BandDef_t)));
/*
@ -954,10 +959,12 @@ LVM_ReturnStatus_en LVM_GetInstanceHandle(LVM_Handle_t *phInstance,
* Headroom management memory allocation
*/
{
pInstance->pHeadroom_BandDefs = InstAlloc_AddMember(&AllocMem[LVM_MEMREGION_PERSISTENT_FAST_DATA],
(LVM_HEADROOM_MAX_NBANDS * sizeof(LVM_HeadroomBandDef_t)));
pInstance->pHeadroom_UserDefs = InstAlloc_AddMember(&AllocMem[LVM_MEMREGION_PERSISTENT_FAST_DATA],
(LVM_HEADROOM_MAX_NBANDS * sizeof(LVM_HeadroomBandDef_t)));
pInstance->pHeadroom_BandDefs = (LVM_HeadroomBandDef_t *)
InstAlloc_AddMember(&AllocMem[LVM_MEMREGION_PERSISTENT_FAST_DATA],
(LVM_HEADROOM_MAX_NBANDS * sizeof(LVM_HeadroomBandDef_t)));
pInstance->pHeadroom_UserDefs = (LVM_HeadroomBandDef_t *)
InstAlloc_AddMember(&AllocMem[LVM_MEMREGION_PERSISTENT_FAST_DATA],
(LVM_HEADROOM_MAX_NBANDS * sizeof(LVM_HeadroomBandDef_t)));
/* Headroom management parameters initialisation */
pInstance->NewHeadroomParams.NHeadroomBands = 2;
@ -1022,7 +1029,7 @@ LVM_ReturnStatus_en LVM_GetInstanceHandle(LVM_Handle_t *phInstance,
/* Fast Temporary */
#ifdef BUILD_FLOAT
pInstance->pPSAInput = InstAlloc_AddMember(&AllocMem[LVM_TEMPORARY_FAST],
pInstance->pPSAInput = (LVM_FLOAT *)InstAlloc_AddMember(&AllocMem[LVM_TEMPORARY_FAST],
(LVM_UINT32) MAX_INTERNAL_BLOCKSIZE * \
sizeof(LVM_FLOAT));
#else

@ -27,9 +27,6 @@
#ifndef __LVM_PRIVATE_H__
#define __LVM_PRIVATE_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/************************************************************************************/
@ -344,9 +341,6 @@ LVM_INT32 LVM_AlgoCallBack( void *pBundleHandle,
void *pData,
LVM_INT16 callbackId);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __LVM_PRIVATE_H__ */

@ -18,9 +18,6 @@
#ifndef __LVM_TABLES_H__
#define __LVM_TABLES_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/************************************************************************************/
/* */
@ -57,9 +54,6 @@ extern const LVM_INT16 LVM_VolumeTable[];
extern const LVM_INT16 LVM_MixerTCTable[];
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __LVM_TABLES_H__ */

@ -19,9 +19,6 @@
#define __AGC_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/**********************************************************************************/
/* */
@ -94,9 +91,6 @@ void AGC_MIX_VOL_2St1Mon_D32_WRA(AGC_MIX_VOL_2St1Mon_D32_t *pInstance, /* I
LVM_INT32 *pDst, /* Stereo destination */
LVM_UINT16 n); /* Number of samples */
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __AGC_H__ */

@ -19,9 +19,6 @@
#define _BIQUAD_H_
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include "LVM_Types.h"
/**********************************************************************************
@ -604,9 +601,6 @@ void DC_2I_D16_TRC_WRA_01 ( Biquad_Instance_t *pInstance,
LVM_INT16 *pDataOut,
LVM_INT16 NrSamples);
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
/**********************************************************************************/

@ -18,9 +18,6 @@
#ifndef _COMP_LIM_H
#define _COMP_LIM_H
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/************************************************************************************/
@ -77,9 +74,6 @@ void NonLinComp_D16(LVM_INT16 Gain,
LVM_INT16 *pSterBfOut,
LVM_INT32 BlockLength);
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* #ifndef _COMP_LIM_H */

@ -18,9 +18,6 @@
#ifndef _FILTER_H_
#define _FILTER_H_
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/**********************************************************************************
INCLUDES
@ -75,9 +72,6 @@ LVM_INT32 LVM_GetOmega(LVM_UINT16 Fc,
LVM_Fs_en SampleRate);
#endif
/**********************************************************************************/
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /** _FILTER_H_ **/

@ -18,9 +18,6 @@
#ifndef __INSTALLOC_H__
#define __INSTALLOC_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include "LVM_Types.h"
/*######################################################################################*/
@ -85,8 +82,5 @@ void InstAlloc_InitAll( INST_ALLOC *pms,
void InstAlloc_InitAll_NULL( INST_ALLOC *pms);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __JBS_INSTALLOC_H__ */

@ -27,9 +27,6 @@
#ifndef __LVM_COMMON_H__
#define __LVM_COMMON_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/****************************************************************************************/
@ -53,9 +50,6 @@ extern "C" {
#define ALGORITHM_VC_ID 0x0500
#define ALGORITHM_TE_ID 0x0600
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __LVM_COMMON_H__ */

@ -18,9 +18,6 @@
#ifndef _LVM_MACROS_H_
#define _LVM_MACROS_H_
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/**********************************************************************************
MUL32x32INTO32(A,B,C,ShiftR)
@ -113,9 +110,6 @@ extern "C" {
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* _LVM_MACROS_H_ */

@ -34,9 +34,6 @@
/****************************************************************************************/
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/****************************************************************************************/
/* TYPE DEFINITIONS */
@ -83,8 +80,5 @@ void LVM_Timer ( LVM_Timer_Instance_t *pInstance,
/* END OF HEADER */
/****************************************************************************************/
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __LVM_TIMER_H__ */

@ -25,9 +25,6 @@
#ifndef LVM_TYPES_H
#define LVM_TYPES_H
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include <stdint.h>
@ -223,8 +220,5 @@ typedef LVM_INT32 (*LVM_Callback)(void *pCallbackData, /* Pointer t
/* */
/****************************************************************************************/
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* LVM_TYPES_H */

@ -19,9 +19,6 @@
#define __MIXER_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include "LVM_Types.h"
@ -187,9 +184,6 @@ void Core_MixInSoft_D32C31_SAT( Mix_1St_Cll_t *pInstance,
LVM_INT32 *dst,
LVM_INT16 n);
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
/**********************************************************************************/

@ -18,9 +18,6 @@
#ifndef __SCALARARITHMETIC_H__
#define __SCALARARITHMETIC_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/*######################################################################################*/
@ -59,9 +56,6 @@ LVM_FLOAT dB_to_LinFloat(LVM_INT16 db_fix);
LVM_INT32 dB_to_Lin32(LVM_INT16 db_fix);
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __SCALARARITHMETIC_H__ */

@ -19,9 +19,6 @@
#define _VECTOR_ARITHMETIC_H_
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include "LVM_Types.h"
@ -253,9 +250,6 @@ void Int32RShiftToInt16_Sat_32x16(const LVM_INT32 *src,
LVM_INT16 n,
LVM_INT16 shift );
#ifdef __cplusplus
}
#endif /* __cplusplus */
/**********************************************************************************/

@ -18,9 +18,6 @@
#ifndef FILTERS_H
#define FILTERS_H
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include "LVM_Types.h"
@ -76,9 +73,6 @@ typedef struct
LVM_UINT16 Scale;
} BiquadA01B1CoefsSP_t;
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* FILTERS_H */

@ -19,9 +19,6 @@
#define __LVC_MIXER_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include "LVM_Types.h"
@ -242,9 +239,6 @@ void LVC_MixSoft_1St_2i_D16C31_SAT( LVMixer3_2St_st *pInstance,
LVM_INT16 *dst, /* dst can be equal to src */
LVM_INT16 n); /* Number of stereo samples */
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
/**********************************************************************************/

@ -36,11 +36,11 @@
const LVM_INT32 LVVDL_2PiOnFsTable[] = {LVVDL_2PiBy_8000 , /* 8kHz in Q41, 16kHz in Q42, 32kHz in Q43 */
LVVDL_2PiBy_11025, /* 11025 Hz in Q41, 22050Hz in Q42, 44100 Hz in Q43*/
LVVDL_2PiBy_12000}; /* 12kHz in Q41, 24kHz in Q42, 48kHz in Q43 */
#endif
const LVM_INT32 LVVDL_2PiOnFsShiftTable[]={LVVDL_2PiByFs_SHIFT1 , /* 8kHz, 11025Hz, 12kHz */
LVVDL_2PiByFs_SHIFT2, /* 16kHz, 22050Hz, 24kHz*/
LVVDL_2PiByFs_SHIFT3}; /* 32kHz, 44100Hz, 48kHz */
#endif
#ifdef BUILD_FLOAT
#define LVVDL_2PiBy_8000_f 0.000785398f
#define LVVDL_2PiBy_11025_f 0.000569903f

@ -40,7 +40,7 @@ void LVM_Timer_Init ( LVM_Timer_Instance_t *pInstance,
pInstancePr = (LVM_Timer_Instance_Private_t *)pInstance;
pInstancePr->CallBackParam = pParams->CallBackParam;
pInstancePr->pCallBackParams = pParams->pCallBackParams;
pInstancePr->pCallBackParams = (LVM_INT32 *)pParams->pCallBackParams;
pInstancePr->pCallbackInstance = pParams->pCallbackInstance;
pInstancePr->pCallBack = pParams->pCallBack;
pInstancePr->TimerArmed = 1;

@ -19,9 +19,6 @@
#define LVM_TIMER_PRIVATE_H
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include "LVM_Types.h"
@ -45,8 +42,5 @@ typedef struct
/* END OF HEADER */
/****************************************************************************************/
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* LVM_TIMER_PRIVATE_H */

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save