Merge "Converting effect chains to float point by default." (ef6cf3fc) · Commits · e / os / android_frameworks_av

media/libaudiohal/EffectBufferHalHidl.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,8 @@ class EffectBufferHalHidl : public EffectBufferHalInterface
	virtual audio_buffer_t* audioBuffer();		virtual audio_buffer_t* audioBuffer();
	virtual void* externalData() const;		virtual void* externalData() const;

			virtual size_t getSize() const override { return mBufferSize; }

	virtual void setExternalData(void* external);		virtual void setExternalData(void* external);
	virtual void setFrameCount(size_t frameCount);		virtual void setFrameCount(size_t frameCount);
	virtual bool checkFrameCountChange();		virtual bool checkFrameCountChange();

media/libaudiohal/include/media/audiohal/EffectBufferHalInterface.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,8 @@ class EffectBufferHalInterface : public RefBase
	return externalData() != nullptr ? externalData() : audioBuffer()->raw;		return externalData() != nullptr ? externalData() : audioBuffer()->raw;
	}		}

			virtual size_t getSize() const = 0;

	virtual void setExternalData(void* external) = 0;		virtual void setExternalData(void* external) = 0;
	virtual void setFrameCount(size_t frameCount) = 0;		virtual void setFrameCount(size_t frameCount) = 0;
	virtual bool checkFrameCountChange() = 0; // returns whether frame count has been updated		virtual bool checkFrameCountChange() = 0; // returns whether frame count has been updated

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

+26 −5

Original line number	Original line	Diff line number	Diff line
	@@ -44,9 +44,6 @@ extern "C" {

	#define LVM_MAXINT_8 127 /* Maximum positive integer size */		#define LVM_MAXINT_8 127 /* Maximum positive integer size */
	#define LVM_MAXINT_16 32767		#define LVM_MAXINT_16 32767
	#ifdef BUILD_FLOAT
	#define LVM_MAXFLOAT 1.0f
	#endif
	#define LVM_MAXINT_32 2147483647		#define LVM_MAXINT_32 2147483647
	#define LVM_MAXENUM 2147483647		#define LVM_MAXENUM 2147483647

	@@ -99,8 +96,32 @@ typedef int32_t LVM_INT32; /* Signed 32-bit word */
	typedef uint32_t LVM_UINT32; /* Unsigned 32-bit word */		typedef uint32_t LVM_UINT32; /* Unsigned 32-bit word */

	#ifdef BUILD_FLOAT		#ifdef BUILD_FLOAT
	typedef float LVM_FLOAT; /* single precission floating point*/
	#endif		#define LVM_MAXFLOAT 1.f

			typedef float LVM_FLOAT; /* single precision floating point */

			// If NATIVE_FLOAT_BUFFER is defined, we expose effects as floating point format;
			// otherwise we expose as integer 16 bit and translate to float for the effect libraries.
			// Hence, NATIVE_FLOAT_BUFFER should only be enabled under BUILD_FLOAT compilation.

			#define NATIVE_FLOAT_BUFFER

			#endif // BUILD_FLOAT

			// Select whether we expose int16_t or float buffers.
			#ifdef NATIVE_FLOAT_BUFFER

			#define EFFECT_BUFFER_FORMAT AUDIO_FORMAT_PCM_FLOAT
			typedef float effect_buffer_t;

			#else // NATIVE_FLOAT_BUFFER

			#define EFFECT_BUFFER_FORMAT AUDIO_FORMAT_PCM_16_BIT
			typedef int16_t effect_buffer_t;

			#endif // NATIVE_FLOAT_BUFFER

	/****************************************************************************************/		/****************************************************************************************/
	/* */		/* */
	/* Standard Enumerated types */		/* Standard Enumerated types */

media/libeffects/lvm/wrapper/Android.mk

+13 −6

Original line number	Original line	Diff line number	Diff line
	LOCAL_PATH:= $(call my-dir)		LOCAL_PATH:= $(call my-dir)

			# The wrapper -DBUILD_FLOAT needs to match
			# the lvm library -DBUILD_FLOAT.

	# music bundle wrapper		# music bundle wrapper
	LOCAL_PATH:= $(call my-dir)		LOCAL_PATH:= $(call my-dir)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	@@ -20,15 +23,17 @@ LOCAL_MODULE_RELATIVE_PATH := soundfx
	LOCAL_STATIC_LIBRARIES += libmusicbundle		LOCAL_STATIC_LIBRARIES += libmusicbundle

	LOCAL_SHARED_LIBRARIES := \		LOCAL_SHARED_LIBRARIES := \
	liblog \		libaudioutils \
	libcutils \		libcutils \
	libdl		libdl \
			liblog \

	LOCAL_C_INCLUDES += \		LOCAL_C_INCLUDES += \
	$(LOCAL_PATH)/Bundle \		$(LOCAL_PATH)/Bundle \
	$(LOCAL_PATH)/../lib/Common/lib/ \		$(LOCAL_PATH)/../lib/Common/lib/ \
	$(LOCAL_PATH)/../lib/Bundle/lib/ \		$(LOCAL_PATH)/../lib/Bundle/lib/ \
	$(call include-path-for, audio-effects)		$(call include-path-for, audio-effects) \
			$(call include-path-for, audio-utils) \

	LOCAL_HEADER_LIBRARIES += libhardware_headers		LOCAL_HEADER_LIBRARIES += libhardware_headers
	include $(BUILD_SHARED_LIBRARY)		include $(BUILD_SHARED_LIBRARY)
	@@ -53,15 +58,17 @@ LOCAL_MODULE_RELATIVE_PATH := soundfx
	LOCAL_STATIC_LIBRARIES += libreverb		LOCAL_STATIC_LIBRARIES += libreverb

	LOCAL_SHARED_LIBRARIES := \		LOCAL_SHARED_LIBRARIES := \
	liblog \		libaudioutils \
	libcutils \		libcutils \
	libdl		libdl \
			liblog \

	LOCAL_C_INCLUDES += \		LOCAL_C_INCLUDES += \
	$(LOCAL_PATH)/Reverb \		$(LOCAL_PATH)/Reverb \
	$(LOCAL_PATH)/../lib/Common/lib/ \		$(LOCAL_PATH)/../lib/Common/lib/ \
	$(LOCAL_PATH)/../lib/Reverb/lib/ \		$(LOCAL_PATH)/../lib/Reverb/lib/ \
	$(call include-path-for, audio-effects)		$(call include-path-for, audio-effects) \
			$(call include-path-for, audio-utils) \

	LOCAL_HEADER_LIBRARIES += libhardware_headers		LOCAL_HEADER_LIBRARIES += libhardware_headers

media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp

+83 −117

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@ typedef float LVM_FLOAT;
	#include <stdlib.h>		#include <stdlib.h>
	#include <string.h>		#include <string.h>

			#include <audio_utils/primitives.h>
	#include <log/log.h>		#include <log/log.h>

	#include "EffectBundle.h"		#include "EffectBundle.h"
	@@ -63,16 +64,6 @@ extern "C" const struct effect_interface_s gLvmEffectInterface;
	}\		}\
	}		}


	static inline int16_t clamp16(int32_t sample)
	{
	// check overflow for both positive and negative values:
	// all bits above short range must me equal to sign bit
	if ((sample>>15) ^ (sample>>31))
	sample = 0x7FFF ^ (sample>>31);
	return sample;
	}

	// Namespaces		// Namespaces
	namespace android {		namespace android {
	namespace {		namespace {
	@@ -299,7 +290,7 @@ extern "C" int EffectCreate(const effect_uuid_t *uuid,
	pContext->pBundledContext->SamplesToExitCountVirt = 0;		pContext->pBundledContext->SamplesToExitCountVirt = 0;
	pContext->pBundledContext->SamplesToExitCountBb = 0;		pContext->pBundledContext->SamplesToExitCountBb = 0;
	pContext->pBundledContext->SamplesToExitCountEq = 0;		pContext->pBundledContext->SamplesToExitCountEq = 0;
	#ifdef BUILD_FLOAT		#if defined(BUILD_FLOAT) && !defined(NATIVE_FLOAT_BUFFER)
	pContext->pBundledContext->pInputBuffer = NULL;		pContext->pBundledContext->pInputBuffer = NULL;
	pContext->pBundledContext->pOutputBuffer = NULL;		pContext->pBundledContext->pOutputBuffer = NULL;
	#endif		#endif
	@@ -470,13 +461,9 @@ extern "C" int EffectRelease(effect_handle_t handle){
	if (pContext->pBundledContext->workBuffer != NULL) {		if (pContext->pBundledContext->workBuffer != NULL) {
	free(pContext->pBundledContext->workBuffer);		free(pContext->pBundledContext->workBuffer);
	}		}
	#ifdef BUILD_FLOAT		#if defined(BUILD_FLOAT) && !defined(NATIVE_FLOAT_BUFFER)
	if (pContext->pBundledContext->pInputBuffer != NULL) {
	free(pContext->pBundledContext->pInputBuffer);		free(pContext->pBundledContext->pInputBuffer);
	}
	if (pContext->pBundledContext->pOutputBuffer != NULL) {
	free(pContext->pBundledContext->pOutputBuffer);		free(pContext->pBundledContext->pOutputBuffer);
	}
	#endif		#endif
	delete pContext->pBundledContext;		delete pContext->pBundledContext;
	pContext->pBundledContext = LVM_NULL;		pContext->pBundledContext = LVM_NULL;
	@@ -549,7 +536,7 @@ int LvmBundle_init(EffectContext *pContext){

	pContext->config.inputCfg.accessMode = EFFECT_BUFFER_ACCESS_READ;		pContext->config.inputCfg.accessMode = EFFECT_BUFFER_ACCESS_READ;
	pContext->config.inputCfg.channels = AUDIO_CHANNEL_OUT_STEREO;		pContext->config.inputCfg.channels = AUDIO_CHANNEL_OUT_STEREO;
	pContext->config.inputCfg.format = AUDIO_FORMAT_PCM_16_BIT;		pContext->config.inputCfg.format = EFFECT_BUFFER_FORMAT;
	pContext->config.inputCfg.samplingRate = 44100;		pContext->config.inputCfg.samplingRate = 44100;
	pContext->config.inputCfg.bufferProvider.getBuffer = NULL;		pContext->config.inputCfg.bufferProvider.getBuffer = NULL;
	pContext->config.inputCfg.bufferProvider.releaseBuffer = NULL;		pContext->config.inputCfg.bufferProvider.releaseBuffer = NULL;
	@@ -557,7 +544,7 @@ int LvmBundle_init(EffectContext *pContext){
	pContext->config.inputCfg.mask = EFFECT_CONFIG_ALL;		pContext->config.inputCfg.mask = EFFECT_CONFIG_ALL;
	pContext->config.outputCfg.accessMode = EFFECT_BUFFER_ACCESS_ACCUMULATE;		pContext->config.outputCfg.accessMode = EFFECT_BUFFER_ACCESS_ACCUMULATE;
	pContext->config.outputCfg.channels = AUDIO_CHANNEL_OUT_STEREO;		pContext->config.outputCfg.channels = AUDIO_CHANNEL_OUT_STEREO;
	pContext->config.outputCfg.format = AUDIO_FORMAT_PCM_16_BIT;		pContext->config.outputCfg.format = EFFECT_BUFFER_FORMAT;
	pContext->config.outputCfg.samplingRate = 44100;		pContext->config.outputCfg.samplingRate = 44100;
	pContext->config.outputCfg.bufferProvider.getBuffer = NULL;		pContext->config.outputCfg.bufferProvider.getBuffer = NULL;
	pContext->config.outputCfg.bufferProvider.releaseBuffer = NULL;		pContext->config.outputCfg.bufferProvider.releaseBuffer = NULL;
	@@ -734,47 +721,6 @@ int LvmBundle_init(EffectContext *pContext){
	return 0;		return 0;
	} /* end LvmBundle_init */		} /* end LvmBundle_init */

	#ifdef BUILD_FLOAT
	/**********************************************************************************
	FUNCTION INT16LTOFLOAT
	***********************************************************************************/
	// Todo: need to write function descriptor
	static void Int16ToFloat(const LVM_INT16 src, LVM_FLOAT dst, size_t n) {
	size_t ii;
	src += n-1;
	dst += n-1;
	for (ii = n; ii != 0; ii--) {
	dst = ((LVM_FLOAT)((LVM_INT16)src)) / 32768.0f;
	src--;
	dst--;
	}
	return;
	}
	/**********************************************************************************
	FUNCTION FLOATTOINT16_SAT
	***********************************************************************************/
	// Todo : Need to write function descriptor
	static void FloatToInt16_SAT(const LVM_FLOAT src, LVM_INT16 dst, size_t n) {
	size_t ii;
	LVM_INT32 temp;

	src += n-1;
	dst += n-1;
	for (ii = n; ii != 0; ii--) {
	temp = (LVM_INT32)((src) 32768.0f);
	if (temp >= 32767) {
	*dst = 32767;
	} else if (temp <= -32768) {
	*dst = -32768;
	} else {
	*dst = (LVM_INT16)temp;
	}
	src--;
	dst--;
	}
	return;
	}
	#endif
	//----------------------------------------------------------------------------		//----------------------------------------------------------------------------
	// LvmBundle_process()		// LvmBundle_process()
	//----------------------------------------------------------------------------		//----------------------------------------------------------------------------
	@@ -782,8 +728,8 @@ static void FloatToInt16_SAT(const LVM_FLOAT src, LVM_INT16 dst, size_t n) {
	// Apply LVM Bundle effects		// Apply LVM Bundle effects
	//		//
	// Inputs:		// Inputs:
	// pIn: pointer to stereo 16 bit input data		// pIn: pointer to stereo float or 16 bit input data
	// pOut: pointer to stereo 16 bit output data		// pOut: pointer to stereo float or 16 bit output data
	// frameCount: Frames to process		// frameCount: Frames to process
	// pContext: effect engine context		// pContext: effect engine context
	// strength strength to be applied		// strength strength to be applied
	@@ -793,44 +739,37 @@ static void FloatToInt16_SAT(const LVM_FLOAT src, LVM_INT16 dst, size_t n) {
	//		//
	//----------------------------------------------------------------------------		//----------------------------------------------------------------------------
	#ifdef BUILD_FLOAT		#ifdef BUILD_FLOAT
	int LvmBundle_process(LVM_INT16 *pIn,		int LvmBundle_process(effect_buffer_t *pIn,
	LVM_INT16 *pOut,		effect_buffer_t *pOut,
	int frameCount,		int frameCount,
	EffectContext *pContext){		EffectContext *pContext){


	//LVM_ControlParams_t ActiveParams; /* Current control Parameters */
	LVM_ReturnStatus_en LvmStatus = LVM_SUCCESS; /* Function call status */		LVM_ReturnStatus_en LvmStatus = LVM_SUCCESS; /* Function call status */
	LVM_INT16 *pOutTmp;		effect_buffer_t *pOutTmp;
	LVM_FLOAT *pInputBuff;		#ifndef NATIVE_FLOAT_BUFFER
	LVM_FLOAT *pOutputBuff;		if (pContext->pBundledContext->pInputBuffer == nullptr \|\|

	if (pContext->pBundledContext->pInputBuffer == NULL \|\|
	pContext->pBundledContext->frameCount < frameCount) {		pContext->pBundledContext->frameCount < frameCount) {
	if (pContext->pBundledContext->pInputBuffer != NULL) {
	free(pContext->pBundledContext->pInputBuffer);		free(pContext->pBundledContext->pInputBuffer);
	}		pContext->pBundledContext->pInputBuffer =
	pContext->pBundledContext->pInputBuffer = (LVM_FLOAT )malloc(frameCount \		(LVM_FLOAT )calloc(frameCount, sizeof(LVM_FLOAT) FCC_2);
	sizeof(LVM_FLOAT) * FCC_2);
	}		}

	if (pContext->pBundledContext->pOutputBuffer == NULL \|\|		if (pContext->pBundledContext->pOutputBuffer == nullptr \|\|
	pContext->pBundledContext->frameCount < frameCount) {		pContext->pBundledContext->frameCount < frameCount) {
	if (pContext->pBundledContext->pOutputBuffer != NULL) {
	free(pContext->pBundledContext->pOutputBuffer);		free(pContext->pBundledContext->pOutputBuffer);
	}		pContext->pBundledContext->pOutputBuffer =
	pContext->pBundledContext->pOutputBuffer = (LVM_FLOAT )malloc(frameCount \		(LVM_FLOAT )calloc(frameCount, sizeof(LVM_FLOAT) FCC_2);
	sizeof(LVM_FLOAT) * FCC_2);
	}		}

	if ((pContext->pBundledContext->pInputBuffer == NULL) \|\|		if (pContext->pBundledContext->pInputBuffer == nullptr \|\|
	(pContext->pBundledContext->pOutputBuffer == NULL)) {		pContext->pBundledContext->pOutputBuffer == nullptr) {
	ALOGV("LVM_ERROR : LvmBundle_process memory allocation for float buffer's failed");		ALOGE("LVM_ERROR : LvmBundle_process memory allocation for float buffer's failed");
	return -EINVAL;		return -EINVAL;
	}		}

	pInputBuff = pContext->pBundledContext->pInputBuffer;		LVM_FLOAT * const pInputBuff = pContext->pBundledContext->pInputBuffer;
	pOutputBuff = pContext->pBundledContext->pOutputBuffer;		LVM_FLOAT * const pOutputBuff = pContext->pBundledContext->pOutputBuffer;
			#endif

	if (pContext->config.outputCfg.accessMode == EFFECT_BUFFER_ACCESS_WRITE){		if (pContext->config.outputCfg.accessMode == EFFECT_BUFFER_ACCESS_WRITE){
	pOutTmp = pOut;		pOutTmp = pOut;
	@@ -840,7 +779,7 @@ int LvmBundle_process(LVM_INT16 *pIn,
	free(pContext->pBundledContext->workBuffer);		free(pContext->pBundledContext->workBuffer);
	}		}
	pContext->pBundledContext->workBuffer =		pContext->pBundledContext->workBuffer =
	(LVM_INT16 )calloc(frameCount, sizeof(LVM_INT16) FCC_2);		(effect_buffer_t )calloc(frameCount, sizeof(effect_buffer_t) FCC_2);
	if (pContext->pBundledContext->workBuffer == NULL) {		if (pContext->pBundledContext->workBuffer == NULL) {
	return -ENOMEM;		return -ENOMEM;
	}		}
	@@ -853,38 +792,56 @@ int LvmBundle_process(LVM_INT16 *pIn,
	}		}

	#ifdef LVM_PCM		#ifdef LVM_PCM
	fwrite(pIn, frameCountsizeof(LVM_INT16) FCC_2, 1, pContext->pBundledContext->PcmInPtr);		fwrite(pIn,
			frameCountsizeof(effect_buffer_t) FCC_2, 1, pContext->pBundledContext->PcmInPtr);
	fflush(pContext->pBundledContext->PcmInPtr);		fflush(pContext->pBundledContext->PcmInPtr);
	#endif		#endif

			#ifndef NATIVE_FLOAT_BUFFER
	/* Converting input data from fixed point to float point */		/* Converting input data from fixed point to float point */
	Int16ToFloat(pIn, pInputBuff, frameCount * 2);		memcpy_to_float_from_i16(pInputBuff, pIn, frameCount * FCC_2);

	/* Process the samples */		/* Process the samples */
	LvmStatus = LVM_Process(pContext->pBundledContext->hInstance, /* Instance handle */		LvmStatus = LVM_Process(pContext->pBundledContext->hInstance, /* Instance handle */
	pInputBuff, /* Input buffer */		pInputBuff, /* Input buffer */
	pOutputBuff, /* Output buffer */		pOutputBuff, /* Output buffer */
	(LVM_UINT16)frameCount, /* Number of samples to read */		(LVM_UINT16)frameCount, /* Number of samples to read */
	0); /* Audo Time */		0); /* Audio Time */

			/* Converting output data from float point to fixed point */
			memcpy_to_i16_from_float(pOutTmp, pOutputBuff, frameCount * FCC_2);

			#else
			/* Process the samples */
			LvmStatus = LVM_Process(pContext->pBundledContext->hInstance, /* Instance handle */
			pIn, /* Input buffer */
			pOutTmp, /* Output buffer */
			(LVM_UINT16)frameCount, /* Number of samples to read */
			0); /* Audio Time */
			#endif
	LVM_ERROR_CHECK(LvmStatus, "LVM_Process", "LvmBundle_process")		LVM_ERROR_CHECK(LvmStatus, "LVM_Process", "LvmBundle_process")
	if(LvmStatus != LVM_SUCCESS) return -EINVAL;		if(LvmStatus != LVM_SUCCESS) return -EINVAL;

	/* Converting output data from float point to fixed point */
	FloatToInt16_SAT(pOutputBuff, pOutTmp, (LVM_UINT16)frameCount * 2);
	#ifdef LVM_PCM		#ifdef LVM_PCM
	fwrite(pOutTmp, frameCountsizeof(LVM_INT16) FCC_2, 1, pContext->pBundledContext->PcmOutPtr);		fwrite(pOutTmp,
			frameCountsizeof(effect_buffer_t) FCC_2, 1, pContext->pBundledContext->PcmOutPtr);
	fflush(pContext->pBundledContext->PcmOutPtr);		fflush(pContext->pBundledContext->PcmOutPtr);
	#endif		#endif

	if (pContext->config.outputCfg.accessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE){		if (pContext->config.outputCfg.accessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE){
	for (int i = 0; i < frameCount * 2; i++){		for (int i = 0; i < frameCount * FCC_2; i++) {
			#ifndef NATIVE_FLOAT_BUFFER
	pOut[i] = clamp16((LVM_INT32)pOut[i] + (LVM_INT32)pOutTmp[i]);		pOut[i] = clamp16((LVM_INT32)pOut[i] + (LVM_INT32)pOutTmp[i]);
			#else
			pOut[i] = pOut[i] + pOutTmp[i];
			#endif
	}		}
	}		}
	return 0;		return 0;
	} /* end LvmBundle_process */		} /* end LvmBundle_process */
	#else
			#else // BUILD_FLOAT

	int LvmBundle_process(LVM_INT16 *pIn,		int LvmBundle_process(LVM_INT16 *pIn,
	LVM_INT16 *pOut,		LVM_INT16 *pOut,
	int frameCount,		int frameCount,
	@@ -901,7 +858,7 @@ int LvmBundle_process(LVM_INT16 *pIn,
	free(pContext->pBundledContext->workBuffer);		free(pContext->pBundledContext->workBuffer);
	}		}
	pContext->pBundledContext->workBuffer =		pContext->pBundledContext->workBuffer =
	(LVM_INT16 )calloc(frameCount, sizeof(LVM_INT16) 2);		(effect_buffer_t )calloc(frameCount, sizeof(effect_buffer_t) FCC_2);
	if (pContext->pBundledContext->workBuffer == NULL) {		if (pContext->pBundledContext->workBuffer == NULL) {
	return -ENOMEM;		return -ENOMEM;
	}		}
	@@ -914,7 +871,8 @@ int LvmBundle_process(LVM_INT16 *pIn,
	}		}

	#ifdef LVM_PCM		#ifdef LVM_PCM
	fwrite(pIn, frameCountsizeof(LVM_INT16)2, 1, pContext->pBundledContext->PcmInPtr);		fwrite(pIn, frameCount * sizeof(pIn) FCC_2,
			1 /* nmemb */, pContext->pBundledContext->PcmInPtr);
	fflush(pContext->pBundledContext->PcmInPtr);		fflush(pContext->pBundledContext->PcmInPtr);
	#endif		#endif

	@@ -925,13 +883,14 @@ int LvmBundle_process(LVM_INT16 *pIn,
	pIn, /* Input buffer */		pIn, /* Input buffer */
	pOutTmp, /* Output buffer */		pOutTmp, /* Output buffer */
	(LVM_UINT16)frameCount, /* Number of samples to read */		(LVM_UINT16)frameCount, /* Number of samples to read */
	0); /* Audo Time */		0); /* Audio Time */

	LVM_ERROR_CHECK(LvmStatus, "LVM_Process", "LvmBundle_process")		LVM_ERROR_CHECK(LvmStatus, "LVM_Process", "LvmBundle_process")
	if(LvmStatus != LVM_SUCCESS) return -EINVAL;		if(LvmStatus != LVM_SUCCESS) return -EINVAL;

	#ifdef LVM_PCM		#ifdef LVM_PCM
	fwrite(pOutTmp, frameCountsizeof(LVM_INT16)2, 1, pContext->pBundledContext->PcmOutPtr);		fwrite(pOutTmp, frameCount * sizeof(pOutTmp) FCC_2,
			1 /* nmemb */, pContext->pBundledContext->PcmOutPtr);
	fflush(pContext->pBundledContext->PcmOutPtr);		fflush(pContext->pBundledContext->PcmOutPtr);
	#endif		#endif

	@@ -942,7 +901,8 @@ int LvmBundle_process(LVM_INT16 *pIn,
	}		}
	return 0;		return 0;
	} /* end LvmBundle_process */		} /* end LvmBundle_process */
	#endif
			#endif // BUILD_FLOAT

	//----------------------------------------------------------------------------		//----------------------------------------------------------------------------
	// EqualizerUpdateActiveParams()		// EqualizerUpdateActiveParams()
	@@ -1276,8 +1236,7 @@ int Effect_setConfig(EffectContext pContext, effect_config_t pConfig){
	CHECK_ARG(pConfig->inputCfg.channels == AUDIO_CHANNEL_OUT_STEREO);		CHECK_ARG(pConfig->inputCfg.channels == AUDIO_CHANNEL_OUT_STEREO);
	CHECK_ARG(pConfig->outputCfg.accessMode == EFFECT_BUFFER_ACCESS_WRITE		CHECK_ARG(pConfig->outputCfg.accessMode == EFFECT_BUFFER_ACCESS_WRITE
	\|\| pConfig->outputCfg.accessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE);		\|\| pConfig->outputCfg.accessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE);
	CHECK_ARG(pConfig->inputCfg.format == AUDIO_FORMAT_PCM_16_BIT);		CHECK_ARG(pConfig->inputCfg.format == EFFECT_BUFFER_FORMAT);

	pContext->config = *pConfig;		pContext->config = *pConfig;

	switch (pConfig->inputCfg.samplingRate) {		switch (pConfig->inputCfg.samplingRate) {
	@@ -3349,10 +3308,17 @@ int Effect_process(effect_handle_t self,
	pContext->pBundledContext->NumberEffectsCalled = 0;		pContext->pBundledContext->NumberEffectsCalled = 0;
	/* Process all the available frames, block processing is		/* Process all the available frames, block processing is
	handled internalLY by the LVM bundle */		handled internalLY by the LVM bundle */
	processStatus = android::LvmBundle_process( (LVM_INT16 *)inBuffer->raw,		#ifdef NATIVE_FLOAT_BUFFER
	(LVM_INT16 *)outBuffer->raw,		processStatus = android::LvmBundle_process(inBuffer->f32,
			outBuffer->f32,
			outBuffer->frameCount,
			pContext);
			#else
			processStatus = android::LvmBundle_process(inBuffer->s16,
			outBuffer->s16,
	outBuffer->frameCount,		outBuffer->frameCount,
	pContext);		pContext);
			#endif
	if (processStatus != 0){		if (processStatus != 0){
	ALOGV("\tLVM_ERROR : LvmBundle_process returned error %d", processStatus);		ALOGV("\tLVM_ERROR : LvmBundle_process returned error %d", processStatus);
	if (status == 0) {		if (status == 0) {