diff --git a/media/libeffects/lvm/lib/Android.bp b/media/libeffects/lvm/lib/Android.bp index d150f18558..6d998d1f95 100644 --- a/media/libeffects/lvm/lib/Android.bp +++ b/media/libeffects/lvm/lib/Android.bp @@ -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", diff --git a/media/libeffects/lvm/lib/Bass/lib/LVDBE.h b/media/libeffects/lvm/lib/Bass/lib/LVDBE.h index cc066b0ebf..261a21a3b8 100644 --- a/media/libeffects/lvm/lib/Bass/lib/LVDBE.h +++ b/media/libeffects/lvm/lib/Bass/lib/LVDBE.h @@ -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__ */ diff --git a/media/libeffects/lvm/lib/Bass/src/LVDBE_Control.c b/media/libeffects/lvm/lib/Bass/src/LVDBE_Control.cpp similarity index 99% rename from media/libeffects/lvm/lib/Bass/src/LVDBE_Control.c rename to media/libeffects/lvm/lib/Bass/src/LVDBE_Control.cpp index 0ba2c8604e..513c67afea 100644 --- a/media/libeffects/lvm/lib/Bass/src/LVDBE_Control.c +++ b/media/libeffects/lvm/lib/Bass/src/LVDBE_Control.cpp @@ -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 diff --git a/media/libeffects/lvm/lib/Bass/src/LVDBE_Init.c b/media/libeffects/lvm/lib/Bass/src/LVDBE_Init.cpp similarity index 98% rename from media/libeffects/lvm/lib/Bass/src/LVDBE_Init.c rename to media/libeffects/lvm/lib/Bass/src/LVDBE_Init.cpp index 2946734d7e..a5500bac4d 100644 --- a/media/libeffects/lvm/lib/Bass/src/LVDBE_Init.c +++ b/media/libeffects/lvm/lib/Bass/src/LVDBE_Init.cpp @@ -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; /* diff --git a/media/libeffects/lvm/lib/Bass/src/LVDBE_Private.h b/media/libeffects/lvm/lib/Bass/src/LVDBE_Private.h index 4225a30a4e..458e9e80f1 100644 --- a/media/libeffects/lvm/lib/Bass/src/LVDBE_Private.h +++ b/media/libeffects/lvm/lib/Bass/src/LVDBE_Private.h @@ -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__ */ diff --git a/media/libeffects/lvm/lib/Bass/src/LVDBE_Process.c b/media/libeffects/lvm/lib/Bass/src/LVDBE_Process.cpp similarity index 100% rename from media/libeffects/lvm/lib/Bass/src/LVDBE_Process.c rename to media/libeffects/lvm/lib/Bass/src/LVDBE_Process.cpp diff --git a/media/libeffects/lvm/lib/Bass/src/LVDBE_Tables.c b/media/libeffects/lvm/lib/Bass/src/LVDBE_Tables.cpp similarity index 99% rename from media/libeffects/lvm/lib/Bass/src/LVDBE_Tables.c rename to media/libeffects/lvm/lib/Bass/src/LVDBE_Tables.cpp index a2ce40458f..058dcf6294 100644 --- a/media/libeffects/lvm/lib/Bass/src/LVDBE_Tables.c +++ b/media/libeffects/lvm/lib/Bass/src/LVDBE_Tables.cpp @@ -24,6 +24,7 @@ #include "LVDBE.h" #include "LVDBE_Coeffs.h" /* Filter coefficients */ +#include "LVDBE_Tables.h" #include "BIQUAD.h" diff --git a/media/libeffects/lvm/lib/Bass/src/LVDBE_Tables.h b/media/libeffects/lvm/lib/Bass/src/LVDBE_Tables.h index ca46e37c18..fea09f35e1 100644 --- a/media/libeffects/lvm/lib/Bass/src/LVDBE_Tables.h +++ b/media/libeffects/lvm/lib/Bass/src/LVDBE_Tables.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__ */ diff --git a/media/libeffects/lvm/lib/Bundle/lib/LVM.h b/media/libeffects/lvm/lib/Bundle/lib/LVM.h index 5082a53272..3c089a0d4a 100644 --- a/media/libeffects/lvm/lib/Bundle/lib/LVM.h +++ b/media/libeffects/lvm/lib/Bundle/lib/LVM.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__ */ diff --git a/media/libeffects/lvm/lib/Bundle/src/LVM_API_Specials.c b/media/libeffects/lvm/lib/Bundle/src/LVM_API_Specials.cpp similarity index 99% rename from media/libeffects/lvm/lib/Bundle/src/LVM_API_Specials.c rename to media/libeffects/lvm/lib/Bundle/src/LVM_API_Specials.cpp index 07b7f0e128..62d9ee3a3b 100644 --- a/media/libeffects/lvm/lib/Bundle/src/LVM_API_Specials.c +++ b/media/libeffects/lvm/lib/Bundle/src/LVM_API_Specials.cpp @@ -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)) diff --git a/media/libeffects/lvm/lib/Bundle/src/LVM_Buffers.c b/media/libeffects/lvm/lib/Bundle/src/LVM_Buffers.cpp similarity index 100% rename from media/libeffects/lvm/lib/Bundle/src/LVM_Buffers.c rename to media/libeffects/lvm/lib/Bundle/src/LVM_Buffers.cpp diff --git a/media/libeffects/lvm/lib/Bundle/src/LVM_Control.c b/media/libeffects/lvm/lib/Bundle/src/LVM_Control.cpp similarity index 98% rename from media/libeffects/lvm/lib/Bundle/src/LVM_Control.c rename to media/libeffects/lvm/lib/Bundle/src/LVM_Control.cpp index 1b27cb4bfe..ab1c078346 100644 --- a/media/libeffects/lvm/lib/Bundle/src/LVM_Control.c +++ b/media/libeffects/lvm/lib/Bundle/src/LVM_Control.cpp @@ -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; /* diff --git a/media/libeffects/lvm/lib/Bundle/src/LVM_Init.c b/media/libeffects/lvm/lib/Bundle/src/LVM_Init.cpp similarity index 97% rename from media/libeffects/lvm/lib/Bundle/src/LVM_Init.c rename to media/libeffects/lvm/lib/Bundle/src/LVM_Init.cpp index c57498e5a3..d7739106df 100644 --- a/media/libeffects/lvm/lib/Bundle/src/LVM_Init.c +++ b/media/libeffects/lvm/lib/Bundle/src/LVM_Init.cpp @@ -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 diff --git a/media/libeffects/lvm/lib/Bundle/src/LVM_Private.h b/media/libeffects/lvm/lib/Bundle/src/LVM_Private.h index cdd3134bd2..2bae70266c 100644 --- a/media/libeffects/lvm/lib/Bundle/src/LVM_Private.h +++ b/media/libeffects/lvm/lib/Bundle/src/LVM_Private.h @@ -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__ */ diff --git a/media/libeffects/lvm/lib/Bundle/src/LVM_Process.c b/media/libeffects/lvm/lib/Bundle/src/LVM_Process.cpp similarity index 100% rename from media/libeffects/lvm/lib/Bundle/src/LVM_Process.c rename to media/libeffects/lvm/lib/Bundle/src/LVM_Process.cpp diff --git a/media/libeffects/lvm/lib/Bundle/src/LVM_Tables.c b/media/libeffects/lvm/lib/Bundle/src/LVM_Tables.cpp similarity index 100% rename from media/libeffects/lvm/lib/Bundle/src/LVM_Tables.c rename to media/libeffects/lvm/lib/Bundle/src/LVM_Tables.cpp diff --git a/media/libeffects/lvm/lib/Bundle/src/LVM_Tables.h b/media/libeffects/lvm/lib/Bundle/src/LVM_Tables.h index 4cf7119f5b..3fd2f89473 100644 --- a/media/libeffects/lvm/lib/Bundle/src/LVM_Tables.h +++ b/media/libeffects/lvm/lib/Bundle/src/LVM_Tables.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__ */ diff --git a/media/libeffects/lvm/lib/Common/lib/AGC.h b/media/libeffects/lvm/lib/Common/lib/AGC.h index 06e742eaf3..f75d983cb1 100644 --- a/media/libeffects/lvm/lib/Common/lib/AGC.h +++ b/media/libeffects/lvm/lib/Common/lib/AGC.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__ */ diff --git a/media/libeffects/lvm/lib/Common/lib/BIQUAD.h b/media/libeffects/lvm/lib/Common/lib/BIQUAD.h index 01539b26a0..2baba7c8ae 100644 --- a/media/libeffects/lvm/lib/Common/lib/BIQUAD.h +++ b/media/libeffects/lvm/lib/Common/lib/BIQUAD.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 */ /**********************************************************************************/ diff --git a/media/libeffects/lvm/lib/Common/lib/CompLim.h b/media/libeffects/lvm/lib/Common/lib/CompLim.h index 498faa3e19..4e7adddd43 100644 --- a/media/libeffects/lvm/lib/Common/lib/CompLim.h +++ b/media/libeffects/lvm/lib/Common/lib/CompLim.h @@ -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 */ diff --git a/media/libeffects/lvm/lib/Common/lib/Filter.h b/media/libeffects/lvm/lib/Common/lib/Filter.h index 0c8955db93..3133ce2ab1 100644 --- a/media/libeffects/lvm/lib/Common/lib/Filter.h +++ b/media/libeffects/lvm/lib/Common/lib/Filter.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_ **/ diff --git a/media/libeffects/lvm/lib/Common/lib/InstAlloc.h b/media/libeffects/lvm/lib/Common/lib/InstAlloc.h index 7f725f4c3e..10b5775943 100644 --- a/media/libeffects/lvm/lib/Common/lib/InstAlloc.h +++ b/media/libeffects/lvm/lib/Common/lib/InstAlloc.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__ */ diff --git a/media/libeffects/lvm/lib/Common/lib/LVM_Common.h b/media/libeffects/lvm/lib/Common/lib/LVM_Common.h index ceccd7b540..96da872159 100644 --- a/media/libeffects/lvm/lib/Common/lib/LVM_Common.h +++ b/media/libeffects/lvm/lib/Common/lib/LVM_Common.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__ */ diff --git a/media/libeffects/lvm/lib/Common/lib/LVM_Macros.h b/media/libeffects/lvm/lib/Common/lib/LVM_Macros.h index 97d13a50f6..2ecc7f84ce 100644 --- a/media/libeffects/lvm/lib/Common/lib/LVM_Macros.h +++ b/media/libeffects/lvm/lib/Common/lib/LVM_Macros.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_ */ diff --git a/media/libeffects/lvm/lib/Common/lib/LVM_Timer.h b/media/libeffects/lvm/lib/Common/lib/LVM_Timer.h index a76354d449..9722bf5827 100644 --- a/media/libeffects/lvm/lib/Common/lib/LVM_Timer.h +++ b/media/libeffects/lvm/lib/Common/lib/LVM_Timer.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__ */ diff --git a/media/libeffects/lvm/lib/Common/lib/LVM_Types.h b/media/libeffects/lvm/lib/Common/lib/LVM_Types.h index fbfdd4df5c..3eae70e317 100644 --- a/media/libeffects/lvm/lib/Common/lib/LVM_Types.h +++ b/media/libeffects/lvm/lib/Common/lib/LVM_Types.h @@ -25,9 +25,6 @@ #ifndef LVM_TYPES_H #define LVM_TYPES_H -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ #include @@ -223,8 +220,5 @@ typedef LVM_INT32 (*LVM_Callback)(void *pCallbackData, /* Pointer t /* */ /****************************************************************************************/ -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* LVM_TYPES_H */ diff --git a/media/libeffects/lvm/lib/Common/lib/Mixer.h b/media/libeffects/lvm/lib/Common/lib/Mixer.h index 07c53cdd06..c63d882bf9 100644 --- a/media/libeffects/lvm/lib/Common/lib/Mixer.h +++ b/media/libeffects/lvm/lib/Common/lib/Mixer.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 */ /**********************************************************************************/ diff --git a/media/libeffects/lvm/lib/Common/lib/ScalarArithmetic.h b/media/libeffects/lvm/lib/Common/lib/ScalarArithmetic.h index cdb3837843..a492a13625 100644 --- a/media/libeffects/lvm/lib/Common/lib/ScalarArithmetic.h +++ b/media/libeffects/lvm/lib/Common/lib/ScalarArithmetic.h @@ -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__ */ diff --git a/media/libeffects/lvm/lib/Common/lib/VectorArithmetic.h b/media/libeffects/lvm/lib/Common/lib/VectorArithmetic.h index 7468a90d95..5acb363679 100644 --- a/media/libeffects/lvm/lib/Common/lib/VectorArithmetic.h +++ b/media/libeffects/lvm/lib/Common/lib/VectorArithmetic.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 */ /**********************************************************************************/ diff --git a/media/libeffects/lvm/lib/Common/src/AGC_MIX_VOL_2St1Mon_D32_WRA.c b/media/libeffects/lvm/lib/Common/src/AGC_MIX_VOL_2St1Mon_D32_WRA.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/AGC_MIX_VOL_2St1Mon_D32_WRA.c rename to media/libeffects/lvm/lib/Common/src/AGC_MIX_VOL_2St1Mon_D32_WRA.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Abs_32.c b/media/libeffects/lvm/lib/Common/src/Abs_32.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Abs_32.c rename to media/libeffects/lvm/lib/Common/src/Abs_32.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Add2_Sat_16x16.c b/media/libeffects/lvm/lib/Common/src/Add2_Sat_16x16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Add2_Sat_16x16.c rename to media/libeffects/lvm/lib/Common/src/Add2_Sat_16x16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Add2_Sat_32x32.c b/media/libeffects/lvm/lib/Common/src/Add2_Sat_32x32.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Add2_Sat_32x32.c rename to media/libeffects/lvm/lib/Common/src/Add2_Sat_32x32.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BP_1I_D16F16C14_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/BP_1I_D16F16C14_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BP_1I_D16F16C14_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/BP_1I_D16F16C14_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Init.c b/media/libeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Init.c rename to media/libeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BP_1I_D16F32C30_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/BP_1I_D16F32C30_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BP_1I_D16F32C30_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/BP_1I_D16F32C30_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Init.c b/media/libeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Init.c rename to media/libeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BP_1I_D32F32C30_TRC_WRA_02.c b/media/libeffects/lvm/lib/Common/src/BP_1I_D32F32C30_TRC_WRA_02.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BP_1I_D32F32C30_TRC_WRA_02.c rename to media/libeffects/lvm/lib/Common/src/BP_1I_D32F32C30_TRC_WRA_02.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Init.c b/media/libeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Init.c rename to media/libeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BQ_1I_D16F16C15_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/BQ_1I_D16F16C15_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BQ_1I_D16F16C15_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/BQ_1I_D16F16C15_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Init.c b/media/libeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Init.c rename to media/libeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BQ_1I_D16F32C14_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/BQ_1I_D16F32C14_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BQ_1I_D16F32C14_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/BQ_1I_D16F32C14_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_init.c b/media/libeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_init.c rename to media/libeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C14_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C14_TRC_WRA_01.cpp similarity index 99% rename from media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C14_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C14_TRC_WRA_01.cpp index 9b0fde39be..8ee76c96bc 100644 --- a/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C14_TRC_WRA_01.c +++ b/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C14_TRC_WRA_01.cpp @@ -186,4 +186,4 @@ void BQ_2I_D16F16C14_TRC_WRA_01 ( Biquad_Instance_t *pInstance, } -#endif \ No newline at end of file +#endif diff --git a/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C15_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C15_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C15_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C15_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Init.c b/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Init.c rename to media/libeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C13_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C13_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C13_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C13_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C14_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C14_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C14_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C14_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C15_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C15_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C15_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C15_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_init.c b/media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_init.c rename to media/libeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BQ_2I_D32F32C30_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/BQ_2I_D32F32C30_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BQ_2I_D32F32C30_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/BQ_2I_D32F32C30_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Init.c b/media/libeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Init.c rename to media/libeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Copy_16.c b/media/libeffects/lvm/lib/Common/src/Copy_16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Copy_16.c rename to media/libeffects/lvm/lib/Common/src/Copy_16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Core_MixHard_2St_D32C31_SAT.c b/media/libeffects/lvm/lib/Common/src/Core_MixHard_2St_D32C31_SAT.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Core_MixHard_2St_D32C31_SAT.c rename to media/libeffects/lvm/lib/Common/src/Core_MixHard_2St_D32C31_SAT.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Core_MixInSoft_D32C31_SAT.c b/media/libeffects/lvm/lib/Common/src/Core_MixInSoft_D32C31_SAT.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Core_MixInSoft_D32C31_SAT.c rename to media/libeffects/lvm/lib/Common/src/Core_MixInSoft_D32C31_SAT.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Core_MixSoft_1St_D32C31_WRA.c b/media/libeffects/lvm/lib/Common/src/Core_MixSoft_1St_D32C31_WRA.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Core_MixSoft_1St_D32C31_WRA.c rename to media/libeffects/lvm/lib/Common/src/Core_MixSoft_1St_D32C31_WRA.cpp diff --git a/media/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Init.c b/media/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Init.c rename to media/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/DelayAllPass_Sat_32x16To32.c b/media/libeffects/lvm/lib/Common/src/DelayAllPass_Sat_32x16To32.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/DelayAllPass_Sat_32x16To32.c rename to media/libeffects/lvm/lib/Common/src/DelayAllPass_Sat_32x16To32.cpp diff --git a/media/libeffects/lvm/lib/Common/src/DelayMix_16x16.c b/media/libeffects/lvm/lib/Common/src/DelayMix_16x16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/DelayMix_16x16.c rename to media/libeffects/lvm/lib/Common/src/DelayMix_16x16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/DelayWrite_32.c b/media/libeffects/lvm/lib/Common/src/DelayWrite_32.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/DelayWrite_32.c rename to media/libeffects/lvm/lib/Common/src/DelayWrite_32.cpp diff --git a/media/libeffects/lvm/lib/Common/src/FO_1I_D16F16C15_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/FO_1I_D16F16C15_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/FO_1I_D16F16C15_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/FO_1I_D16F16C15_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Init.c b/media/libeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Init.c rename to media/libeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/FO_1I_D32F32C31_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/FO_1I_D32F32C31_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/FO_1I_D32F32C31_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/FO_1I_D32F32C31_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Init.c b/media/libeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Init.c rename to media/libeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/FO_2I_D16F32C15_LShx_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/FO_2I_D16F32C15_LShx_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/FO_2I_D16F32C15_LShx_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/FO_2I_D16F32C15_LShx_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Init.c b/media/libeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Init.c rename to media/libeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Filters.h b/media/libeffects/lvm/lib/Common/src/Filters.h index b1fde0c480..14b7226754 100644 --- a/media/libeffects/lvm/lib/Common/src/Filters.h +++ b/media/libeffects/lvm/lib/Common/src/Filters.h @@ -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 */ diff --git a/media/libeffects/lvm/lib/Common/src/From2iToMS_16x16.c b/media/libeffects/lvm/lib/Common/src/From2iToMS_16x16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/From2iToMS_16x16.c rename to media/libeffects/lvm/lib/Common/src/From2iToMS_16x16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/From2iToMono_16.c b/media/libeffects/lvm/lib/Common/src/From2iToMono_16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/From2iToMono_16.c rename to media/libeffects/lvm/lib/Common/src/From2iToMono_16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/From2iToMono_32.c b/media/libeffects/lvm/lib/Common/src/From2iToMono_32.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/From2iToMono_32.c rename to media/libeffects/lvm/lib/Common/src/From2iToMono_32.cpp diff --git a/media/libeffects/lvm/lib/Common/src/InstAlloc.c b/media/libeffects/lvm/lib/Common/src/InstAlloc.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/InstAlloc.c rename to media/libeffects/lvm/lib/Common/src/InstAlloc.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Int16LShiftToInt32_16x32.c b/media/libeffects/lvm/lib/Common/src/Int16LShiftToInt32_16x32.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Int16LShiftToInt32_16x32.c rename to media/libeffects/lvm/lib/Common/src/Int16LShiftToInt32_16x32.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Int32RShiftToInt16_Sat_32x16.c b/media/libeffects/lvm/lib/Common/src/Int32RShiftToInt16_Sat_32x16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Int32RShiftToInt16_Sat_32x16.c rename to media/libeffects/lvm/lib/Common/src/Int32RShiftToInt16_Sat_32x16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/JoinTo2i_32x32.c b/media/libeffects/lvm/lib/Common/src/JoinTo2i_32x32.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/JoinTo2i_32x32.c rename to media/libeffects/lvm/lib/Common/src/JoinTo2i_32x32.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_Core_MixHard_1St_2i_D16C31_SAT.c b/media/libeffects/lvm/lib/Common/src/LVC_Core_MixHard_1St_2i_D16C31_SAT.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_Core_MixHard_1St_2i_D16C31_SAT.c rename to media/libeffects/lvm/lib/Common/src/LVC_Core_MixHard_1St_2i_D16C31_SAT.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_Core_MixHard_2St_D16C31_SAT.c b/media/libeffects/lvm/lib/Common/src/LVC_Core_MixHard_2St_D16C31_SAT.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_Core_MixHard_2St_D16C31_SAT.c rename to media/libeffects/lvm/lib/Common/src/LVC_Core_MixHard_2St_D16C31_SAT.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_Core_MixInSoft_D16C31_SAT.c b/media/libeffects/lvm/lib/Common/src/LVC_Core_MixInSoft_D16C31_SAT.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_Core_MixInSoft_D16C31_SAT.c rename to media/libeffects/lvm/lib/Common/src/LVC_Core_MixInSoft_D16C31_SAT.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_2i_D16C31_WRA.c b/media/libeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_2i_D16C31_WRA.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_2i_D16C31_WRA.c rename to media/libeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_2i_D16C31_WRA.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_D16C31_WRA.c b/media/libeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_D16C31_WRA.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_D16C31_WRA.c rename to media/libeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_D16C31_WRA.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_MixInSoft_D16C31_SAT.c b/media/libeffects/lvm/lib/Common/src/LVC_MixInSoft_D16C31_SAT.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_MixInSoft_D16C31_SAT.c rename to media/libeffects/lvm/lib/Common/src/LVC_MixInSoft_D16C31_SAT.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_MixSoft_1St_2i_D16C31_SAT.c b/media/libeffects/lvm/lib/Common/src/LVC_MixSoft_1St_2i_D16C31_SAT.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_MixSoft_1St_2i_D16C31_SAT.c rename to media/libeffects/lvm/lib/Common/src/LVC_MixSoft_1St_2i_D16C31_SAT.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_MixSoft_1St_D16C31_SAT.c b/media/libeffects/lvm/lib/Common/src/LVC_MixSoft_1St_D16C31_SAT.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_MixSoft_1St_D16C31_SAT.c rename to media/libeffects/lvm/lib/Common/src/LVC_MixSoft_1St_D16C31_SAT.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_MixSoft_2St_D16C31_SAT.c b/media/libeffects/lvm/lib/Common/src/LVC_MixSoft_2St_D16C31_SAT.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_MixSoft_2St_D16C31_SAT.c rename to media/libeffects/lvm/lib/Common/src/LVC_MixSoft_2St_D16C31_SAT.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_Mixer.h b/media/libeffects/lvm/lib/Common/src/LVC_Mixer.h index 199d529dab..eac9726ed7 100644 --- a/media/libeffects/lvm/lib/Common/src/LVC_Mixer.h +++ b/media/libeffects/lvm/lib/Common/src/LVC_Mixer.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 */ /**********************************************************************************/ diff --git a/media/libeffects/lvm/lib/Common/src/LVC_Mixer_GetCurrent.c b/media/libeffects/lvm/lib/Common/src/LVC_Mixer_GetCurrent.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_Mixer_GetCurrent.c rename to media/libeffects/lvm/lib/Common/src/LVC_Mixer_GetCurrent.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_Mixer_GetTarget.c b/media/libeffects/lvm/lib/Common/src/LVC_Mixer_GetTarget.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_Mixer_GetTarget.c rename to media/libeffects/lvm/lib/Common/src/LVC_Mixer_GetTarget.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_Mixer_Init.c b/media/libeffects/lvm/lib/Common/src/LVC_Mixer_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_Mixer_Init.c rename to media/libeffects/lvm/lib/Common/src/LVC_Mixer_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_Mixer_SetTarget.c b/media/libeffects/lvm/lib/Common/src/LVC_Mixer_SetTarget.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_Mixer_SetTarget.c rename to media/libeffects/lvm/lib/Common/src/LVC_Mixer_SetTarget.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_Mixer_SetTimeConstant.c b/media/libeffects/lvm/lib/Common/src/LVC_Mixer_SetTimeConstant.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_Mixer_SetTimeConstant.c rename to media/libeffects/lvm/lib/Common/src/LVC_Mixer_SetTimeConstant.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVC_Mixer_VarSlope_SetTimeConstant.c b/media/libeffects/lvm/lib/Common/src/LVC_Mixer_VarSlope_SetTimeConstant.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVC_Mixer_VarSlope_SetTimeConstant.c rename to media/libeffects/lvm/lib/Common/src/LVC_Mixer_VarSlope_SetTimeConstant.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVM_FO_HPF.c b/media/libeffects/lvm/lib/Common/src/LVM_FO_HPF.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVM_FO_HPF.c rename to media/libeffects/lvm/lib/Common/src/LVM_FO_HPF.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVM_FO_LPF.c b/media/libeffects/lvm/lib/Common/src/LVM_FO_LPF.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVM_FO_LPF.c rename to media/libeffects/lvm/lib/Common/src/LVM_FO_LPF.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVM_GetOmega.c b/media/libeffects/lvm/lib/Common/src/LVM_GetOmega.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVM_GetOmega.c rename to media/libeffects/lvm/lib/Common/src/LVM_GetOmega.cpp index 6307e68989..ed8e1fa852 100644 --- a/media/libeffects/lvm/lib/Common/src/LVM_GetOmega.c +++ b/media/libeffects/lvm/lib/Common/src/LVM_GetOmega.cpp @@ -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 diff --git a/media/libeffects/lvm/lib/Common/src/LVM_Mixer_TimeConstant.c b/media/libeffects/lvm/lib/Common/src/LVM_Mixer_TimeConstant.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVM_Mixer_TimeConstant.c rename to media/libeffects/lvm/lib/Common/src/LVM_Mixer_TimeConstant.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVM_Polynomial.c b/media/libeffects/lvm/lib/Common/src/LVM_Polynomial.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVM_Polynomial.c rename to media/libeffects/lvm/lib/Common/src/LVM_Polynomial.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVM_Power10.c b/media/libeffects/lvm/lib/Common/src/LVM_Power10.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVM_Power10.c rename to media/libeffects/lvm/lib/Common/src/LVM_Power10.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVM_Timer.c b/media/libeffects/lvm/lib/Common/src/LVM_Timer.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LVM_Timer.c rename to media/libeffects/lvm/lib/Common/src/LVM_Timer.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LVM_Timer_Init.c b/media/libeffects/lvm/lib/Common/src/LVM_Timer_Init.cpp similarity index 97% rename from media/libeffects/lvm/lib/Common/src/LVM_Timer_Init.c rename to media/libeffects/lvm/lib/Common/src/LVM_Timer_Init.cpp index a935cfe70f..301505712d 100644 --- a/media/libeffects/lvm/lib/Common/src/LVM_Timer_Init.c +++ b/media/libeffects/lvm/lib/Common/src/LVM_Timer_Init.cpp @@ -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; diff --git a/media/libeffects/lvm/lib/Common/src/LVM_Timer_Private.h b/media/libeffects/lvm/lib/Common/src/LVM_Timer_Private.h index 480944f844..0dd4272885 100644 --- a/media/libeffects/lvm/lib/Common/src/LVM_Timer_Private.h +++ b/media/libeffects/lvm/lib/Common/src/LVM_Timer_Private.h @@ -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 */ diff --git a/media/libeffects/lvm/lib/Common/src/LoadConst_16.c b/media/libeffects/lvm/lib/Common/src/LoadConst_16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LoadConst_16.c rename to media/libeffects/lvm/lib/Common/src/LoadConst_16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/LoadConst_32.c b/media/libeffects/lvm/lib/Common/src/LoadConst_32.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/LoadConst_32.c rename to media/libeffects/lvm/lib/Common/src/LoadConst_32.cpp diff --git a/media/libeffects/lvm/lib/Common/src/MSTo2i_Sat_16x16.c b/media/libeffects/lvm/lib/Common/src/MSTo2i_Sat_16x16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/MSTo2i_Sat_16x16.c rename to media/libeffects/lvm/lib/Common/src/MSTo2i_Sat_16x16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Mac3s_Sat_16x16.c b/media/libeffects/lvm/lib/Common/src/Mac3s_Sat_16x16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Mac3s_Sat_16x16.c rename to media/libeffects/lvm/lib/Common/src/Mac3s_Sat_16x16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Mac3s_Sat_32x16.c b/media/libeffects/lvm/lib/Common/src/Mac3s_Sat_32x16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Mac3s_Sat_32x16.c rename to media/libeffects/lvm/lib/Common/src/Mac3s_Sat_32x16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/MixInSoft_D32C31_SAT.c b/media/libeffects/lvm/lib/Common/src/MixInSoft_D32C31_SAT.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/MixInSoft_D32C31_SAT.c rename to media/libeffects/lvm/lib/Common/src/MixInSoft_D32C31_SAT.cpp diff --git a/media/libeffects/lvm/lib/Common/src/MixSoft_1St_D32C31_WRA.c b/media/libeffects/lvm/lib/Common/src/MixSoft_1St_D32C31_WRA.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/MixSoft_1St_D32C31_WRA.c rename to media/libeffects/lvm/lib/Common/src/MixSoft_1St_D32C31_WRA.cpp diff --git a/media/libeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.c b/media/libeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.cpp similarity index 95% rename from media/libeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.c rename to media/libeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.cpp index 6fc1b92a76..e6faa74ac3 100644 --- a/media/libeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.c +++ b/media/libeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.cpp @@ -42,7 +42,7 @@ void MixSoft_2St_D32C31_SAT( Mix_2St_Cll_FLOAT_t *pInstance, if ((pInstance->Current1 != pInstance->Target1) || (pInstance->Current2 != pInstance->Target2)) { MixSoft_1St_D32C31_WRA((Mix_1St_Cll_FLOAT_t*)pInstance, src1, dst, n); - MixInSoft_D32C31_SAT((void *)&pInstance->Alpha2, /* Cast to void: \ + MixInSoft_D32C31_SAT((Mix_1St_Cll_FLOAT_t *)&pInstance->Alpha2, /* Cast to void: \ no dereferencing in function*/ src2, dst, n); } @@ -54,7 +54,8 @@ void MixSoft_2St_D32C31_SAT( Mix_2St_Cll_FLOAT_t *pInstance, else { if (pInstance->Current1 == 0) - MixSoft_1St_D32C31_WRA((void *) &pInstance->Alpha2, /* Cast to void: no \ + MixSoft_1St_D32C31_WRA( + (Mix_1St_Cll_FLOAT_t *) &pInstance->Alpha2, /* Cast to void: no \ dereferencing in function*/ src2, dst, n); else if (pInstance->Current2 == 0) diff --git a/media/libeffects/lvm/lib/Common/src/MonoTo2I_16.c b/media/libeffects/lvm/lib/Common/src/MonoTo2I_16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/MonoTo2I_16.c rename to media/libeffects/lvm/lib/Common/src/MonoTo2I_16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/MonoTo2I_32.c b/media/libeffects/lvm/lib/Common/src/MonoTo2I_32.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/MonoTo2I_32.c rename to media/libeffects/lvm/lib/Common/src/MonoTo2I_32.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Mult3s_32x16.c b/media/libeffects/lvm/lib/Common/src/Mult3s_32x16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Mult3s_32x16.c rename to media/libeffects/lvm/lib/Common/src/Mult3s_32x16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/NonLinComp_D16.c b/media/libeffects/lvm/lib/Common/src/NonLinComp_D16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/NonLinComp_D16.c rename to media/libeffects/lvm/lib/Common/src/NonLinComp_D16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/PK_2I_D32F32C14G11_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/PK_2I_D32F32C14G11_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/PK_2I_D32F32C14G11_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/PK_2I_D32F32C14G11_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/PK_2I_D32F32C30G11_TRC_WRA_01.c b/media/libeffects/lvm/lib/Common/src/PK_2I_D32F32C30G11_TRC_WRA_01.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/PK_2I_D32F32C30G11_TRC_WRA_01.c rename to media/libeffects/lvm/lib/Common/src/PK_2I_D32F32C30G11_TRC_WRA_01.cpp diff --git a/media/libeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Init.c b/media/libeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Init.c rename to media/libeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Init.c b/media/libeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Init.c rename to media/libeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Init.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Shift_Sat_v16xv16.c b/media/libeffects/lvm/lib/Common/src/Shift_Sat_v16xv16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Shift_Sat_v16xv16.c rename to media/libeffects/lvm/lib/Common/src/Shift_Sat_v16xv16.cpp diff --git a/media/libeffects/lvm/lib/Common/src/Shift_Sat_v32xv32.c b/media/libeffects/lvm/lib/Common/src/Shift_Sat_v32xv32.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/Shift_Sat_v32xv32.c rename to media/libeffects/lvm/lib/Common/src/Shift_Sat_v32xv32.cpp diff --git a/media/libeffects/lvm/lib/Common/src/dB_to_Lin32.c b/media/libeffects/lvm/lib/Common/src/dB_to_Lin32.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/dB_to_Lin32.c rename to media/libeffects/lvm/lib/Common/src/dB_to_Lin32.cpp diff --git a/media/libeffects/lvm/lib/Common/src/mult3s_16x16.c b/media/libeffects/lvm/lib/Common/src/mult3s_16x16.cpp similarity index 100% rename from media/libeffects/lvm/lib/Common/src/mult3s_16x16.c rename to media/libeffects/lvm/lib/Common/src/mult3s_16x16.cpp diff --git a/media/libeffects/lvm/lib/Eq/lib/LVEQNB.h b/media/libeffects/lvm/lib/Eq/lib/LVEQNB.h index 804f1bfa00..7e2c3a4671 100644 --- a/media/libeffects/lvm/lib/Eq/lib/LVEQNB.h +++ b/media/libeffects/lvm/lib/Eq/lib/LVEQNB.h @@ -72,9 +72,6 @@ #ifndef __LVEQNB_H__ #define __LVEQNB_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ /****************************************************************************************/ @@ -492,9 +489,6 @@ LVEQNB_ReturnStatus_en LVEQNB_Process(LVEQNB_Handle_t hInstance, -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* __LVEQNB__ */ diff --git a/media/libeffects/lvm/lib/Eq/src/LVEQNB_CalcCoef.c b/media/libeffects/lvm/lib/Eq/src/LVEQNB_CalcCoef.cpp similarity index 99% rename from media/libeffects/lvm/lib/Eq/src/LVEQNB_CalcCoef.c rename to media/libeffects/lvm/lib/Eq/src/LVEQNB_CalcCoef.cpp index ff52b7f3bc..482e3baba3 100644 --- a/media/libeffects/lvm/lib/Eq/src/LVEQNB_CalcCoef.c +++ b/media/libeffects/lvm/lib/Eq/src/LVEQNB_CalcCoef.cpp @@ -359,4 +359,4 @@ LVEQNB_ReturnStatus_en LVEQNB_SinglePrecCoefs(LVM_UINT16 Fs, return(LVEQNB_SUCCESS); } -#endif \ No newline at end of file +#endif diff --git a/media/libeffects/lvm/lib/Eq/src/LVEQNB_Control.c b/media/libeffects/lvm/lib/Eq/src/LVEQNB_Control.cpp similarity index 100% rename from media/libeffects/lvm/lib/Eq/src/LVEQNB_Control.c rename to media/libeffects/lvm/lib/Eq/src/LVEQNB_Control.cpp diff --git a/media/libeffects/lvm/lib/Eq/src/LVEQNB_Init.c b/media/libeffects/lvm/lib/Eq/src/LVEQNB_Init.cpp similarity index 98% rename from media/libeffects/lvm/lib/Eq/src/LVEQNB_Init.c rename to media/libeffects/lvm/lib/Eq/src/LVEQNB_Init.cpp index de1bbb7770..8e3c627135 100644 --- a/media/libeffects/lvm/lib/Eq/src/LVEQNB_Init.c +++ b/media/libeffects/lvm/lib/Eq/src/LVEQNB_Init.cpp @@ -282,9 +282,9 @@ LVEQNB_ReturnStatus_en LVEQNB_Init(LVEQNB_Handle_t *phInstance, #ifdef BUILD_FLOAT /* Equaliser Biquad Instance */ - pInstance->pEQNB_FilterState_Float = InstAlloc_AddMember(&AllocMem, - pCapabilities->MaxBands * \ - sizeof(Biquad_FLOAT_Instance_t)); + pInstance->pEQNB_FilterState_Float = (Biquad_FLOAT_Instance_t *) + InstAlloc_AddMember(&AllocMem, pCapabilities->MaxBands * \ + sizeof(Biquad_FLOAT_Instance_t)); #else pInstance->pEQNB_FilterState = InstAlloc_AddMember(&AllocMem, pCapabilities->MaxBands * sizeof(Biquad_Instance_t)); /* Equaliser Biquad Instance */ diff --git a/media/libeffects/lvm/lib/Eq/src/LVEQNB_Private.h b/media/libeffects/lvm/lib/Eq/src/LVEQNB_Private.h index a9cd5fd313..4f70eece9f 100644 --- a/media/libeffects/lvm/lib/Eq/src/LVEQNB_Private.h +++ b/media/libeffects/lvm/lib/Eq/src/LVEQNB_Private.h @@ -18,9 +18,6 @@ #ifndef __LVEQNB_PRIVATE_H__ #define __LVEQNB_PRIVATE_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ /****************************************************************************************/ @@ -152,9 +149,6 @@ LVEQNB_ReturnStatus_en LVEQNB_DoublePrecCoefs(LVM_UINT16 Fs, LVM_INT32 LVEQNB_BypassMixerCallBack (void* hInstance, void *pGeneralPurpose, LVM_INT16 CallbackParam); -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* __LVEQNB_PRIVATE_H__ */ diff --git a/media/libeffects/lvm/lib/Eq/src/LVEQNB_Process.c b/media/libeffects/lvm/lib/Eq/src/LVEQNB_Process.cpp similarity index 100% rename from media/libeffects/lvm/lib/Eq/src/LVEQNB_Process.c rename to media/libeffects/lvm/lib/Eq/src/LVEQNB_Process.cpp diff --git a/media/libeffects/lvm/lib/Eq/src/LVEQNB_Tables.c b/media/libeffects/lvm/lib/Eq/src/LVEQNB_Tables.cpp similarity index 99% rename from media/libeffects/lvm/lib/Eq/src/LVEQNB_Tables.c rename to media/libeffects/lvm/lib/Eq/src/LVEQNB_Tables.cpp index 453c42dc54..d3d4ba0d6d 100644 --- a/media/libeffects/lvm/lib/Eq/src/LVEQNB_Tables.c +++ b/media/libeffects/lvm/lib/Eq/src/LVEQNB_Tables.cpp @@ -24,6 +24,7 @@ #include "LVEQNB.h" #include "LVEQNB_Coeffs.h" +#include "LVEQNB_Tables.h" /************************************************************************************/ diff --git a/media/libeffects/lvm/lib/Eq/src/LVEQNB_Tables.h b/media/libeffects/lvm/lib/Eq/src/LVEQNB_Tables.h new file mode 100644 index 0000000000..dc3fbb667b --- /dev/null +++ b/media/libeffects/lvm/lib/Eq/src/LVEQNB_Tables.h @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __LVEQNB_TABLES_H__ +#define __LVEQNB_TABLES_H__ + +/************************************************************************************/ +/* */ +/* Sample rate table */ +/* */ +/************************************************************************************/ + +/* + * Sample rate table for converting between the enumerated type and the actual + * frequency + */ +#ifdef HIGHER_FS +extern const LVM_UINT32 LVEQNB_SampleRateTab[]; +#else +extern const LVM_UINT16 LVEQNB_SampleRateTab[]; +#endif + +/************************************************************************************/ +/* */ +/* Coefficient calculation tables */ +/* */ +/************************************************************************************/ + +/* + * Table for 2 * Pi / Fs + */ +extern const LVM_FLOAT LVEQNB_TwoPiOnFsTable[]; + +/* + * Gain table + */ +extern const LVM_FLOAT LVEQNB_GainTable[]; + +/* + * D table for 100 / (Gain + 1) + */ +extern const LVM_FLOAT LVEQNB_DTable[]; + +/************************************************************************************/ +/* */ +/* Filter polynomial coefficients */ +/* */ +/************************************************************************************/ + +/* + * Coefficients for calculating the cosine with the equation: + * + * Cos(x) = (2^Shifts)*(a0 + a1*x + a2*x^2 + a3*x^3 + a4*x^4 + a5*x^5) + * + * These coefficients expect the input, x, to be in the range 0 to 32768 respresenting + * a range of 0 to Pi. The output is in the range 32767 to -32768 representing the range + * +1.0 to -1.0 + */ +extern const LVM_INT16 LVEQNB_CosCoef[]; + +/* + * Coefficients for calculating the cosine error with the equation: + * + * CosErr(x) = (2^Shifts)*(a0 + a1*x + a2*x^2 + a3*x^3) + * + * These coefficients expect the input, x, to be in the range 0 to 32768 respresenting + * a range of 0 to Pi/25. The output is in the range 0 to 32767 representing the range + * 0.0 to 0.0078852986 + * + * This is used to give a double precision cosine over the range 0 to Pi/25 using the + * the equation: + * + * Cos(x) = 1.0 - CosErr(x) + */ +extern const LVM_INT16 LVEQNB_DPCosCoef[]; + +#endif /* __LVEQNB_TABLES_H__ */ diff --git a/media/libeffects/lvm/lib/Reverb/lib/LVREV.h b/media/libeffects/lvm/lib/Reverb/lib/LVREV.h index 9c2e297655..4f052b1c12 100644 --- a/media/libeffects/lvm/lib/Reverb/lib/LVREV.h +++ b/media/libeffects/lvm/lib/Reverb/lib/LVREV.h @@ -28,9 +28,6 @@ #ifndef __LVREV_H__ #define __LVREV_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ /****************************************************************************************/ @@ -315,9 +312,6 @@ LVREV_ReturnStatus_en LVREV_Process(LVREV_Handle_t hInstance, const LVM_UINT16 NumSamples); #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* __LVREV_H__ */ diff --git a/media/libeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.c b/media/libeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.cpp similarity index 99% rename from media/libeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.c rename to media/libeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.cpp index e71084411a..2c46baa50d 100644 --- a/media/libeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.c +++ b/media/libeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.cpp @@ -638,7 +638,7 @@ LVREV_ReturnStatus_en LVREV_ApplyNewSettings (LVREV_Instance_st *pPrivate) FO_1I_D32F32Cll_TRC_WRA_01_Init( &pPrivate->pFastCoef->HPCoefs, &pPrivate->pFastData->HPTaps, &Coeffs); LoadConst_Float(0, - (void *)&pPrivate->pFastData->HPTaps, /* Destination Cast to void: \ + (LVM_FLOAT *)&pPrivate->pFastData->HPTaps, /* Destination Cast to void: \ no dereferencing in function*/ sizeof(Biquad_1I_Order1_FLOAT_Taps_t) / sizeof(LVM_FLOAT)); } @@ -672,7 +672,7 @@ LVREV_ReturnStatus_en LVREV_ApplyNewSettings (LVREV_Instance_st *pPrivate) FO_1I_D32F32Cll_TRC_WRA_01_Init( &pPrivate->pFastCoef->LPCoefs, &pPrivate->pFastData->LPTaps, &Coeffs); LoadConst_Float(0, - (void *)&pPrivate->pFastData->LPTaps, /* Destination Cast to void: \ + (LVM_FLOAT *)&pPrivate->pFastData->LPTaps, /* Destination Cast to void: \ no dereferencing in function*/ sizeof(Biquad_1I_Order1_FLOAT_Taps_t) / sizeof(LVM_FLOAT)); } diff --git a/media/libeffects/lvm/lib/Reverb/src/LVREV_ClearAudioBuffers.c b/media/libeffects/lvm/lib/Reverb/src/LVREV_ClearAudioBuffers.cpp similarity index 93% rename from media/libeffects/lvm/lib/Reverb/src/LVREV_ClearAudioBuffers.c rename to media/libeffects/lvm/lib/Reverb/src/LVREV_ClearAudioBuffers.cpp index 9491016203..0f41f09ee8 100644 --- a/media/libeffects/lvm/lib/Reverb/src/LVREV_ClearAudioBuffers.c +++ b/media/libeffects/lvm/lib/Reverb/src/LVREV_ClearAudioBuffers.cpp @@ -63,13 +63,13 @@ LVREV_ReturnStatus_en LVREV_ClearAudioBuffers(LVREV_Handle_t hInstance) #ifdef BUILD_FLOAT LoadConst_Float(0, - (void *)&pLVREV_Private->pFastData->HPTaps, /* Destination Cast to void: \ - no dereferencing in function*/ - 2); + (LVM_FLOAT *)&pLVREV_Private->pFastData->HPTaps, /* Destination Cast to void: \ + no dereferencing in function*/ + 2); LoadConst_Float(0, - (void *)&pLVREV_Private->pFastData->LPTaps, /* Destination Cast to void: \ - no dereferencing in function*/ - 2); + (LVM_FLOAT *)&pLVREV_Private->pFastData->LPTaps, /* Destination Cast to void: \ + no dereferencing in function*/ + 2); #else LoadConst_32(0, (void *)&pLVREV_Private->pFastData->HPTaps, /* Destination Cast to void: no dereferencing in function*/ diff --git a/media/libeffects/lvm/lib/Reverb/src/LVREV_GetControlParameters.c b/media/libeffects/lvm/lib/Reverb/src/LVREV_GetControlParameters.cpp similarity index 100% rename from media/libeffects/lvm/lib/Reverb/src/LVREV_GetControlParameters.c rename to media/libeffects/lvm/lib/Reverb/src/LVREV_GetControlParameters.cpp diff --git a/media/libeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.c b/media/libeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.cpp similarity index 90% rename from media/libeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.c rename to media/libeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.cpp index 3366bcb3c0..8a27371f20 100644 --- a/media/libeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.c +++ b/media/libeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.cpp @@ -163,7 +163,9 @@ LVREV_ReturnStatus_en LVREV_GetInstanceHandle(LVREV_Handle_t *phInsta /* * Set the data, coefficient and temporary memory pointers */ - pLVREV_Private->pFastData = InstAlloc_AddMember(&FastData, sizeof(LVREV_FastData_st)); /* Fast data memory base address */ + /* Fast data memory base address */ + pLVREV_Private->pFastData = (LVREV_FastData_st *) + InstAlloc_AddMember(&FastData, sizeof(LVREV_FastData_st)); #ifndef BUILD_FLOAT if(pInstanceParams->NumDelays == LVREV_DELAYLINES_4) { @@ -211,19 +213,23 @@ LVREV_ReturnStatus_en LVREV_GetInstanceHandle(LVREV_Handle_t *phInsta #else if(pInstanceParams->NumDelays == LVREV_DELAYLINES_4) { - pLVREV_Private->pDelay_T[3] = InstAlloc_AddMember(&FastData, LVREV_MAX_T3_DELAY * \ + pLVREV_Private->pDelay_T[3] = + (LVM_FLOAT *)InstAlloc_AddMember(&FastData, LVREV_MAX_T3_DELAY * \ sizeof(LVM_FLOAT)); - pLVREV_Private->pDelay_T[2] = InstAlloc_AddMember(&FastData, LVREV_MAX_T2_DELAY * \ + pLVREV_Private->pDelay_T[2] = + (LVM_FLOAT *)InstAlloc_AddMember(&FastData, LVREV_MAX_T2_DELAY * \ sizeof(LVM_FLOAT)); - pLVREV_Private->pDelay_T[1] = InstAlloc_AddMember(&FastData, LVREV_MAX_T1_DELAY * \ + pLVREV_Private->pDelay_T[1] = + (LVM_FLOAT *)InstAlloc_AddMember(&FastData, LVREV_MAX_T1_DELAY * \ sizeof(LVM_FLOAT)); - pLVREV_Private->pDelay_T[0] = InstAlloc_AddMember(&FastData, LVREV_MAX_T0_DELAY * \ + pLVREV_Private->pDelay_T[0] = + (LVM_FLOAT *)InstAlloc_AddMember(&FastData, LVREV_MAX_T0_DELAY * \ sizeof(LVM_FLOAT)); for(i = 0; i < 4; i++) { /* Scratch for each delay line output */ - pLVREV_Private->pScratchDelayLine[i] = InstAlloc_AddMember(&Temporary, + pLVREV_Private->pScratchDelayLine[i] = (LVM_FLOAT *)InstAlloc_AddMember(&Temporary, sizeof(LVM_FLOAT) * \ MaxBlockSize); } @@ -236,15 +242,17 @@ LVREV_ReturnStatus_en LVREV_GetInstanceHandle(LVREV_Handle_t *phInsta if(pInstanceParams->NumDelays == LVREV_DELAYLINES_2) { - pLVREV_Private->pDelay_T[1] = InstAlloc_AddMember(&FastData, LVREV_MAX_T1_DELAY * \ + pLVREV_Private->pDelay_T[1] = (LVM_FLOAT *) + InstAlloc_AddMember(&FastData, LVREV_MAX_T1_DELAY * \ sizeof(LVM_FLOAT)); - pLVREV_Private->pDelay_T[0] = InstAlloc_AddMember(&FastData, LVREV_MAX_T0_DELAY * \ + pLVREV_Private->pDelay_T[0] = (LVM_FLOAT *) + InstAlloc_AddMember(&FastData, LVREV_MAX_T0_DELAY * \ sizeof(LVM_FLOAT)); for(i = 0; i < 2; i++) { /* Scratch for each delay line output */ - pLVREV_Private->pScratchDelayLine[i] = InstAlloc_AddMember(&Temporary, + pLVREV_Private->pScratchDelayLine[i] = (LVM_FLOAT *)InstAlloc_AddMember(&Temporary, sizeof(LVM_FLOAT) * \ MaxBlockSize); } @@ -255,13 +263,13 @@ LVREV_ReturnStatus_en LVREV_GetInstanceHandle(LVREV_Handle_t *phInsta if(pInstanceParams->NumDelays == LVREV_DELAYLINES_1) { - pLVREV_Private->pDelay_T[0] = InstAlloc_AddMember(&FastData, + pLVREV_Private->pDelay_T[0] = (LVM_FLOAT *)InstAlloc_AddMember(&FastData, LVREV_MAX_T0_DELAY * sizeof(LVM_FLOAT)); for(i = 0; i < 1; i++) { /* Scratch for each delay line output */ - pLVREV_Private->pScratchDelayLine[i] = InstAlloc_AddMember(&Temporary, + pLVREV_Private->pScratchDelayLine[i] = (LVM_FLOAT *)InstAlloc_AddMember(&Temporary, sizeof(LVM_FLOAT) * \ MaxBlockSize); } @@ -276,18 +284,25 @@ LVREV_ReturnStatus_en LVREV_GetInstanceHandle(LVREV_Handle_t *phInsta pLVREV_Private->T[3] = LVREV_MAX_T3_DELAY; pLVREV_Private->AB_Selection = 1; /* Select smoothing A to B */ - - pLVREV_Private->pFastCoef = InstAlloc_AddMember(&FastCoef, sizeof(LVREV_FastCoef_st)); /* Fast coefficient memory base address */ + /* Fast coefficient memory base address */ + pLVREV_Private->pFastCoef = + (LVREV_FastCoef_st *)InstAlloc_AddMember(&FastCoef, sizeof(LVREV_FastCoef_st)); #ifndef BUILD_FLOAT - pLVREV_Private->pScratch = InstAlloc_AddMember(&Temporary, sizeof(LVM_INT32) * MaxBlockSize); /* General purpose scratch */ - pLVREV_Private->pInputSave = InstAlloc_AddMember(&Temporary, 2 * sizeof(LVM_INT32) * MaxBlockSize); /* Mono->stereo input save for end mix */ + /* General purpose scratch */ + pLVREV_Private->pScratch = + (LVM_FLOAT *)InstAlloc_AddMember(&Temporary, sizeof(LVM_INT32) * MaxBlockSize); + /* Mono->stereo input save for end mix */ + pLVREV_Private->pInputSave = + (LVM_FLOAT *)InstAlloc_AddMember(&Temporary, 2 * sizeof(LVM_INT32) * MaxBlockSize); LoadConst_32(0, pLVREV_Private->pInputSave, (LVM_INT16)(MaxBlockSize*2)); #else /* General purpose scratch */ - pLVREV_Private->pScratch = InstAlloc_AddMember(&Temporary, sizeof(LVM_FLOAT) * \ + pLVREV_Private->pScratch = + (LVM_FLOAT *)InstAlloc_AddMember(&Temporary, sizeof(LVM_FLOAT) * \ MaxBlockSize); /* Mono->stereo input save for end mix */ - pLVREV_Private->pInputSave = InstAlloc_AddMember(&Temporary, 2 * sizeof(LVM_FLOAT) * \ + pLVREV_Private->pInputSave = + (LVM_FLOAT *)InstAlloc_AddMember(&Temporary, 2 * sizeof(LVM_FLOAT) * \ MaxBlockSize); LoadConst_Float(0, pLVREV_Private->pInputSave, (LVM_INT16)(MaxBlockSize * 2)); #endif diff --git a/media/libeffects/lvm/lib/Reverb/src/LVREV_GetMemoryTable.c b/media/libeffects/lvm/lib/Reverb/src/LVREV_GetMemoryTable.cpp similarity index 100% rename from media/libeffects/lvm/lib/Reverb/src/LVREV_GetMemoryTable.c rename to media/libeffects/lvm/lib/Reverb/src/LVREV_GetMemoryTable.cpp diff --git a/media/libeffects/lvm/lib/Reverb/src/LVREV_Private.h b/media/libeffects/lvm/lib/Reverb/src/LVREV_Private.h index c915ac0225..3379d655c2 100644 --- a/media/libeffects/lvm/lib/Reverb/src/LVREV_Private.h +++ b/media/libeffects/lvm/lib/Reverb/src/LVREV_Private.h @@ -18,9 +18,6 @@ #ifndef __LVREV_PRIVATE_H__ #define __LVREV_PRIVATE_H__ -#ifdef __cplusplus -extern "C" { -#endif /****************************************************************************************/ @@ -309,9 +306,6 @@ LVM_INT32 BypassMixer_Callback(void *pCallbackData, LVM_INT16 GeneralPurpose ); -#ifdef __cplusplus -} -#endif #endif /** __LVREV_PRIVATE_H__ **/ diff --git a/media/libeffects/lvm/lib/Reverb/src/LVREV_Process.c b/media/libeffects/lvm/lib/Reverb/src/LVREV_Process.cpp similarity index 100% rename from media/libeffects/lvm/lib/Reverb/src/LVREV_Process.c rename to media/libeffects/lvm/lib/Reverb/src/LVREV_Process.cpp diff --git a/media/libeffects/lvm/lib/Reverb/src/LVREV_SetControlParameters.c b/media/libeffects/lvm/lib/Reverb/src/LVREV_SetControlParameters.cpp similarity index 100% rename from media/libeffects/lvm/lib/Reverb/src/LVREV_SetControlParameters.c rename to media/libeffects/lvm/lib/Reverb/src/LVREV_SetControlParameters.cpp diff --git a/media/libeffects/lvm/lib/Reverb/src/LVREV_Tables.c b/media/libeffects/lvm/lib/Reverb/src/LVREV_Tables.cpp similarity index 99% rename from media/libeffects/lvm/lib/Reverb/src/LVREV_Tables.c rename to media/libeffects/lvm/lib/Reverb/src/LVREV_Tables.cpp index 1058740900..1ea10a25ca 100644 --- a/media/libeffects/lvm/lib/Reverb/src/LVREV_Tables.c +++ b/media/libeffects/lvm/lib/Reverb/src/LVREV_Tables.cpp @@ -21,6 +21,7 @@ /* */ /****************************************************************************************/ #include "LVREV.h" +#include "LVREV_Tables.h" /****************************************************************************************/ /* */ diff --git a/media/libeffects/lvm/lib/Reverb/src/LVREV_Tables.h b/media/libeffects/lvm/lib/Reverb/src/LVREV_Tables.h index 0658186c58..06b534c31f 100644 --- a/media/libeffects/lvm/lib/Reverb/src/LVREV_Tables.h +++ b/media/libeffects/lvm/lib/Reverb/src/LVREV_Tables.h @@ -19,9 +19,6 @@ #ifndef _LVREV_TABLES_H_ #define _LVREV_TABLES_H_ -#ifdef __cplusplus -extern "C" { -#endif /****************************************************************************************/ @@ -48,10 +45,7 @@ extern LVM_UINT32 LVM_GetFsFromTable(LVM_Fs_en FsIndex); #ifndef BUILD_FLOAT extern LVM_INT32 LVREV_GainPolyTable[24][5]; #else -extern LVM_FLOAT LVREV_GainPolyTable[24][5]; -#endif -#ifdef __cplusplus -} +extern const LVM_FLOAT LVREV_GainPolyTable[24][5]; #endif #endif /** _LVREV_TABLES_H_ **/ diff --git a/media/libeffects/lvm/lib/SpectrumAnalyzer/lib/LVPSA.h b/media/libeffects/lvm/lib/SpectrumAnalyzer/lib/LVPSA.h index 2038fbb957..13776550a4 100644 --- a/media/libeffects/lvm/lib/SpectrumAnalyzer/lib/LVPSA.h +++ b/media/libeffects/lvm/lib/SpectrumAnalyzer/lib/LVPSA.h @@ -22,9 +22,6 @@ #include "LVM_Types.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ /****************************************************************************************/ /* */ @@ -289,8 +286,5 @@ LVPSA_RETURN LVPSA_GetInitParams ( pLVPSA_Handle_t hInstance, LVPSA_InitParams_t *pParams ); -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* _LVPSA_H */ diff --git a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Control.c b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Control.cpp similarity index 100% rename from media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Control.c rename to media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Control.cpp diff --git a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Init.c b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Init.cpp similarity index 82% rename from media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Init.c rename to media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Init.cpp index 1c26860f8d..ff4b275d12 100644 --- a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Init.c +++ b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Init.cpp @@ -148,21 +148,29 @@ LVPSA_RETURN LVPSA_Init ( pLVPSA_Handle_t *phInstance, #ifndef BUILD_FLOAT pLVPSA_Inst->pPostGains = InstAlloc_AddMember( &Instance, pInitParams->nBands * sizeof(LVM_UINT16) ); #else - pLVPSA_Inst->pPostGains = InstAlloc_AddMember( &Instance, pInitParams->nBands * \ - sizeof(LVM_FLOAT) ); + pLVPSA_Inst->pPostGains = + (LVM_FLOAT *)InstAlloc_AddMember(&Instance, pInitParams->nBands * sizeof(LVM_FLOAT)); #endif - pLVPSA_Inst->pFiltersParams = InstAlloc_AddMember( &Instance, pInitParams->nBands * sizeof(LVPSA_FilterParam_t) ); - pLVPSA_Inst->pSpectralDataBufferStart = InstAlloc_AddMember( &Instance, pInitParams->nBands * pLVPSA_Inst->SpectralDataBufferLength * sizeof(LVM_UINT8) ); - pLVPSA_Inst->pPreviousPeaks = InstAlloc_AddMember( &Instance, pInitParams->nBands * sizeof(LVM_UINT8) ); - pLVPSA_Inst->pBPFiltersPrecision = InstAlloc_AddMember( &Instance, pInitParams->nBands * sizeof(LVPSA_BPFilterPrecision_en) ); + pLVPSA_Inst->pFiltersParams = (LVPSA_FilterParam_t *) + InstAlloc_AddMember(&Instance, pInitParams->nBands * sizeof(LVPSA_FilterParam_t)); + pLVPSA_Inst->pSpectralDataBufferStart = (LVM_UINT8 *) + InstAlloc_AddMember(&Instance, pInitParams->nBands * \ + pLVPSA_Inst->SpectralDataBufferLength * sizeof(LVM_UINT8)); + pLVPSA_Inst->pPreviousPeaks = (LVM_UINT8 *) + InstAlloc_AddMember(&Instance, pInitParams->nBands * sizeof(LVM_UINT8)); + pLVPSA_Inst->pBPFiltersPrecision = (LVPSA_BPFilterPrecision_en *) + InstAlloc_AddMember(&Instance, pInitParams->nBands * \ + sizeof(LVPSA_BPFilterPrecision_en)); #ifndef BUILD_FLOAT pLVPSA_Inst->pBP_Instances = InstAlloc_AddMember( &Coef, pInitParams->nBands * sizeof(Biquad_Instance_t) ); pLVPSA_Inst->pQPD_States = InstAlloc_AddMember( &Coef, pInitParams->nBands * sizeof(QPD_State_t) ); #else - pLVPSA_Inst->pBP_Instances = InstAlloc_AddMember( &Coef, pInitParams->nBands * \ - sizeof(Biquad_FLOAT_Instance_t) ); - pLVPSA_Inst->pQPD_States = InstAlloc_AddMember( &Coef, pInitParams->nBands * \ - sizeof(QPD_FLOAT_State_t) ); + pLVPSA_Inst->pBP_Instances = (Biquad_FLOAT_Instance_t *) + InstAlloc_AddMember(&Coef, pInitParams->nBands * \ + sizeof(Biquad_FLOAT_Instance_t)); + pLVPSA_Inst->pQPD_States = (QPD_FLOAT_State_t *) + InstAlloc_AddMember(&Coef, pInitParams->nBands * \ + sizeof(QPD_FLOAT_State_t)); #endif #ifndef BUILD_FLOAT @@ -170,11 +178,12 @@ LVPSA_RETURN LVPSA_Init ( pLVPSA_Handle_t *phInstance, pLVPSA_Inst->pQPD_Taps = InstAlloc_AddMember( &Data, pInitParams->nBands * sizeof(QPD_Taps_t) ); #else - pLVPSA_Inst->pBP_Taps = InstAlloc_AddMember( &Data, - pInitParams->nBands * \ - sizeof(Biquad_1I_Order2_FLOAT_Taps_t)); - pLVPSA_Inst->pQPD_Taps = InstAlloc_AddMember( &Data, pInitParams->nBands * \ - sizeof(QPD_FLOAT_Taps_t) ); + pLVPSA_Inst->pBP_Taps = (Biquad_1I_Order2_FLOAT_Taps_t *) + InstAlloc_AddMember(&Data, pInitParams->nBands * \ + sizeof(Biquad_1I_Order2_FLOAT_Taps_t)); + pLVPSA_Inst->pQPD_Taps = (QPD_FLOAT_Taps_t *) + InstAlloc_AddMember(&Data, pInitParams->nBands * \ + sizeof(QPD_FLOAT_Taps_t)); #endif /* Copy filters parameters in the private instance */ diff --git a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Memory.c b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Memory.cpp similarity index 100% rename from media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Memory.c rename to media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Memory.cpp diff --git a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Private.h b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Private.h index ee07e2e8a5..bce23c96a3 100644 --- a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Private.h +++ b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Private.h @@ -25,9 +25,6 @@ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ /********************************************************************************** CONSTANT DEFINITIONS @@ -162,8 +159,5 @@ typedef struct /************************************************************************************/ LVPSA_RETURN LVPSA_ApplyNewSettings (LVPSA_InstancePr_t *pInst); -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* _LVPSA_PRIVATE_H */ diff --git a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Process.c b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Process.cpp similarity index 100% rename from media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Process.c rename to media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Process.cpp diff --git a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD.h b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD.h index 99d844b7e4..552703b225 100644 --- a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD.h +++ b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD.h @@ -21,9 +21,6 @@ #include "LVM_Types.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ typedef struct { @@ -119,9 +116,6 @@ void LVPSA_QPD_Init_Float ( QPD_FLOAT_State_t *pInstance, QPD_FLOAT_Taps_t *pTaps, QPD_FLOAT_Coefs *pCoef ); #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif diff --git a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Init.c b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Init.c rename to media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Init.cpp diff --git a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Process.c b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Process.cpp similarity index 100% rename from media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Process.c rename to media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Process.cpp diff --git a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.c b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.cpp similarity index 89% rename from media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.c rename to media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.cpp index f8af496fc3..045a502925 100644 --- a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.c +++ b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.cpp @@ -24,6 +24,7 @@ #include "LVPSA.h" #include "LVPSA_QPD.h" +#include "LVPSA_Tables.h" /************************************************************************************/ /* */ /* Sample rate table */ @@ -318,36 +319,38 @@ const LVM_FLOAT LVPSA_Float_DPCosCoef[] = {1.0f, /* Sh /* */ /************************************************************************************/ const QPD_C32_Coefs LVPSA_QPD_Coefs[] = { + /* 8kS/s */ /* LVPSA_SPEED_LOW */ + {(LVM_INT32)0x80CEFD2B,0x00CB9B17}, + {(LVM_INT32)0x80D242E7,0x00CED11D}, + {(LVM_INT32)0x80DCBAF5,0x00D91679}, + {(LVM_INT32)0x80CEFD2B,0x00CB9B17}, + {(LVM_INT32)0x80E13739,0x00DD7CD3}, + {(LVM_INT32)0x80DCBAF5,0x00D91679}, + {(LVM_INT32)0x80D94BAF,0x00D5B7E7}, + {(LVM_INT32)0x80E13739,0x00DD7CD3}, + {(LVM_INT32)0x80DCBAF5,0x00D91679}, /* 48kS/s */ - {0x80CEFD2B,0x00CB9B17}, /* 8kS/s */ /* LVPSA_SPEED_LOW */ - {0x80D242E7,0x00CED11D}, - {0x80DCBAF5,0x00D91679}, - {0x80CEFD2B,0x00CB9B17}, - {0x80E13739,0x00DD7CD3}, - {0x80DCBAF5,0x00D91679}, - {0x80D94BAF,0x00D5B7E7}, - {0x80E13739,0x00DD7CD3}, - {0x80DCBAF5,0x00D91679}, /* 48kS/s */ - - {0x8587513D,0x055C22CF}, /* 8kS/s */ /* LVPSA_SPEED_MEDIUM */ - {0x859D2967,0x0570F007}, - {0x85E2EFAC,0x05B34D79}, - {0x8587513D,0x055C22CF}, - {0x8600C7B9,0x05CFA6CF}, - {0x85E2EFAC,0x05B34D79}, - {0x85CC1018,0x059D8F69}, - {0x8600C7B9,0x05CFA6CF},//{0x8600C7B9,0x05CFA6CF}, - {0x85E2EFAC,0x05B34D79}, /* 48kS/s */ + /* 8kS/s */ /* LVPSA_SPEED_MEDIUM */ + {(LVM_INT32)0x8587513D,0x055C22CF}, + {(LVM_INT32)0x859D2967,0x0570F007}, + {(LVM_INT32)0x85E2EFAC,0x05B34D79}, + {(LVM_INT32)0x8587513D,0x055C22CF}, + {(LVM_INT32)0x8600C7B9,0x05CFA6CF}, + {(LVM_INT32)0x85E2EFAC,0x05B34D79}, + {(LVM_INT32)0x85CC1018,0x059D8F69}, + {(LVM_INT32)0x8600C7B9,0x05CFA6CF}, + {(LVM_INT32)0x85E2EFAC,0x05B34D79}, /* 48kS/s */ - {0xA115EA7A,0x1CDB3F5C}, /* 8kS/s */ /* LVPSA_SPEED_HIGH */ - {0xA18475F0,0x1D2C83A2}, - {0xA2E1E950,0x1E2A532E}, - {0xA115EA7A,0x1CDB3F5C}, - {0xA375B2C6,0x1E943BBC}, - {0xA2E1E950,0x1E2A532E}, - {0xA26FF6BD,0x1DD81530}, - {0xA375B2C6,0x1E943BBC}, - {0xA2E1E950,0x1E2A532E}}; /* 48kS/s */ + /* 8kS/s */ /* LVPSA_SPEED_HIGH */ + {(LVM_INT32)0xA115EA7A,0x1CDB3F5C}, + {(LVM_INT32)0xA18475F0,0x1D2C83A2}, + {(LVM_INT32)0xA2E1E950,0x1E2A532E}, + {(LVM_INT32)0xA115EA7A,0x1CDB3F5C}, + {(LVM_INT32)0xA375B2C6,0x1E943BBC}, + {(LVM_INT32)0xA2E1E950,0x1E2A532E}, + {(LVM_INT32)0xA26FF6BD,0x1DD81530}, + {(LVM_INT32)0xA375B2C6,0x1E943BBC}, + {(LVM_INT32)0xA2E1E950,0x1E2A532E}}; /* 48kS/s */ #ifdef BUILD_FLOAT const QPD_FLOAT_Coefs LVPSA_QPD_Float_Coefs[] = { diff --git a/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.h b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.h new file mode 100644 index 0000000000..caaf3ba0fa --- /dev/null +++ b/media/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.h @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __LVPSA_TABLES_H__ +#define __LVPSA_TABLES_H__ + +/************************************************************************************/ +/* */ +/* Sample rate table */ +/* */ +/************************************************************************************/ + +/* + * Sample rate table for converting between the enumerated type and the actual + * frequency + */ +#ifndef HIGHER_FS +extern const LVM_UINT16 LVPSA_SampleRateTab[]; +#else +extern const LVM_UINT32 LVPSA_SampleRateTab[]; +#endif + +/************************************************************************************/ +/* */ +/* Sample rate inverse table */ +/* */ +/************************************************************************************/ + +/* + * Sample rate table for converting between the enumerated type and the actual + * frequency + */ +extern const LVM_UINT32 LVPSA_SampleRateInvTab[]; + +/************************************************************************************/ +/* */ +/* Number of samples in 20ms */ +/* */ +/************************************************************************************/ + +/* + * Table for converting between the enumerated type and the number of samples + * during 20ms + */ +extern const LVM_UINT16 LVPSA_nSamplesBufferUpdate[]; + +/************************************************************************************/ +/* */ +/* Down sampling factors */ +/* */ +/************************************************************************************/ + +/* + * Table for converting between the enumerated type and the down sampling factor + */ +extern const LVM_UINT16 LVPSA_DownSamplingFactor[]; + +/************************************************************************************/ +/* */ +/* Coefficient calculation tables */ +/* */ +/************************************************************************************/ + +/* + * Table for 2 * Pi / Fs + */ +extern const LVM_INT16 LVPSA_TwoPiOnFsTable[]; +extern const LVM_FLOAT LVPSA_Float_TwoPiOnFsTable[]; + +/* + * Gain table + */ +extern const LVM_INT16 LVPSA_GainTable[]; +extern const LVM_FLOAT LVPSA_Float_GainTable[]; + +/************************************************************************************/ +/* */ +/* Cosone polynomial coefficients */ +/* */ +/************************************************************************************/ + +/* + * Coefficients for calculating the cosine with the equation: + * + * Cos(x) = (2^Shifts)*(a0 + a1*x + a2*x^2 + a3*x^3 + a4*x^4 + a5*x^5) + * + * These coefficients expect the input, x, to be in the range 0 to 32768 respresenting + * a range of 0 to Pi. The output is in the range 32767 to -32768 representing the range + * +1.0 to -1.0 + */ +extern const LVM_INT16 LVPSA_CosCoef[]; +extern const LVM_FLOAT LVPSA_Float_CosCoef[]; + +/* + * Coefficients for calculating the cosine error with the equation: + * + * CosErr(x) = (2^Shifts)*(a0 + a1*x + a2*x^2 + a3*x^3) + * + * These coefficients expect the input, x, to be in the range 0 to 32768 respresenting + * a range of 0 to Pi/25. The output is in the range 0 to 32767 representing the range + * 0.0 to 0.0078852986 + * + * This is used to give a double precision cosine over the range 0 to Pi/25 using the + * the equation: + * + * Cos(x) = 1.0 - CosErr(x) + */ +extern const LVM_INT16 LVPSA_DPCosCoef[]; +extern const LVM_FLOAT LVPSA_Float_DPCosCoef[]; + +/************************************************************************************/ +/* */ +/* Quasi peak filter coefficients table */ +/* */ +/************************************************************************************/ +extern const QPD_C32_Coefs LVPSA_QPD_Coefs[]; +extern const QPD_FLOAT_Coefs LVPSA_QPD_Float_Coefs[]; + +#endif /* __LVPSA_TABLES_H__ */ diff --git a/media/libeffects/lvm/lib/StereoWidening/lib/LVCS.h b/media/libeffects/lvm/lib/StereoWidening/lib/LVCS.h index e507a7c492..174c86a614 100644 --- a/media/libeffects/lvm/lib/StereoWidening/lib/LVCS.h +++ b/media/libeffects/lvm/lib/StereoWidening/lib/LVCS.h @@ -56,9 +56,6 @@ #ifndef LVCS_H #define LVCS_H -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ /****************************************************************************************/ @@ -389,8 +386,5 @@ LVCS_ReturnStatus_en LVCS_Process(LVCS_Handle_t hInstance, LVM_UINT16 NumSamples); #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* LVCS_H */ diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.c b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.cpp similarity index 100% rename from media/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.c rename to media/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.cpp diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.h b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.h index f69ba38a4d..6ec2ac54da 100644 --- a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.h +++ b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.h @@ -18,9 +18,6 @@ #ifndef __LVCS_BYPASSMIX_H__ #define __LVCS_BYPASSMIX_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ /************************************************************************************/ @@ -91,8 +88,5 @@ LVCS_ReturnStatus_en LVCS_BypassMixer(LVCS_Handle_t hInstance, LVM_FLOAT *pOutData, LVM_UINT16 NumSamples); #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* BYPASSMIX_H */ diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Control.c b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Control.cpp similarity index 100% rename from media/libeffects/lvm/lib/StereoWidening/src/LVCS_Control.c rename to media/libeffects/lvm/lib/StereoWidening/src/LVCS_Control.cpp diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.c b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.cpp similarity index 99% rename from media/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.c rename to media/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.cpp index ec5312e49e..cd53a11f75 100644 --- a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.c +++ b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.cpp @@ -92,7 +92,7 @@ LVCS_ReturnStatus_en LVCS_EqualiserInit(LVCS_Handle_t hInstance, Coeffs.B2 = (LVM_FLOAT)-pEqualiserCoefTable[Offset].B2; LoadConst_Float((LVM_INT16)0, /* Value */ - (void *)&pData->EqualiserBiquadTaps, /* Destination Cast to void:\ + (LVM_FLOAT *)&pData->EqualiserBiquadTaps, /* Destination Cast to void:\ no dereferencing in function*/ /* Number of words */ (LVM_UINT16)(sizeof(pData->EqualiserBiquadTaps) / sizeof(LVM_FLOAT))); diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.h b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.h index 0e756e7518..55c4815dbe 100644 --- a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.h +++ b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.h @@ -18,9 +18,6 @@ #ifndef __LVCS_EQUALISER_H__ #define __LVCS_EQUALISER_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ /************************************************************************************/ @@ -57,8 +54,5 @@ LVCS_ReturnStatus_en LVCS_Equaliser(LVCS_Handle_t hInstance, LVM_FLOAT *pInputOutput, LVM_UINT16 NumSamples); #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* EQUALISER_H */ diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Init.c b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Init.cpp similarity index 100% rename from media/libeffects/lvm/lib/StereoWidening/src/LVCS_Init.c rename to media/libeffects/lvm/lib/StereoWidening/src/LVCS_Init.cpp diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Private.h b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Private.h index ab8ccd1b86..14196511ab 100644 --- a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Private.h +++ b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Private.h @@ -27,9 +27,6 @@ #ifndef __LVCS_PRIVATE_H__ #define __LVCS_PRIVATE_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ /************************************************************************************/ @@ -189,9 +186,6 @@ void LVCS_TimerCallBack ( void* hInstance, LVM_INT32 CallbackParam); -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* PRIVATE_H */ diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Process.c b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Process.cpp similarity index 100% rename from media/libeffects/lvm/lib/StereoWidening/src/LVCS_Process.c rename to media/libeffects/lvm/lib/StereoWidening/src/LVCS_Process.cpp diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.c b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.cpp similarity index 99% rename from media/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.c rename to media/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.cpp index 10851014ed..fbdf57b758 100644 --- a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.c +++ b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.cpp @@ -112,7 +112,7 @@ LVCS_ReturnStatus_en LVCS_ReverbGeneratorInit(LVCS_Handle_t hInstance, Coeffs.B2 = (LVM_FLOAT)-pReverbCoefTable[Offset].B2; LoadConst_Float(0, /* Value */ - (void *)&pData->ReverbBiquadTaps, /* Destination Cast to void: + (LVM_FLOAT *)&pData->ReverbBiquadTaps, /* Destination Cast to void: no dereferencing in function*/ /* Number of words */ (LVM_UINT16)(sizeof(pData->ReverbBiquadTaps) / sizeof(LVM_FLOAT))); @@ -306,7 +306,7 @@ LVCS_ReturnStatus_en LVCS_ReverbGenerator(LVCS_Handle_t hInstance, * Check if the reverb is required */ /* Disable when CS4MS in stereo mode */ - if (((pInstance->Params.SpeakerType == LVCS_HEADPHONE) || \ + if ((((LVCS_OutputDevice_en)pInstance->Params.SpeakerType == LVCS_HEADPHONE) || \ (pInstance->Params.SpeakerType == LVCS_EX_HEADPHONES) || (pInstance->Params.SourceFormat != LVCS_STEREO)) && /* For validation testing */ diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.h b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.h index f94d4e412f..c1c02079f4 100644 --- a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.h +++ b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.h @@ -18,9 +18,6 @@ #ifndef __LVCS_REVERBGENERATOR_H__ #define __LVCS_REVERBGENERATOR_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ /************************************************************************************/ @@ -94,8 +91,5 @@ LVCS_ReturnStatus_en LVCS_ReverbGenerator(LVCS_Handle_t hInstance, LVM_INT16 *pOutput, LVM_UINT16 NumSamples); #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* REVERB_H */ diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.c b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.cpp similarity index 99% rename from media/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.c rename to media/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.cpp index 2992c351d1..f73fc28bf9 100644 --- a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.c +++ b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.cpp @@ -89,7 +89,7 @@ LVCS_ReturnStatus_en LVCS_SEnhancerInit(LVCS_Handle_t hInstance, /* Clear the taps */ LoadConst_Float(0, /* Value */ - (void *)&pData->SEBiquadTapsMid, /* Destination Cast to void:\ + (LVM_FLOAT *)&pData->SEBiquadTapsMid, /* Destination Cast to void:\ no dereferencing in function*/ /* Number of words */ (LVM_UINT16)(sizeof(pData->SEBiquadTapsMid) / sizeof(LVM_FLOAT))); @@ -117,7 +117,7 @@ LVCS_ReturnStatus_en LVCS_SEnhancerInit(LVCS_Handle_t hInstance, /* Clear the taps */ LoadConst_Float(0, /* Value */ - (void *)&pData->SEBiquadTapsSide, /* Destination Cast to void:\ + (LVM_FLOAT *)&pData->SEBiquadTapsSide, /* Destination Cast to void:\ no dereferencing in function*/ /* Number of words */ (LVM_UINT16)(sizeof(pData->SEBiquadTapsSide) / sizeof(LVM_FLOAT))); diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.h b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.h index 4125f24617..79ebb67f91 100644 --- a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.h +++ b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.h @@ -18,9 +18,6 @@ #ifndef __LVCS_STEREOENHANCER_H__ #define __LVCS_STEREOENHANCER_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ /************************************************************************************/ @@ -91,8 +88,5 @@ LVCS_ReturnStatus_en LVCS_StereoEnhancer(LVCS_Handle_t hInstance, LVM_FLOAT *pOutData, LVM_UINT16 NumSamples); #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* STEREOENHANCE_H */ diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.c b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.cpp similarity index 99% rename from media/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.c rename to media/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.cpp index a1fb48febc..1964c8c74c 100644 --- a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.c +++ b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.cpp @@ -23,6 +23,7 @@ /************************************************************************************/ #include "LVCS_Private.h" +#include "LVCS_Tables.h" #include "Filters.h" /* Filter definitions */ #include "BIQUAD.h" /* Biquad definitions */ #include "LVCS_Headphone_Coeffs.h" /* Headphone coefficients */ diff --git a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.h b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.h index 3f6c4c8824..8609ad6b67 100644 --- a/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.h +++ b/media/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.h @@ -18,9 +18,6 @@ #ifndef __LVCS_TABLES_H__ #define __LVCS_TABLES_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ /************************************************************************************/ /* */ @@ -111,7 +108,7 @@ extern const LVM_INT16 LVCS_VolumeTCTable[]; /* */ /************************************************************************************/ -extern LVM_INT32 LVCS_SampleRateTable[]; +extern const LVM_INT32 LVCS_SampleRateTable[]; /*Speaker coeffient tables*/ @@ -144,9 +141,6 @@ extern LVM_UINT16 LVCS_MS_Large_ReverbGainTable[]; -#ifdef __cplusplus -} -#endif /* __cplusplus */ #endif /* __LVCS_TABLES_H__ */ diff --git a/media/libeffects/lvm/wrapper/Android.bp b/media/libeffects/lvm/wrapper/Android.bp index 16fa1262fc..5fb6d129be 100644 --- a/media/libeffects/lvm/wrapper/Android.bp +++ b/media/libeffects/lvm/wrapper/Android.bp @@ -14,7 +14,7 @@ cc_library_shared { vendor: true, srcs: ["Bundle/EffectBundle.cpp"], - cflags: [ + cppflags: [ "-fvisibility=hidden", "-DBUILD_FLOAT", "-DHIGHER_FS", @@ -56,7 +56,7 @@ cc_library_shared { vendor: true, srcs: ["Reverb/EffectReverb.cpp"], - cflags: [ + cppflags: [ "-fvisibility=hidden", "-DBUILD_FLOAT", "-DHIGHER_FS", diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h index e4aacd0782..d8e2ec6dbb 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h @@ -23,9 +23,6 @@ #include #include -#if __cplusplus -extern "C" { -#endif #define FIVEBAND_NUMBANDS 5 #define MAX_NUM_BANDS 5 @@ -228,9 +225,6 @@ static const float LimitLevel_bassBoostEnergyCoefficient = 9.00; static const float LimitLevel_virtualizerContribution = 1.9; -#if __cplusplus -} // extern "C" -#endif #endif /*ANDROID_EFFECTBUNDLE_H_*/ diff --git a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.h b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.h index 8165f5a704..b2d47af9b6 100644 --- a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.h +++ b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.h @@ -20,9 +20,6 @@ #include #include -#if __cplusplus -extern "C" { -#endif #define MAX_NUM_BANDS 5 #define MAX_CALL_SIZE 256 @@ -38,9 +35,6 @@ typedef struct _LPFPair_t int16_t Room_HF; int16_t LPF; } LPFPair_t; -#if __cplusplus -} // extern "C" -#endif #endif /*ANDROID_EFFECTREVERB_H_*/