Merge branch 'gingerbread' into gingerbread-release (e1cd6c40) · Commits · e / os / android_frameworks_av

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

+209 −125

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -88,12 +88,13 @@ struct BundledEffectContext{
	int positionSaved;		int positionSaved;
	bool bMuteEnabled; /* Must store as mute = -96dB level */		bool bMuteEnabled; /* Must store as mute = -96dB level */
	bool bStereoPositionEnabled;		bool bStereoPositionEnabled;
	int frameCount;
	LVM_Fs_en SampleRate;		LVM_Fs_en SampleRate;
	int SamplesPerSecond;		int SamplesPerSecond;
	int SamplesToExitCountEq;		int SamplesToExitCountEq;
	int SamplesToExitCountBb;		int SamplesToExitCountBb;
	int SamplesToExitCountVirt;		int SamplesToExitCountVirt;
			LVM_INT16 *workBuffer;
			int frameCount;
	#ifdef LVM_PCM		#ifdef LVM_PCM
	FILE *PcmInPtr;		FILE *PcmInPtr;
	FILE *PcmOutPtr;		FILE *PcmOutPtr;

media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h

+16 −16

Original line number	Original line	Diff line number	Diff line
	@@ -87,22 +87,22 @@ extern "C"

	enum Frame_Type_3GPP		enum Frame_Type_3GPP
	{		{
	AMR_475 = 0,		AMR_475 = 0, /* 4.75 kbps */
	AMR_515,		AMR_515, /* 5.15 kbps */
	AMR_59,		AMR_59, /* 5.9 kbps */
	AMR_67,		AMR_67, /* 6.7 kbps */
	AMR_74,		AMR_74, /* 7.4 kbps */
	AMR_795,		AMR_795, /* 7.95 kbps */
	AMR_102,		AMR_102, /* 10.2 kbps */
	AMR_122,		AMR_122, /* 12.2 kbps */
	AMR_SID,		AMR_SID, /* GSM AMR DTX */
	GSM_EFR_SID,		GSM_EFR_SID, /* GSM EFR DTX */
	TDMA_EFR_SID,		TDMA_EFR_SID, /* TDMA EFR DTX */
	PDC_EFR_SID,		PDC_EFR_SID, /* PDC EFR DTX */
	FOR_FUTURE_USE1,		FOR_FUTURE_USE1, /* Unused 1 */
	FOR_FUTURE_USE2,		FOR_FUTURE_USE2, /* Unused 2 */
	FOR_FUTURE_USE3,		FOR_FUTURE_USE3, /* Unused 3 */
	AMR_NO_DATA		AMR_NO_DATA /* No data */
	};		};

	/*----------------------------------------------------------------------------		/*----------------------------------------------------------------------------

media/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h

+2 −19

Original line number	Original line	Diff line number	Diff line
	@@ -87,6 +87,8 @@ terms listed above has been obtained from the copyright holder.

	#include "gsm_amr_typedefs.h"		#include "gsm_amr_typedefs.h"
	#include "pvamrnbdecoder_api.h"		#include "pvamrnbdecoder_api.h"
			#include "frame_type_3gpp.h"

	/--------------------------------------------------------------------------/		/--------------------------------------------------------------------------/
	#ifdef __cplusplus		#ifdef __cplusplus
	extern "C"		extern "C"
	@@ -117,25 +119,6 @@ extern "C"
	/*----------------------------------------------------------------------------		/*----------------------------------------------------------------------------
	; ENUMERATED TYPEDEF'S		; ENUMERATED TYPEDEF'S
	----------------------------------------------------------------------------*/		----------------------------------------------------------------------------*/
	enum Frame_Type_3GPP
	{
	AMR_475 = 0, /* 4.75 kbps */
	AMR_515, /* 5.15 kbps */
	AMR_59, /* 5.9 kbps */
	AMR_67, /* 6.7 kbps */
	AMR_74, /* 7.4 kbps */
	AMR_795, /* 7.95 kbps */
	AMR_102, /* 10.2 kbps */
	AMR_122, /* 12.2 kbps */
	AMR_SID, /* GSM AMR DTX */
	GSM_EFR_SID, /* GSM EFR DTX */
	TDMA_EFR_SID, /* TDMA EFR DTX */
	PDC_EFR_SID, /* PDC EFR DTX */
	FOR_FUTURE_USE1, /* Unused 1 */
	FOR_FUTURE_USE2, /* Unused 2 */
	FOR_FUTURE_USE3, /* Unused 3 */
	AMR_NO_DATA
	}; /* No data */

	/*----------------------------------------------------------------------------		/*----------------------------------------------------------------------------
	; STRUCTURES TYPEDEF'S		; STRUCTURES TYPEDEF'S

media/libstagefright/codecs/amrnb/enc/src/gsmamr_enc.h

+1 −20

Original line number	Original line	Diff line number	Diff line
	@@ -86,6 +86,7 @@ terms listed above has been obtained from the copyright holder.
	----------------------------------------------------------------------------*/		----------------------------------------------------------------------------*/

	#include "gsm_amr_typedefs.h"		#include "gsm_amr_typedefs.h"
			#include "frame_type_3gpp.h"

	/--------------------------------------------------------------------------/		/--------------------------------------------------------------------------/
	#ifdef __cplusplus		#ifdef __cplusplus
	@@ -137,26 +138,6 @@ extern "C"
	N_MODES /* Not Used */		N_MODES /* Not Used */
	};		};

	enum Frame_Type_3GPP
	{
	AMR_475 = 0, /* 4.75 kbps */
	AMR_515, /* 5.15 kbps */
	AMR_59, /* 5.9 kbps */
	AMR_67, /* 6.7 kbps */
	AMR_74, /* 7.4 kbps */
	AMR_795, /* 7.95 kbps */
	AMR_102, /* 10.2 kbps */
	AMR_122, /* 12.2 kbps */
	AMR_SID, /* GSM AMR DTX */
	GSM_EFR_SID, /* GSM EFR DTX */
	TDMA_EFR_SID, /* TDMA EFR DTX */
	PDC_EFR_SID, /* PDC EFR DTX */
	FOR_FUTURE_USE1, /* Unused 1 */
	FOR_FUTURE_USE2, /* Unused 2 */
	FOR_FUTURE_USE3, /* Unused 3 */
	AMR_NO_DATA /* No data */
	};

	/*----------------------------------------------------------------------------		/*----------------------------------------------------------------------------
	; STRUCTURES TYPEDEF'S		; STRUCTURES TYPEDEF'S
	----------------------------------------------------------------------------*/		----------------------------------------------------------------------------*/