diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-04-05 17:40:06 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2011-04-23 18:34:32 +0300 |
| commit | f3664ae9369a861ffbc2354e8e93e48983802062 (patch) | |
| tree | ac0beed087ab2b2e259b40f497bc6e1c81495e8d /media/libstagefright/codecs/common | |
| parent | 41050cdb033641ddf26831d9272c0930f7b40a2d (diff) | |
| download | frameworks_av-f3664ae9369a861ffbc2354e8e93e48983802062.zip frameworks_av-f3664ae9369a861ffbc2354e8e93e48983802062.tar.gz frameworks_av-f3664ae9369a861ffbc2354e8e93e48983802062.tar.bz2 | |
stagefright aacenc/amrwbenc: Remove trailing whitespace
Change-Id: I3c85d8ba4cfb164455d137cdbf3b5ecc941dc6b8
Diffstat (limited to 'media/libstagefright/codecs/common')
4 files changed, 14 insertions, 14 deletions
diff --git a/media/libstagefright/codecs/common/Config.mk b/media/libstagefright/codecs/common/Config.mk index 3d754e7..187f25c 100644 --- a/media/libstagefright/codecs/common/Config.mk +++ b/media/libstagefright/codecs/common/Config.mk @@ -1,8 +1,8 @@ -# +# # This configure file is just for Linux projects against Android # -VOPRJ := +VOPRJ := VONJ := # WARNING: @@ -20,5 +20,5 @@ endif VOTEST := 0 -VO_CFLAGS:=-DLINUX +VO_CFLAGS:=-DLINUX diff --git a/media/libstagefright/codecs/common/include/voAMRWB.h b/media/libstagefright/codecs/common/include/voAMRWB.h index 13290c7..d3eb537 100644 --- a/media/libstagefright/codecs/common/include/voAMRWB.h +++ b/media/libstagefright/codecs/common/include/voAMRWB.h @@ -29,20 +29,20 @@ extern "C" { #pragma pack(push, 4) /*!* the bit rate the codec supports*/ -typedef enum { +typedef enum { VOAMRWB_MDNONE = -1, /*!< Invalid mode */ VOAMRWB_MD66 = 0, /*!< 6.60kbps */ - VOAMRWB_MD885 = 1, /*!< 8.85kbps */ + VOAMRWB_MD885 = 1, /*!< 8.85kbps */ VOAMRWB_MD1265 = 2, /*!< 12.65kbps */ VOAMRWB_MD1425 = 3, /*!< 14.25kbps */ VOAMRWB_MD1585 = 4, /*!< 15.85bps */ VOAMRWB_MD1825 = 5, /*!< 18.25bps */ VOAMRWB_MD1985 = 6, /*!< 19.85kbps */ VOAMRWB_MD2305 = 7, /*!< 23.05kbps */ - VOAMRWB_MD2385 = 8, /*!< 23.85kbps> */ + VOAMRWB_MD2385 = 8, /*!< 23.85kbps> */ VOAMRWB_N_MODES = 9, /*!< Invalid mode */ VOAMRWB_MODE_MAX = VO_MAX_ENUM_VALUE - + }VOAMRWBMODE; /*!* the frame format the codec supports*/ @@ -51,17 +51,17 @@ typedef enum { /*One word (2-byte) for sync word (0x6b21)*/ /*One word (2-byte) for frame length N.*/ /*N words (2-byte) containing N bits (bit 0 = 0x007f, bit 1 = 0x0081).*/ - VOAMRWB_ITU = 1, + VOAMRWB_ITU = 1, /*One word (2-byte) for sync word (0x6b21).*/ - /*One word (2-byte) to indicate the frame type.*/ + /*One word (2-byte) to indicate the frame type.*/ /*One word (2-byte) to indicate the mode.*/ /*N words (2-byte) containing N bits (bit 0 = 0xff81, bit 1 = 0x007f).*/ - VOAMRWB_RFC3267 = 2, /* see RFC 3267 */ - VOAMRWB_TMAX = VO_MAX_ENUM_VALUE + VOAMRWB_RFC3267 = 2, /* see RFC 3267 */ + VOAMRWB_TMAX = VO_MAX_ENUM_VALUE }VOAMRWBFRAMETYPE; -#define VO_PID_AMRWB_Module 0x42261000 +#define VO_PID_AMRWB_Module 0x42261000 #define VO_PID_AMRWB_FORMAT (VO_PID_AMRWB_Module | 0x0002) #define VO_PID_AMRWB_CHANNELS (VO_PID_AMRWB_Module | 0x0003) #define VO_PID_AMRWB_SAMPLERATE (VO_PID_AMRWB_Module | 0x0004) diff --git a/media/libstagefright/codecs/common/include/voAudio.h b/media/libstagefright/codecs/common/include/voAudio.h index 21d0cf6..d8628ee 100644 --- a/media/libstagefright/codecs/common/include/voAudio.h +++ b/media/libstagefright/codecs/common/include/voAudio.h @@ -135,7 +135,7 @@ typedef struct VO_AUDIO_CODECAPI * \param pOutInfo [OUT] The codec fills audio format and the input data size used in current call. * pOutInfo->InputUsed is total used input data size in byte. * \retval VO_ERR_NONE Succeeded. - * VO_ERR_INPUT_BUFFER_SMALL. The input was finished or the input data was not enought. Continue to input + * VO_ERR_INPUT_BUFFER_SMALL. The input was finished or the input data was not enought. Continue to input * data before next call. */ VO_U32 (VO_API * GetOutputData) (VO_HANDLE hCodec, VO_CODECBUFFER * pOutBuffer, VO_AUDIO_OUTPUTINFO * pOutInfo); diff --git a/media/libstagefright/codecs/common/include/voIndex.h b/media/libstagefright/codecs/common/include/voIndex.h index a409a6e..320a2f8 100644 --- a/media/libstagefright/codecs/common/include/voIndex.h +++ b/media/libstagefright/codecs/common/include/voIndex.h @@ -173,7 +173,7 @@ enum // Module own error ID #define VO_ERR_Module 0x8xxx0X00 */ - + #define VO_PID_COMMON_BASE 0x40000000 /*!< The base of common param ID */ #define VO_PID_COMMON_QUERYMEM (VO_PID_COMMON_BASE | 0X0001) /*!< Query the memory needed; Reserved. */ #define VO_PID_COMMON_INPUTTYPE (VO_PID_COMMON_BASE | 0X0002) /*!< Set or get the input buffer type. VO_INPUT_TYPE */ |