aboutsummaryrefslogtreecommitdiffstats
path: root/libSACdec
diff options
context:
space:
mode:
Diffstat (limited to 'libSACdec')
-rw-r--r--libSACdec/src/sac_reshapeBBEnv.cpp174
-rw-r--r--libSACdec/src/sac_stp.cpp41
-rw-r--r--libSACdec/src/sac_tsd.cpp28
3 files changed, 95 insertions, 148 deletions
diff --git a/libSACdec/src/sac_reshapeBBEnv.cpp b/libSACdec/src/sac_reshapeBBEnv.cpp
index 87c0ac6..588c866 100644
--- a/libSACdec/src/sac_reshapeBBEnv.cpp
+++ b/libSACdec/src/sac_reshapeBBEnv.cpp
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten
+© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved.
1. INTRODUCTION
@@ -162,75 +162,59 @@ static inline void getSlotNrgHQ(FIXP_DBL *RESTRICT pReal,
FIXP_DBL nrg;
/* qs = 12, 13, 14 */
- slotNrg[0] = ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
- slotNrg[1] = ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
- slotNrg[2] = ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
+ slotNrg[0] = ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
+ slotNrg[1] = ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
+ slotNrg[2] = ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
/* qs = 15 */
- slotNrg[3] = ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
+ slotNrg[3] = ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
/* qs = 16, 17 */
- nrg = ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
- slotNrg[4] = nrg + ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
+ nrg = ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
+ slotNrg[4] =
+ nrg + ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
/* qs = 18, 19, 20 */
- nrg = ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
- nrg += ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
- slotNrg[5] = nrg + ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
+ nrg = ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
+ nrg += ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
+ slotNrg[5] =
+ nrg + ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
/* qs = 21, 22 */
- nrg = ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
- slotNrg[6] = nrg + ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
+ nrg = ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
+ slotNrg[6] =
+ nrg + ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
/* qs = 23, 24 */
if (hybBands > 23) {
- slotNrg[6] += ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
- slotNrg[6] += ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
+ slotNrg[6] += ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
+ slotNrg[6] += ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
/* qs = 25, 26, 29, 28, 29 */
- nrg = ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
- nrg += ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
- nrg += ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
- nrg += ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
- slotNrg[7] = nrg + ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
+ nrg = ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
+ nrg += ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
+ nrg += ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
+ nrg += ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
+ slotNrg[7] =
+ nrg + ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
/* qs = 30 ... min(41,hybBands-1) */
- nrg = ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
+ nrg = ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
for (qs = 31; qs < hybBands; qs++) {
- nrg += ((fPow2Div2((*pReal++) << maxValSF) +
- fPow2Div2((*pImag++) << maxValSF)) >>
- (SF_FACTOR_SLOT - 1));
+ nrg += ((fPow2Div2((*pReal++) << maxValSF) >> (SF_FACTOR_SLOT - 1)) +
+ (fPow2Div2((*pImag++) << maxValSF) >> (SF_FACTOR_SLOT - 1)));
}
slotNrg[8] = nrg;
} else {
@@ -239,49 +223,22 @@ static inline void getSlotNrgHQ(FIXP_DBL *RESTRICT pReal,
}
}
-static inline INT getMaxValDmx(FIXP_DBL *RESTRICT pReal,
- FIXP_DBL *RESTRICT pImag, INT cplxBands,
- INT hybBands) {
- INT qs, clz;
- FIXP_DBL maxVal = FL2FXCONST_DBL(0.0f);
-
- for (qs = 12; qs < cplxBands; qs++) {
- maxVal |= fAbs(pReal[qs]);
- maxVal |= fAbs(pImag[qs]);
- }
- for (; qs < hybBands; qs++) {
- maxVal |= fAbs(pReal[qs]);
- }
-
- clz = fixMax(0, CntLeadingZeros(maxVal) - 1);
-
- return (clz);
-}
-
-static inline INT getMaxValDryWet(FIXP_DBL *RESTRICT pReal,
- FIXP_DBL *RESTRICT pImag,
- FIXP_DBL *RESTRICT pHybOutputRealDry,
- FIXP_DBL *RESTRICT pHybOutputImagDry,
- FIXP_DBL *RESTRICT pHybOutputRealWet,
- FIXP_DBL *RESTRICT pHybOutputImagWet,
- INT cplxBands, INT hybBands) {
- INT qs, clz;
- FIXP_DBL maxVal = FL2FXCONST_DBL(0.0f);
+static inline void combineDryWet(FIXP_DBL *RESTRICT pReal,
+ FIXP_DBL *RESTRICT pImag,
+ FIXP_DBL *RESTRICT pHybOutputRealDry,
+ FIXP_DBL *RESTRICT pHybOutputImagDry,
+ FIXP_DBL *RESTRICT pHybOutputRealWet,
+ FIXP_DBL *RESTRICT pHybOutputImagWet,
+ INT cplxBands, INT hybBands) {
+ INT qs;
for (qs = 12; qs < cplxBands; qs++) {
- pReal[qs] = pHybOutputRealDry[qs] + pHybOutputRealWet[qs];
- maxVal |= fAbs(pReal[qs]);
- pImag[qs] = pHybOutputImagDry[qs] + pHybOutputImagWet[qs];
- maxVal |= fAbs(pImag[qs]);
+ pReal[qs] = (pHybOutputRealDry[qs] >> 1) + (pHybOutputRealWet[qs] >> 1);
+ pImag[qs] = (pHybOutputImagDry[qs] >> 1) + (pHybOutputImagWet[qs] >> 1);
}
for (; qs < hybBands; qs++) {
- pReal[qs] = pHybOutputRealDry[qs] + pHybOutputRealWet[qs];
- maxVal |= fAbs(pReal[qs]);
+ pReal[qs] = (pHybOutputRealDry[qs] >> 1) + (pHybOutputRealWet[qs] >> 1);
}
-
- clz = fixMax(0, CntLeadingZeros(maxVal) - 1);
-
- return (clz);
}
static inline void slotAmp(FIXP_DBL *RESTRICT slotAmp_dry,
@@ -386,15 +343,18 @@ static void extractBBEnv(spatialDec *self, INT inp, INT start, INT channels,
prevChOffs = ch;
pReal = pScratchBuffer;
pImag = pScratchBuffer + 42;
- clz = getMaxValDryWet(
- pReal, pImag, self->hybOutputRealDry__FDK[ch],
- self->hybOutputImagDry__FDK[ch], self->hybOutputRealWet__FDK[ch],
- self->hybOutputImagWet__FDK[ch], cplxBands, hybBands);
+ combineDryWet(pReal, pImag, self->hybOutputRealDry__FDK[ch],
+ self->hybOutputImagDry__FDK[ch],
+ self->hybOutputRealWet__FDK[ch],
+ self->hybOutputImagWet__FDK[ch], cplxBands, hybBands);
+ clz = fMin(getScalefactor(&pReal[12], fMax(0, hybBands - 12)),
+ getScalefactor(&pImag[12], fMax(0, cplxBands - 12)));
} else {
prevChOffs = ch + self->numOutputChannels;
pReal = self->hybInputReal__FDK[ch];
pImag = self->hybInputImag__FDK[ch];
- clz = getMaxValDmx(pReal, pImag, cplxBands, hybBands);
+ clz = fMin(getScalefactor(&pReal[12], fMax(0, hybBands - 12)),
+ getScalefactor(&pImag[12], fMax(0, cplxBands - 12)));
}
partNrg = partNrgPrev = pBBEnvState->partNrgPrev__FDK[prevChOffs];
@@ -411,8 +371,10 @@ static void extractBBEnv(spatialDec *self, INT inp, INT start, INT channels,
SF_FACTOR_SLOT */
}
- slotNrgSF = 2 * (staticScale - clz) + SF_FACTOR_SLOT;
- frameNrgSF = 2 * (staticScale - clz) + SF_FACTOR_SLOT;
+ slotNrgSF = 2 * (staticScale - clz + ((inp == INP_DRY_WET) ? 1 : 0)) +
+ SF_FACTOR_SLOT;
+ frameNrgSF = 2 * (staticScale - clz + ((inp == INP_DRY_WET) ? 1 : 0)) +
+ SF_FACTOR_SLOT;
partNrgSF = fixMax(slotNrgSF - SF_ALPHA1 + 1,
pPartNrgPrevSF[0] - pPartNrgPrev2SF[0] + 1);
diff --git a/libSACdec/src/sac_stp.cpp b/libSACdec/src/sac_stp.cpp
index 6ac5a56..bb66277 100644
--- a/libSACdec/src/sac_stp.cpp
+++ b/libSACdec/src/sac_stp.cpp
@@ -206,29 +206,6 @@ struct STP_DEC {
int update_old_ener;
};
-inline void combineSignalReal(FIXP_DBL *hybOutputRealDry,
- FIXP_DBL *hybOutputRealWet, int bands) {
- int n;
-
- for (n = bands - 1; n >= 0; n--) {
- *hybOutputRealDry = *hybOutputRealDry + *hybOutputRealWet;
- hybOutputRealDry++, hybOutputRealWet++;
- }
-}
-
-inline void combineSignalRealScale1(FIXP_DBL *hybOutputRealDry,
- FIXP_DBL *hybOutputRealWet, FIXP_DBL scaleX,
- int bands) {
- int n;
-
- for (n = bands - 1; n >= 0; n--) {
- *hybOutputRealDry =
- *hybOutputRealDry +
- (fMultDiv2(*hybOutputRealWet, scaleX) << (SF_SCALE + 1));
- hybOutputRealDry++, hybOutputRealWet++;
- }
-}
-
inline void combineSignalCplx(FIXP_DBL *hybOutputRealDry,
FIXP_DBL *hybOutputImagDry,
FIXP_DBL *hybOutputRealWet,
@@ -236,8 +213,8 @@ inline void combineSignalCplx(FIXP_DBL *hybOutputRealDry,
int n;
for (n = bands - 1; n >= 0; n--) {
- *hybOutputRealDry = *hybOutputRealDry + *hybOutputRealWet;
- *hybOutputImagDry = *hybOutputImagDry + *hybOutputImagWet;
+ *hybOutputRealDry = fAddSaturate(*hybOutputRealDry, *hybOutputRealWet);
+ *hybOutputImagDry = fAddSaturate(*hybOutputImagDry, *hybOutputImagWet);
hybOutputRealDry++, hybOutputRealWet++;
hybOutputImagDry++, hybOutputImagWet++;
}
@@ -253,12 +230,14 @@ inline void combineSignalCplxScale1(FIXP_DBL *hybOutputRealDry,
FIXP_DBL scaleY;
for (n = bands - 1; n >= 0; n--) {
scaleY = fMultDiv2(scaleX, *pBP);
- *hybOutputRealDry =
- *hybOutputRealDry +
- (fMultDiv2(*hybOutputRealWet, scaleY) << (SF_SCALE + 2));
- *hybOutputImagDry =
- *hybOutputImagDry +
- (fMultDiv2(*hybOutputImagWet, scaleY) << (SF_SCALE + 2));
+ *hybOutputRealDry = SATURATE_LEFT_SHIFT(
+ (*hybOutputRealDry >> 1) +
+ (fMultDiv2(*hybOutputRealWet, scaleY) << (SF_SCALE + 1)),
+ 1, DFRACT_BITS);
+ *hybOutputImagDry = SATURATE_LEFT_SHIFT(
+ (*hybOutputImagDry >> 1) +
+ (fMultDiv2(*hybOutputImagWet, scaleY) << (SF_SCALE + 1)),
+ 1, DFRACT_BITS);
hybOutputRealDry++, hybOutputRealWet++;
hybOutputImagDry++, hybOutputImagWet++;
pBP++;
diff --git a/libSACdec/src/sac_tsd.cpp b/libSACdec/src/sac_tsd.cpp
index 30acca8..a07447b 100644
--- a/libSACdec/src/sac_tsd.cpp
+++ b/libSACdec/src/sac_tsd.cpp
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten
+© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved.
1. INTRODUCTION
@@ -123,12 +123,15 @@ static const UCHAR nBitsTsdCW_64slots[64] = {
RAM_ALIGN
LNK_SECTION_CONSTDATA
-static const FIXP_STP phiTsd[8] = {
- STCP(0x7fffffff, 0x00000000), STCP(0x5a82799a, 0x5a82799a),
- STCP(0x00000000, 0x7fffffff), STCP(0xa57d8666, 0x5a82799a),
- STCP(0x80000000, 0x00000000), STCP(0xa57d8666, 0xa57d8666),
- STCP(0x00000000, 0x80000000), STCP(0x5a82799a, 0xa57d8666),
-};
+static const FIXP_DPK phiTsd[8] = {
+ {{(FIXP_DBL)0x7fffffff, (FIXP_DBL)0x00000000}},
+ {{(FIXP_DBL)0x5a82799a, (FIXP_DBL)0x5a82799a}},
+ {{(FIXP_DBL)0x00000000, (FIXP_DBL)0x7fffffff}},
+ {{(FIXP_DBL)0xa57d8666, (FIXP_DBL)0x5a82799a}},
+ {{(FIXP_DBL)0x80000000, (FIXP_DBL)0x00000000}},
+ {{(FIXP_DBL)0xa57d8666, (FIXP_DBL)0xa57d8666}},
+ {{(FIXP_DBL)0x00000000, (FIXP_DBL)0x80000000}},
+ {{(FIXP_DBL)0x5a82799a, (FIXP_DBL)0xa57d8666}}};
/*** Static Functions ***/
static void longmult1(USHORT a[], USHORT b, USHORT d[], int len) {
@@ -333,16 +336,19 @@ void TsdApply(const int numHybridBands, const TSD_DATA *pTsdData, int *pTsdTs,
if (isTrSlot(pTsdData, ts)) {
int k;
- const FIXP_STP *phi = &phiTsd[pTsdData->bsTsdTrPhaseData[ts]];
+ const FIXP_DPK *phi = &phiTsd[pTsdData->bsTsdTrPhaseData[ts]];
FDK_ASSERT((pTsdData->bsTsdTrPhaseData[ts] >= 0) &&
(pTsdData->bsTsdTrPhaseData[ts] < 8));
/* d = d_nonTr + v_direct * exp(j * bsTsdTrPhaseData[ts]/4 * pi ) */
for (k = TSD_START_BAND; k < numHybridBands; k++) {
FIXP_DBL tempReal, tempImag;
- cplxMult(&tempReal, &tempImag, pVdirectReal[k], pVdirectImag[k], *phi);
- pDnonTrReal[k] += tempReal;
- pDnonTrImag[k] += tempImag;
+ cplxMultDiv2(&tempReal, &tempImag, pVdirectReal[k], pVdirectImag[k],
+ *phi);
+ pDnonTrReal[k] = SATURATE_LEFT_SHIFT(
+ (pDnonTrReal[k] >> 2) + (tempReal >> 1), 2, DFRACT_BITS);
+ pDnonTrImag[k] = SATURATE_LEFT_SHIFT(
+ (pDnonTrImag[k] >> 2) + (tempImag >> 1), 2, DFRACT_BITS);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 03:38:18 +0000