diff options
Diffstat (limited to 'media/libstagefright/codecs/aacenc/inc')
15 files changed, 22 insertions, 22 deletions
diff --git a/media/libstagefright/codecs/aacenc/inc/aac_rom.h b/media/libstagefright/codecs/aacenc/inc/aac_rom.h index 784bb70..8e206b7 100644 --- a/media/libstagefright/codecs/aacenc/inc/aac_rom.h +++ b/media/libstagefright/codecs/aacenc/inc/aac_rom.h @@ -16,7 +16,7 @@ /******************************************************************************* File: aac_rom.h - Content: constant tables + Content: constant tables *******************************************************************************/ diff --git a/media/libstagefright/codecs/aacenc/inc/aacenc_core.h b/media/libstagefright/codecs/aacenc/inc/aacenc_core.h index 41ba756..1acdbbc 100644 --- a/media/libstagefright/codecs/aacenc/inc/aacenc_core.h +++ b/media/libstagefright/codecs/aacenc/inc/aacenc_core.h @@ -47,7 +47,7 @@ typedef struct { typedef struct { - + AACENC_CONFIG config; /* Word16 size: 8 */ ELEMENT_INFO elInfo; /* Word16 size: 4 */ diff --git a/media/libstagefright/codecs/aacenc/inc/adj_thr.h b/media/libstagefright/codecs/aacenc/inc/adj_thr.h index f7cb888..0f4bb5e 100644 --- a/media/libstagefright/codecs/aacenc/inc/adj_thr.h +++ b/media/libstagefright/codecs/aacenc/inc/adj_thr.h @@ -16,7 +16,7 @@ /******************************************************************************* File: adj_thr.h - Content: Threshold compensation function + Content: Threshold compensation function *******************************************************************************/ @@ -44,7 +44,7 @@ void AdjustThresholds(ADJ_THR_STATE *adjThrState, PSY_OUT_ELEMENT *psyOutElement, Word16 *chBitDistribution, Word16 logSfbEnergy[MAX_CHANNELS][MAX_GROUPED_SFB], - Word16 sfbNRelevantLines[MAX_CHANNELS][MAX_GROUPED_SFB], + Word16 sfbNRelevantLines[MAX_CHANNELS][MAX_GROUPED_SFB], QC_OUT_ELEMENT* qcOE, ELEMENT_BITS* elBits, const Word16 nChannels, diff --git a/media/libstagefright/codecs/aacenc/inc/adj_thr_data.h b/media/libstagefright/codecs/aacenc/inc/adj_thr_data.h index 9ac4664..30132d8 100644 --- a/media/libstagefright/codecs/aacenc/inc/adj_thr_data.h +++ b/media/libstagefright/codecs/aacenc/inc/adj_thr_data.h @@ -16,7 +16,7 @@ /******************************************************************************* File: adj_thr_data.h - Content: Threshold compensation parameter + Content: Threshold compensation parameter *******************************************************************************/ diff --git a/media/libstagefright/codecs/aacenc/inc/bitenc.h b/media/libstagefright/codecs/aacenc/inc/bitenc.h index 6ded3c6..6a58aeb 100644 --- a/media/libstagefright/codecs/aacenc/inc/bitenc.h +++ b/media/libstagefright/codecs/aacenc/inc/bitenc.h @@ -26,7 +26,7 @@ #include "qc_data.h" #include "tns.h" #include "channel_map.h" -#include "interface.h" +#include "interface.h" struct BITSTREAMENCODER_INIT { diff --git a/media/libstagefright/codecs/aacenc/inc/interface.h b/media/libstagefright/codecs/aacenc/inc/interface.h index 966ac99..a42e6a9 100644 --- a/media/libstagefright/codecs/aacenc/inc/interface.h +++ b/media/libstagefright/codecs/aacenc/inc/interface.h @@ -55,11 +55,11 @@ typedef struct { Word16 windowShape; Word16 groupingMask; Word16 sfbOffsets[MAX_GROUPED_SFB+1]; - Word16 mdctScale; - Word32 *sfbEnergy; + Word16 mdctScale; + Word32 *sfbEnergy; Word32 *sfbSpreadedEnergy; - Word32 *sfbThreshold; - Word32 *mdctSpectrum; + Word32 *sfbThreshold; + Word32 *mdctSpectrum; Word32 sfbEnSumLR; Word32 sfbEnSumMS; Word32 sfbDist[MAX_GROUPED_SFB]; diff --git a/media/libstagefright/codecs/aacenc/inc/line_pe.h b/media/libstagefright/codecs/aacenc/inc/line_pe.h index 038d5a3..116d5a8 100644 --- a/media/libstagefright/codecs/aacenc/inc/line_pe.h +++ b/media/libstagefright/codecs/aacenc/inc/line_pe.h @@ -24,8 +24,8 @@ #define __LINE_PE_H -#include "psy_const.h" -#include "interface.h" +#include "psy_const.h" +#include "interface.h" typedef struct { @@ -72,4 +72,4 @@ void calcSfbPe(PE_DATA *peData, -#endif +#endif diff --git a/media/libstagefright/codecs/aacenc/inc/psy_const.h b/media/libstagefright/codecs/aacenc/inc/psy_const.h index b05d683..19fb9b2 100644 --- a/media/libstagefright/codecs/aacenc/inc/psy_const.h +++ b/media/libstagefright/codecs/aacenc/inc/psy_const.h @@ -69,7 +69,7 @@ enum #define BLOCK_SWITCHING_OFFSET (1*1024+3*128+64+128) #define BLOCK_SWITCHING_DATA_SIZE FRAME_LEN_LONG - + #define TRANSFORM_OFFSET_LONG 0 #define TRANSFORM_OFFSET_SHORT 448 diff --git a/media/libstagefright/codecs/aacenc/inc/psy_main.h b/media/libstagefright/codecs/aacenc/inc/psy_main.h index 5fcbe13..2ccac60 100644 --- a/media/libstagefright/codecs/aacenc/inc/psy_main.h +++ b/media/libstagefright/codecs/aacenc/inc/psy_main.h @@ -54,9 +54,9 @@ Word16 psyMainInit( PSY_KERNEL *hPsy, Word16 bandwidth); -Word16 psyMain(Word16 nChannels, /*!< total number of channels */ +Word16 psyMain(Word16 nChannels, /*!< total number of channels */ ELEMENT_INFO *elemInfo, - Word16 *timeSignal, /*!< interleaved time signal */ + Word16 *timeSignal, /*!< interleaved time signal */ PSY_DATA psyData[MAX_CHANNELS], TNS_DATA tnsData[MAX_CHANNELS], PSY_CONFIGURATION_LONG* psyConfLong, diff --git a/media/libstagefright/codecs/aacenc/inc/qc_main.h b/media/libstagefright/codecs/aacenc/inc/qc_main.h index 924a06d..8f83973 100644 --- a/media/libstagefright/codecs/aacenc/inc/qc_main.h +++ b/media/libstagefright/codecs/aacenc/inc/qc_main.h @@ -35,7 +35,7 @@ void QCOutDelete(QC_OUT *hQC, VO_MEM_OPERATOR *pMemOP); Word16 QCNew(QC_STATE *hQC, VO_MEM_OPERATOR *pMemOP); -Word16 QCInit(QC_STATE *hQC, +Word16 QCInit(QC_STATE *hQC, struct QC_INIT *init); void QCDelete(QC_STATE *hQC, VO_MEM_OPERATOR *pMemOP); diff --git a/media/libstagefright/codecs/aacenc/inc/quantize.h b/media/libstagefright/codecs/aacenc/inc/quantize.h index 7dac2bf..1cafef6 100644 --- a/media/libstagefright/codecs/aacenc/inc/quantize.h +++ b/media/libstagefright/codecs/aacenc/inc/quantize.h @@ -28,7 +28,7 @@ #define MAX_QUANT 8191 -void QuantizeSpectrum(Word16 sfbCnt, +void QuantizeSpectrum(Word16 sfbCnt, Word16 maxSfbPerGroup, Word16 sfbPerGroup, Word16 *sfbOffset, Word32 *mdctSpectrum, diff --git a/media/libstagefright/codecs/aacenc/inc/sf_estim.h b/media/libstagefright/codecs/aacenc/inc/sf_estim.h index 11436a2..9039f25 100644 --- a/media/libstagefright/codecs/aacenc/inc/sf_estim.h +++ b/media/libstagefright/codecs/aacenc/inc/sf_estim.h @@ -23,7 +23,7 @@ #ifndef __SF_ESTIM_H__ #define __SF_ESTIM_H__ /* - Scale factor estimation + Scale factor estimation */ #include "psy_const.h" #include "interface.h" diff --git a/media/libstagefright/codecs/aacenc/inc/stat_bits.h b/media/libstagefright/codecs/aacenc/inc/stat_bits.h index fff3d14..9cddc1d 100644 --- a/media/libstagefright/codecs/aacenc/inc/stat_bits.h +++ b/media/libstagefright/codecs/aacenc/inc/stat_bits.h @@ -28,7 +28,7 @@ Word16 countStaticBitdemand(PSY_OUT_CHANNEL psyOutChannel[MAX_CHANNELS], PSY_OUT_ELEMENT *psyOutElement, - Word16 nChannels, + Word16 nChannels, Word16 adtsUsed); #endif /* __STAT_BITS_H */ diff --git a/media/libstagefright/codecs/aacenc/inc/tns_param.h b/media/libstagefright/codecs/aacenc/inc/tns_param.h index 78265bb..0aa33c3 100644 --- a/media/libstagefright/codecs/aacenc/inc/tns_param.h +++ b/media/libstagefright/codecs/aacenc/inc/tns_param.h @@ -44,7 +44,7 @@ typedef struct{ }TNS_INFO_TAB; -void GetTnsParam(TNS_CONFIG_TABULATED *tnsConfigTab, +void GetTnsParam(TNS_CONFIG_TABULATED *tnsConfigTab, Word32 bitRate, Word16 channels, Word16 blockType); void GetTnsMaxBands(Word32 samplingRate, Word16 blockType, Word16* tnsMaxSfb); diff --git a/media/libstagefright/codecs/aacenc/inc/transform.h b/media/libstagefright/codecs/aacenc/inc/transform.h index 93d5ffe..fbac7aa 100644 --- a/media/libstagefright/codecs/aacenc/inc/transform.h +++ b/media/libstagefright/codecs/aacenc/inc/transform.h @@ -24,7 +24,7 @@ #define __TRANSFORM_H__ #include "typedef.h" - + void Transform_Real(Word16 *mdctDelayBuffer, Word16 *timeSignal, Word16 chIncrement, /*! channel increment */ |