Merge "Merge commit '29622fe971325dd6929f2f3a4fe2c7fcf736c03c' into... (0b890e62) · Commits · e / os / android_frameworks_av

media/libeffects/lvm/lib/Android.bp

+139 −139

Original line number	Diff line number	Diff line
		@@ -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",

media/libeffects/lvm/lib/Bass/lib/LVDBE.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -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__ */

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -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;


		/*

media/libeffects/lvm/lib/Bass/src/LVDBE_Private.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -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__ */