diff options
| author | Martin Storsjo <martin@martin.st> | 2016-10-28 10:26:20 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2016-10-28 10:26:20 +0300 |
| commit | 5fd7e6537d1f37fb1bec8c6aa2f8e22030ab10de (patch) | |
| tree | 266efb69dd81e746350e313543fad41c96c7e44c | |
| parent | 2b1e8db04d5e5cec26e69e489eee29ca162d6b5f (diff) | |
| parent | ed91226cec35c24f4e0cc13bb46ffff98fb37f52 (diff) | |
| download | fdk-aac-5fd7e6537d1f37fb1bec8c6aa2f8e22030ab10de.tar.gz fdk-aac-5fd7e6537d1f37fb1bec8c6aa2f8e22030ab10de.tar.bz2 fdk-aac-5fd7e6537d1f37fb1bec8c6aa2f8e22030ab10de.zip | |
Merge remote-tracking branch 'aosp/master'
| -rw-r--r-- | libFDK/src/dct.cpp | 16 | ||||
| -rw-r--r-- | libSBRdec/src/env_calc.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libFDK/src/dct.cpp b/libFDK/src/dct.cpp index 3c755bd..1e5b93e 100644 --- a/libFDK/src/dct.cpp +++ b/libFDK/src/dct.cpp @@ -324,12 +324,12 @@ void dct_IV(FIXP_DBL *pDat, { FIXP_DBL *RESTRICT pDat_0 = &pDat[0]; FIXP_DBL *RESTRICT pDat_1 = &pDat[L - 2]; - register int i; + int i; /* 29 cycles on ARM926 */ 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]; accu3 = pDat_0[1]; accu4 = pDat_1[0]; @@ -342,7 +342,7 @@ void dct_IV(FIXP_DBL *pDat, } if (M&1) { - register FIXP_DBL accu1,accu2; + FIXP_DBL accu1,accu2; 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_1 = &pDat[L - 2]; - register FIXP_DBL accu1,accu2,accu3,accu4; + FIXP_DBL accu1,accu2,accu3,accu4; int idx, i; /* 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_1 = &pDat[L - 2]; - register int i; + int i; /* 34 cycles on ARM926 */ 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]; accu3 = pDat_0[1]; accu4 = -pDat_1[0]; @@ -468,7 +468,7 @@ void dst_IV(FIXP_DBL *pDat, } if (M&1) { - register FIXP_DBL accu1,accu2; + FIXP_DBL accu1,accu2; 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_1; - register FIXP_DBL accu1,accu2,accu3,accu4; + FIXP_DBL accu1,accu2,accu3,accu4; int idx, i; pDat_0 = &pDat[0]; diff --git a/libSBRdec/src/env_calc.cpp b/libSBRdec/src/env_calc.cpp index fa5330a..73bd7ba 100644 --- a/libSBRdec/src/env_calc.cpp +++ b/libSBRdec/src/env_calc.cpp @@ -2031,7 +2031,7 @@ static void adjustTimeSlotHQ( FIXP_SGL direct_ratio = /*FL2FXCONST_SGL(1.0f) */ (FIXP_SGL)MAXVAL_SGL - smooth_ratio; int index = *ptrPhaseIndex; UCHAR harmIndex = *ptrHarmIndex; - register int freqInvFlag = (lowSubband & 1); + int freqInvFlag = (lowSubband & 1); FIXP_DBL sineLevel; int shift; |