fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'aosp/master'

This commit is contained in:
Martin Storsjo 2016-10-28 10:26:20 +03:00
parent 2b1e8db04d ed91226cec
commit 5fd7e6537d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libFDK/src/dct.cpp
View File

@ -324,12 +324,12 @@ void dct_IV(FIXP_DBL *pDat,
{ {
FIXP_DBL *RESTRICT pDat_0 = &pDat[0]; FIXP_DBL *RESTRICT pDat_0 = &pDat[0];
FIXP_DBL *RESTRICT pDat_1 = &pDat[L - 2]; FIXP_DBL *RESTRICT pDat_1 = &pDat[L - 2];
register int i; int i;
/* 29 cycles on ARM926 */ /* 29 cycles on ARM926 */
for (i = 0; i < M-1; i+=2,pDat_0+=2,pDat_1-=2) for (i = 0; i < M-1; i+=2,pDat_0+=2,pDat_1-=2)
{ {
register FIXP_DBL accu1,accu2,accu3,accu4; FIXP_DBL accu1,accu2,accu3,accu4;
accu1 = pDat_1[1]; accu2 = pDat_0[0]; accu1 = pDat_1[1]; accu2 = pDat_0[0];
accu3 = pDat_0[1]; accu4 = pDat_1[0]; accu3 = pDat_0[1]; accu4 = pDat_1[0];
@ -342,7 +342,7 @@ void dct_IV(FIXP_DBL *pDat,
} }
if (M&1) if (M&1)
{ {
register FIXP_DBL accu1,accu2; FIXP_DBL accu1,accu2;
accu1 = pDat_1[1]; accu2 = pDat_0[0]; accu1 = pDat_1[1]; accu2 = pDat_0[0];
@ -363,7 +363,7 @@ void dct_IV(FIXP_DBL *pDat,
{ {
FIXP_DBL *RESTRICT pDat_0 = &pDat[0]; FIXP_DBL *RESTRICT pDat_0 = &pDat[0];
FIXP_DBL *RESTRICT pDat_1 = &pDat[L - 2]; FIXP_DBL *RESTRICT pDat_1 = &pDat[L - 2];
register FIXP_DBL accu1,accu2,accu3,accu4; FIXP_DBL accu1,accu2,accu3,accu4;
int idx, i; int idx, i;
/* Sin and Cos values are 0.0f and 1.0f */ /* Sin and Cos values are 0.0f and 1.0f */
@ -450,12 +450,12 @@ void dst_IV(FIXP_DBL *pDat,
FIXP_DBL *RESTRICT pDat_0 = &pDat[0]; FIXP_DBL *RESTRICT pDat_0 = &pDat[0];
FIXP_DBL *RESTRICT pDat_1 = &pDat[L - 2]; FIXP_DBL *RESTRICT pDat_1 = &pDat[L - 2];
register int i; int i;
/* 34 cycles on ARM926 */ /* 34 cycles on ARM926 */
for (i = 0; i < M-1; i+=2,pDat_0+=2,pDat_1-=2) for (i = 0; i < M-1; i+=2,pDat_0+=2,pDat_1-=2)
{ {
register FIXP_DBL accu1,accu2,accu3,accu4; FIXP_DBL accu1,accu2,accu3,accu4;
accu1 = pDat_1[1]; accu2 = -pDat_0[0]; accu1 = pDat_1[1]; accu2 = -pDat_0[0];
accu3 = pDat_0[1]; accu4 = -pDat_1[0]; accu3 = pDat_0[1]; accu4 = -pDat_1[0];
@ -468,7 +468,7 @@ void dst_IV(FIXP_DBL *pDat,
} }
if (M&1) if (M&1)
{ {
register FIXP_DBL accu1,accu2; FIXP_DBL accu1,accu2;
accu1 = pDat_1[1]; accu2 = -pDat_0[0]; accu1 = pDat_1[1]; accu2 = -pDat_0[0];
@ -488,7 +488,7 @@ void dst_IV(FIXP_DBL *pDat,
{ {
FIXP_DBL *RESTRICT pDat_0; FIXP_DBL *RESTRICT pDat_0;
FIXP_DBL *RESTRICT pDat_1; FIXP_DBL *RESTRICT pDat_1;
register FIXP_DBL accu1,accu2,accu3,accu4; FIXP_DBL accu1,accu2,accu3,accu4;
int idx, i; int idx, i;
pDat_0 = &pDat[0]; pDat_0 = &pDat[0];

2
libSBRdec/src/env_calc.cpp
View File

@ -2031,7 +2031,7 @@ static void adjustTimeSlotHQ(
FIXP_SGL direct_ratio = /*FL2FXCONST_SGL(1.0f) */ (FIXP_SGL)MAXVAL_SGL - smooth_ratio; FIXP_SGL direct_ratio = /*FL2FXCONST_SGL(1.0f) */ (FIXP_SGL)MAXVAL_SGL - smooth_ratio;
int index = *ptrPhaseIndex; int index = *ptrPhaseIndex;
UCHAR harmIndex = *ptrHarmIndex; UCHAR harmIndex = *ptrHarmIndex;
register int freqInvFlag = (lowSubband & 1); int freqInvFlag = (lowSubband & 1);
FIXP_DBL sineLevel; FIXP_DBL sineLevel;
int shift; int shift;