Merge "libeffects: Removed the unused/redundant code in lvm/lib" am: c9517ec483 am: b685fe384d (6f270bae) · Commits · e / os / android_frameworks_av

media/libeffects/lvm/lib/Android.bp

+0 −4

Original line number	Diff line number	Diff line
		@@ -137,8 +137,6 @@ cc_library_static {
		],
		cppflags: [
		"-fvisibility=hidden",
		"-DBUILD_FLOAT",
		"-DHIGHER_FS",
		"-DSUPPORT_MC",

		"-Wall",
		@@ -208,8 +206,6 @@ cc_library_static {

		cppflags: [
		"-fvisibility=hidden",
		"-DBUILD_FLOAT",
		"-DHIGHER_FS",

		"-Wall",
		"-Werror",

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

+0 −33

Original line number	Diff line number	Diff line
		@@ -55,8 +55,6 @@
		#ifndef __LVDBE_H__
		#define __LVDBE_H__



		/****************************************************************************************/
		/* */
		/* Includes */
		@@ -65,7 +63,6 @@

		#include "LVM_Types.h"


		/****************************************************************************************/
		/* */
		/* Definitions */
		@@ -82,7 +79,6 @@
		#define LVDBE_EFFECT_12DB 12
		#define LVDBE_EFFECT_15DB 15


		/****************************************************************************************/
		/* */
		/* Types */
		@@ -92,7 +88,6 @@
		/* Instance handle */
		typedef void *LVDBE_Handle_t;


		/* Operating modes */
		typedef enum
		{
		@@ -101,7 +96,6 @@ typedef enum
		LVDBE_MODE_MAX = LVM_MAXINT_32
		} LVDBE_Mode_en;


		/* High pass filter */
		typedef enum
		{
		@@ -110,7 +104,6 @@ typedef enum
		LVDBE_HPF_MAX = LVM_MAXINT_32
		} LVDBE_FilterSelect_en;


		/* Volume control */
		typedef enum
		{
		@@ -119,7 +112,6 @@ typedef enum
		LVDBE_VOLUME_MAX = LVM_MAXINT_32
		} LVDBE_Volume_en;


		/* Memory Types */
		typedef enum
		{
		@@ -131,7 +123,6 @@ typedef enum

		} LVDBE_MemoryTypes_en;


		/* Function return status */
		typedef enum
		{
		@@ -143,7 +134,6 @@ typedef enum
		LVDBE_STATUS_MAX = LVM_MAXINT_32
		} LVDBE_ReturnStatus_en;


		/****************************************************************************************/
		/* */
		/* Linked enumerated type and capability definitions */
		@@ -182,7 +172,6 @@ typedef enum
		LVDBE_CENTRE_MAX = LVM_MAXINT_32
		} LVDBE_CentreFreq_en;


		/*
		* Supported sample rates in samples per second
		*/
		@@ -195,12 +184,10 @@ typedef enum
		#define LVDBE_CAP_FS_32000 64
		#define LVDBE_CAP_FS_44100 128
		#define LVDBE_CAP_FS_48000 256
		#if defined(BUILD_FLOAT) && defined(HIGHER_FS)
		#define LVDBE_CAP_FS_88200 512
		#define LVDBE_CAP_FS_96000 1024
		#define LVDBE_CAP_FS_176400 2048
		#define LVDBE_CAP_FS_192000 4096
		#endif

		typedef enum
		{
		@@ -213,16 +200,13 @@ typedef enum
		LVDBE_FS_32000 = 6,
		LVDBE_FS_44100 = 7,
		LVDBE_FS_48000 = 8,
		#if defined(BUILD_FLOAT) && defined(HIGHER_FS)
		LVDBE_FS_88200 = 9,
		LVDBE_FS_96000 = 10,
		LVDBE_FS_176400 = 11,
		LVDBE_FS_192000 = 12,
		#endif
		LVDBE_FS_MAX = LVM_MAXINT_32
		} LVDBE_Fs_en;


		/****************************************************************************************/
		/* */
		/* Structures */
		@@ -238,14 +222,12 @@ typedef struct
		void pBaseAddress; / Pointer to the region base address */
		} LVDBE_MemoryRegion_t;


		/* Memory table containing the region definitions */
		typedef struct
		{
		LVDBE_MemoryRegion_t Region[LVDBE_NR_MEMORY_REGIONS]; /* One definition for each region */
		} LVDBE_MemTab_t;


		/* Parameter structure */
		typedef struct
		{
		@@ -263,7 +245,6 @@ typedef struct

		} LVDBE_Params_t;


		/* Capability structure */
		typedef struct
		{
		@@ -272,7 +253,6 @@ typedef struct
		LVM_UINT16 MaxBlockSize; /* Maximum block size in sample pairs */
		} LVDBE_Capabilities_t;


		/****************************************************************************************/
		/* */
		/* Function Prototypes */
		@@ -314,7 +294,6 @@ LVDBE_ReturnStatus_en LVDBE_Memory(LVDBE_Handle_t hInstance,
		LVDBE_MemTab_t *pMemoryTable,
		LVDBE_Capabilities_t *pCapabilities);


		/****************************************************************************************/
		/* */
		/* FUNCTION: LVDBE_Init */
		@@ -352,7 +331,6 @@ LVDBE_ReturnStatus_en LVDBE_Init(LVDBE_Handle_t *phInstance,
		LVDBE_MemTab_t *pMemoryTable,
		LVDBE_Capabilities_t *pCapabilities);


		/****************************************************************************************/
		/* */
		/* FUNCTION: LVDBE_GetParameters */
		@@ -376,7 +354,6 @@ LVDBE_ReturnStatus_en LVDBE_Init(LVDBE_Handle_t *phInstance,
		LVDBE_ReturnStatus_en LVDBE_GetParameters(LVDBE_Handle_t hInstance,
		LVDBE_Params_t *pParams);


		/****************************************************************************************/
		/* */
		/* FUNCTION: LVDBE_GetCapabilities */
		@@ -400,7 +377,6 @@ LVDBE_ReturnStatus_en LVDBE_GetParameters(LVDBE_Handle_t hInstance,
		LVDBE_ReturnStatus_en LVDBE_GetCapabilities(LVDBE_Handle_t hInstance,
		LVDBE_Capabilities_t *pCapabilities);


		/****************************************************************************************/
		/* */
		/* FUNCTION: LVDBE_Control */
		@@ -441,7 +417,6 @@ LVDBE_ReturnStatus_en LVDBE_GetCapabilities(LVDBE_Handle_t hInstance,
		LVDBE_ReturnStatus_en LVDBE_Control(LVDBE_Handle_t hInstance,
		LVDBE_Params_t *pParams);


		/****************************************************************************************/
		/* */
		/* FUNCTION: LVDBE_Process */
		@@ -462,17 +437,9 @@ LVDBE_ReturnStatus_en LVDBE_Control(LVDBE_Handle_t hInstance,
		/* NOTES: */
		/* */
		/****************************************************************************************/
		#ifdef BUILD_FLOAT
		LVDBE_ReturnStatus_en LVDBE_Process(LVDBE_Handle_t hInstance,
		const LVM_FLOAT *pInData,
		LVM_FLOAT *pOutData,
		LVM_UINT16 NumSamples);
		#else
		LVDBE_ReturnStatus_en LVDBE_Process(LVDBE_Handle_t hInstance,
		const LVM_INT16 *pInData,
		LVM_INT16 *pOutData,
		LVM_UINT16 NumSamples);
		#endif


		#endif /* __LVDBE_H__ */