Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"

Browse Source 
* commit 'd80cbb8c7b13203704c00e2f5941588811c15665':
  stagefright aacenc: Add missing newlines at the end of files
This commit is contained in:
Jean-Baptiste Queru
2012-01-24 15:13:42 -08:00
committed by Android Git Automerger
parent 2ae5805cf1 d80cbb8c7b
commit fc2ea24b02
13 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/codecs/aacenc/basic_op/oper_32b.c
View File

@@ -358,4 +358,4 @@ Word32 pow2_xy(Word32 x, Word32 y)
res = pow2Table[(POW2_TABLE_SIZE*fPart)/y] >> iPart; res = pow2Table[(POW2_TABLE_SIZE*fPart)/y] >> iPart;
return(res); return(res);
} }

2
media/libstagefright/codecs/aacenc/inc/config.h
View File

@@ -33,4 +33,4 @@
#define MINBITS_COEF 744 #define MINBITS_COEF 744
#endif #endif

2
media/libstagefright/codecs/aacenc/inc/sf_estim.h
View File

@@ -43,4 +43,4 @@ EstimateScaleFactors(PSY_OUT_CHANNEL psyOutChannel[MAX_CHANNELS],
Word16 logSfbFormFactor[MAX_CHANNELS][MAX_GROUPED_SFB], Word16 logSfbFormFactor[MAX_CHANNELS][MAX_GROUPED_SFB],
Word16 sfbNRelevantLines[MAX_CHANNELS][MAX_GROUPED_SFB], Word16 sfbNRelevantLines[MAX_CHANNELS][MAX_GROUPED_SFB],
const Word16 nChannels); const Word16 nChannels);
#endif #endif

2
media/libstagefright/codecs/aacenc/inc/transform.h
View File

@@ -33,4 +33,4 @@ void Transform_Real(Word16 *mdctDelayBuffer,
Word16 windowSequence Word16 windowSequence
); );
#endif #endif

2
media/libstagefright/codecs/aacenc/src/aac_rom.c
View File

@@ -2360,4 +2360,4 @@ const unsigned char bitrevTab[17 + 129] =
0x4d, 0x59, 0x4f, 0x79, 0x53, 0x65, 0x57, 0x75, 0x5b, 0x6d, 0x5f, 0x7d, 0x67, 0x73, 0x6f, 0x7b, 0x4d, 0x59, 0x4f, 0x79, 0x53, 0x65, 0x57, 0x75, 0x5b, 0x6d, 0x5f, 0x7d, 0x67, 0x73, 0x6f, 0x7b,
0x00, 0x08, 0x14, 0x1c, 0x22, 0x2a, 0x36, 0x3e, 0x41, 0x49, 0x55, 0x5d, 0x63, 0x6b, 0x77, 0x7f, 0x00, 0x08, 0x14, 0x1c, 0x22, 0x2a, 0x36, 0x3e, 0x41, 0x49, 0x55, 0x5d, 0x63, 0x6b, 0x77, 0x7f,
0x00, 0x00,
}; };

2
media/libstagefright/codecs/aacenc/src/aacenc.c
View File

@@ -492,4 +492,4 @@ VO_S32 VO_API voGetAACEncAPI(VO_AUDIO_CODECAPI * pDecHandle)
pDecHandle->Uninit = voAACEncUninit; pDecHandle->Uninit = voAACEncUninit;
return VO_ERR_NONE; return VO_ERR_NONE;
} }

2
media/libstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
View File

@@ -128,4 +128,4 @@ PostMDCT_LOOP:
PostMDCT_END: PostMDCT_END:
ldmia sp!, {r4 - r11, pc} ldmia sp!, {r4 - r11, pc}
@ENDP @ |PostMDCT| @ENDP @ |PostMDCT|
.end .end

2
media/libstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
View File

@@ -249,4 +249,4 @@ DATATab:
.word 0x5a82799a .word 0x5a82799a
@ENDP @ |Radix8First| @ENDP @ |Radix8First|
.end .end

2
media/libstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
View File

@@ -166,4 +166,4 @@ Radix4FFT_END:
ldmia sp!, {r4 - r11, pc} ldmia sp!, {r4 - r11, pc}
@ENDP @ |Radix4FFT| @ENDP @ |Radix4FFT|
.end .end

2
media/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
View File

@@ -132,4 +132,4 @@ PostMDCT_END:
ldmia sp!, {r4 - r11, pc} ldmia sp!, {r4 - r11, pc}
@ENDP @ |PostMDCT| @ENDP @ |PostMDCT|
.end .end

2
media/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
View File

@@ -143,4 +143,4 @@ Radix4First_END:
ldmia sp!, {r4 - r11, pc} ldmia sp!, {r4 - r11, pc}
@ENDP @ |Radix4First| @ENDP @ |Radix4First|
.end .end

2
media/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
View File

@@ -140,4 +140,4 @@ Radix4FFT_END:
ldmia sp!, {r4 - r11, pc} ldmia sp!, {r4 - r11, pc}
@ENDP @ |Radix4FFT| @ENDP @ |Radix4FFT|
.end .end

2
media/libstagefright/codecs/aacenc/src/band_nrg.c
View File

@@ -99,4 +99,4 @@ void CalcBandEnergyMS(const Word32 *mdctSpectrumLeft,
*bandEnergySideSum = accuSideSum; *bandEnergySideSum = accuSideSum;
} }
#endif #endif