summaryrefslogtreecommitdiffstats
path: root/libAACenc/src
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2012-09-09 11:48:51 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2012-09-09 11:52:09 -0700
commit381d69840ad3af2259f0b7ef49236f9ee9c76b76 (patch)
tree059754bb7c5ff151506ac52a2962d532a180b5bc /libAACenc/src
parentfef220869b4e5bf9241369d3379b389136c2f174 (diff)
downloadODR-AudioEnc-381d69840ad3af2259f0b7ef49236f9ee9c76b76.tar.gz
ODR-AudioEnc-381d69840ad3af2259f0b7ef49236f9ee9c76b76.tar.bz2
ODR-AudioEnc-381d69840ad3af2259f0b7ef49236f9ee9c76b76.zip
Bug fixes in AAC decoder, AAC encoder, FDK library
Latest code drop from Fraunhofer: * AAC-Decoder - Expanded AAC-LD/ELD decoder TNS max band tables to avoid wrong data access for sampling rates <22kHz and >48kHz. Modified file(s): libAACdec\src\aacdec_tns.cpp libAACdec\src\aac_rom.h libAACdec\src\aac_rom.cpp - Fixed ELD synthesis QMF filterbank scaling for downsampled SBR. Modified file(s): libFDK\src\qmf.cpp * AAC-Encoder - Fixed bit rate limiting for lower limit as introduced in the Delivery 2012-05-11. Modified file(s): libAACenc\include\aacenc_lib.h libAACenc\src\aacenc.h libAACenc\src\aacenc.cpp libSBRenc\src\sbr_rom.h libSBRenc\src\sbr_rom.cpp - Allow negative prediction gain as meaning that there is no coding gain. Make use of scaleValueSaturate in gauss window calculation. Modified file(s): libAACenc\src\aacenc_tns.cpp - Added energy saturation to prevent overflow in short blocks. Modified file(s): libAACenc\src\grp_data.cpp - Perform scalefactor adaption in case quantized lines are out of valid range. Modified file(s): libAACenc\src\quantize.cpp - Interrupt quantization loop when no spectral data is available. Adjustments in bitreservoir adaption. Modified file(s): libAACenc\src\qc_main.cpp - Indroduced dynamic scaling in none missing harmonic energy lowering compensation. Modified file(s): libSBRenc\src\env_est.cpp * FDK-Library - Fixed saturation for negative values in scaleValueSaturate. Modified file(s): libFDK\include\scale.h Change-Id: If830ea65caef6b5554281e4b7a77a8b2e08825ce
Diffstat (limited to 'libAACenc/src')
-rw-r--r--libAACenc/src/aacenc.cpp11
-rw-r--r--libAACenc/src/aacenc.h1
-rw-r--r--libAACenc/src/aacenc_lib.cpp2
-rw-r--r--libAACenc/src/aacenc_tns.cpp23
-rw-r--r--libAACenc/src/grp_data.cpp12
-rw-r--r--libAACenc/src/qc_main.cpp54
-rw-r--r--libAACenc/src/quantize.cpp32
7 files changed, 77 insertions, 58 deletions
diff --git a/libAACenc/src/aacenc.cpp b/libAACenc/src/aacenc.cpp
index 85083cd..d3f36aa 100644
--- a/libAACenc/src/aacenc.cpp
+++ b/libAACenc/src/aacenc.cpp
@@ -149,7 +149,7 @@ INT FDKaacEnc_LimitBitrate(
transportBits = 208;
}
- bitRate = FDKmax(bitRate, ((((40 * nChannels) + transportBits + frameLength) * (coreSamplingRate)) / frameLength) );
+ bitRate = FDKmax(bitRate, ((((40 * nChannels) + transportBits) * (coreSamplingRate)) / frameLength) );
FDK_ASSERT(bitRate >= 0);
bitRate = FDKmin(bitRate, ((nChannelsEff * MIN_BUFSIZE_PER_EFF_CHAN)*(coreSamplingRate>>shift)) / (frameLength>>shift)) ;
@@ -280,7 +280,7 @@ void FDKaacEnc_AacInitDefaultConfig(AACENC_CONFIG *config)
config->useTns = TNS_ENABLE_MASK; /* tns enabled completly */
config->usePns = 1; /* depending on channelBitrate this might be set to 0 later */
config->useIS = 1; /* Intensity Stereo Configuration */
- config->framelength = DEFAULT_FRAMELENGTH; /* used frame size */
+ config->framelength = -1; /* Framesize not configured */
config->syntaxFlags = 0; /* default syntax with no specialities */
config->epConfig = -1; /* no ER syntax -> no additional error protection */
config->nSubFrames = 1; /* default, no sub frames */
@@ -451,11 +451,8 @@ AAC_ENCODER_ERROR FDKaacEnc_Initialize(HANDLE_AAC_ENC hAacEnc,
switch (config->framelength)
{
case 1024:
- if ( config->audioObjectType != AOT_AAC_LC
- && config->audioObjectType != AOT_SBR
- && config->audioObjectType != AOT_PS
- && config->audioObjectType != AOT_ER_AAC_LC
- && config->audioObjectType != AOT_AAC_SCAL )
+ if ( config->audioObjectType == AOT_ER_AAC_LD
+ || config->audioObjectType == AOT_ER_AAC_ELD )
{
return AAC_ENC_INVALID_FRAME_LENGTH;
}
diff --git a/libAACenc/src/aacenc.h b/libAACenc/src/aacenc.h
index 8242248..942f686 100644
--- a/libAACenc/src/aacenc.h
+++ b/libAACenc/src/aacenc.h
@@ -153,7 +153,6 @@ typedef enum {
/*-------------------------- defines --------------------------------------*/
#define ANC_DATA_BUFFERSIZE 1024 /* ancBuffer size */
-#define DEFAULT_FRAMELENGTH 1024 /* size of AAC core frame in (new) PCM samples */
#define MAX_TOTAL_EXT_PAYLOADS (((6) * (1)) + (2+2))
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp
index cbb0e2a..a245358 100644
--- a/libAACenc/src/aacenc_lib.cpp
+++ b/libAACenc/src/aacenc_lib.cpp
@@ -98,7 +98,7 @@ amm-info@iis.fraunhofer.de
/* Encoder library info */
#define AACENCODER_LIB_VL0 3
#define AACENCODER_LIB_VL1 3
-#define AACENCODER_LIB_VL2 1
+#define AACENCODER_LIB_VL2 2
#define AACENCODER_LIB_TITLE "AAC Encoder"
#define AACENCODER_LIB_BUILD_DATE __DATE__
#define AACENCODER_LIB_BUILD_TIME __TIME__
diff --git a/libAACenc/src/aacenc_tns.cpp b/libAACenc/src/aacenc_tns.cpp
index 933e4e7..00b2bca 100644
--- a/libAACenc/src/aacenc_tns.cpp
+++ b/libAACenc/src/aacenc_tns.cpp
@@ -1067,11 +1067,11 @@ static void FDKaacEnc_CalcGaussWindow(
const INT timeResolution_e
)
{
- #define PI_SCALE (2)
- #define PI_FIX FL2FXCONST_DBL(3.1416f/(float)(1<<PI_SCALE))
+ #define PI_E (2)
+ #define PI_M FL2FXCONST_DBL(3.1416f/(float)(1<<PI_E))
- #define EULER_SCALE (2)
- #define EULER_FIX FL2FXCONST_DBL(2.7183/(float)(1<<EULER_SCALE))
+ #define EULER_E (2)
+ #define EULER_M FL2FXCONST_DBL(2.7183/(float)(1<<EULER_E))
#define COEFF_LOOP_SCALE (4)
@@ -1083,9 +1083,9 @@ static void FDKaacEnc_CalcGaussWindow(
* gaussExp = PI * samplingRate * 0.001f * timeResolution / transformResolution;
* gaussExp = -0.5f * gaussExp * gaussExp;
*/
- gaussExp_m = fMultNorm(timeResolution, fMult(PI_FIX, fDivNorm( (FIXP_DBL)(samplingRate), (FIXP_DBL)(LONG)(transformResolution*1000.f), &e1)), &e2);
+ gaussExp_m = fMultNorm(timeResolution, fMult(PI_M, fDivNorm( (FIXP_DBL)(samplingRate), (FIXP_DBL)(LONG)(transformResolution*1000.f), &e1)), &e2);
gaussExp_m = -fPow2Div2(gaussExp_m);
- gaussExp_e = 2*(e1+e2+timeResolution_e+PI_SCALE);
+ gaussExp_e = 2*(e1+e2+timeResolution_e+PI_E);
FDK_ASSERT( winSize < (1<<COEFF_LOOP_SCALE) );
@@ -1095,13 +1095,13 @@ static void FDKaacEnc_CalcGaussWindow(
for( i=0; i<winSize; i++) {
win[i] = fPow(
- EULER_FIX,
- EULER_SCALE,
+ EULER_M,
+ EULER_E,
fMult(gaussExp_m, fPow2((i*FL2FXCONST_DBL(1.f/(float)(1<<COEFF_LOOP_SCALE)) + FL2FXCONST_DBL(.5f/(float)(1<<COEFF_LOOP_SCALE))))),
gaussExp_e + 2*COEFF_LOOP_SCALE,
&e1);
- win[i] = scaleValue(win[i], e1);
+ win[i] = scaleValueSaturate(win[i], e1);
}
}
@@ -1157,7 +1157,10 @@ static INT FDKaacEnc_AutoToParcor(
workBuffer++;
}
- tmp = fMult((FIXP_DBL)((LONG)TNS_PREDGAIN_SCALE<<21), fDivNorm(autoCorr_0, input[0], &scale));
+ tmp = fMult((FIXP_DBL)((LONG)TNS_PREDGAIN_SCALE<<21), fDivNorm(fAbs(autoCorr_0), fAbs(input[0]), &scale));
+ if ( fMultDiv2(autoCorr_0, input[0])<FL2FXCONST_DBL(0.0f) ) {
+ tmp = -tmp;
+ }
predictionGain = (LONG)scaleValue(tmp,scale-21);
return (predictionGain);
diff --git a/libAACenc/src/grp_data.cpp b/libAACenc/src/grp_data.cpp
index 03d4976..4355295 100644
--- a/libAACenc/src/grp_data.cpp
+++ b/libAACenc/src/grp_data.cpp
@@ -94,6 +94,10 @@ amm-info@iis.fraunhofer.de
* this routine does not work in-place
*/
+static inline FIXP_DBL nrgAddSaturate(const FIXP_DBL a, const FIXP_DBL b) {
+ return ( (a>=(FIXP_DBL)MAXVAL_DBL-b) ? (FIXP_DBL)MAXVAL_DBL : (a + b) );
+}
+
void
FDKaacEnc_groupShortData(FIXP_DBL *mdctSpectrum, /* in-out */
SFB_THRESHOLD *sfbThreshold, /* in-out */
@@ -177,7 +181,7 @@ FDKaacEnc_groupShortData(FIXP_DBL *mdctSpectrum, /* in-out
FIXP_DBL thresh = sfbThreshold->Short[wnd][sfb];
for (j=1; j<groupLen[grp]; j++)
{
- thresh += sfbThreshold->Short[wnd+j][sfb];
+ thresh = nrgAddSaturate(thresh, sfbThreshold->Short[wnd+j][sfb]);
}
sfbThreshold->Long[i++] = thresh;
}
@@ -195,7 +199,7 @@ FDKaacEnc_groupShortData(FIXP_DBL *mdctSpectrum, /* in-out
FIXP_DBL energy = sfbEnergy->Short[wnd][sfb];
for (j=1; j<groupLen[grp]; j++)
{
- energy += sfbEnergy->Short[wnd+j][sfb];
+ energy = nrgAddSaturate(energy, sfbEnergy->Short[wnd+j][sfb]);
}
sfbEnergy->Long[i++] = energy;
}
@@ -213,7 +217,7 @@ FDKaacEnc_groupShortData(FIXP_DBL *mdctSpectrum, /* in-out
FIXP_DBL energy = sfbEnergyMS->Short[wnd][sfb];
for (j=1; j<groupLen[grp]; j++)
{
- energy += sfbEnergyMS->Short[wnd+j][sfb];
+ energy = nrgAddSaturate(energy, sfbEnergyMS->Short[wnd+j][sfb]);
}
sfbEnergyMS->Long[i++] = energy;
}
@@ -231,7 +235,7 @@ FDKaacEnc_groupShortData(FIXP_DBL *mdctSpectrum, /* in-out
FIXP_DBL energy = sfbSpreadEnergy->Short[wnd][sfb];
for (j=1; j<groupLen[grp]; j++)
{
- energy += sfbSpreadEnergy->Short[wnd+j][sfb];
+ energy = nrgAddSaturate(energy, sfbSpreadEnergy->Short[wnd+j][sfb]);
}
sfbSpreadEnergy->Long[i++] = energy;
}
diff --git a/libAACenc/src/qc_main.cpp b/libAACenc/src/qc_main.cpp
index 749398a..d7e76c7 100644
--- a/libAACenc/src/qc_main.cpp
+++ b/libAACenc/src/qc_main.cpp
@@ -797,7 +797,7 @@ AAC_ENCODER_ERROR FDKaacEnc_QCMain(QC_STATE* RESTRICT hQC,
{
int i, c;
AAC_ENCODER_ERROR ErrorStatus = AAC_ENC_OK;
- INT avgTotalDynBits = 0; /* maximal allowd dynamic bits for all frames */
+ INT avgTotalDynBits = 0; /* maximal allowed dynamic bits for all frames */
INT totalAvailableBits = 0;
INT nSubFrames = 1;
@@ -1092,7 +1092,7 @@ AAC_ENCODER_ERROR FDKaacEnc_QCMain(QC_STATE* RESTRICT hQC,
int sumBitsConsumedTotal = FDKaacEnc_getTotalConsumedBits(qcOut, qcElement, cm, hQC->globHdrBits, nSubFrames);
/* in all frames are valid dynamic bits */
- if (sumBitsConsumedTotal < totalAvailableBits && (decreaseBitConsumption==1) && checkMinFrameBitsDemand(qcOut,hQC->minBitsPerFrame,nSubFrames)
+ if ( ((sumBitsConsumedTotal < totalAvailableBits) || qcOut[c]->usedDynBits==0) && (decreaseBitConsumption==1) && checkMinFrameBitsDemand(qcOut,hQC->minBitsPerFrame,nSubFrames)
/*()*/ )
{
quantizationDone = 1; /* exit bit adjustment */
@@ -1365,42 +1365,54 @@ AAC_ENCODER_ERROR FDKaacEnc_FinalizeBitConsumption(CHANNEL_MAPPING *cm,
QC_OUT_EXTENSION fillExtPayload;
INT totFillBits, alignBits;
- {
- int exactTpBits;
- int max_iter = 3;
+ /* Get total consumed bits in AU */
+ qcOut->totalBits = qcOut->staticBits + qcOut->usedDynBits + qcOut->totFillBits +
+ qcOut->elementExtBits + qcOut->globalExtBits;
- /* Get total consumed bits in AU */
- qcOut->totalBits = qcOut->staticBits + qcOut->usedDynBits + qcOut->totFillBits +
- qcOut->elementExtBits + qcOut->globalExtBits;
+ if (qcKernel->bitrateMode==QCDATA_BR_MODE_CBR) {
/* Now we can get the exact transport bit amount, and hopefully it is equal to the estimated value */
- exactTpBits = transportEnc_GetStaticBits(hTpEnc, qcOut->totalBits);
+ INT exactTpBits = transportEnc_GetStaticBits(hTpEnc, qcOut->totalBits);
if (exactTpBits != qcKernel->globHdrBits) {
INT diffFillBits = 0;
+ /* How many bits can be taken by bitreservoir */
+ const INT bitresSpace = qcKernel->bitResTotMax - (qcKernel->bitResTot + (qcOut->grantedDynBits - (qcOut->usedDynBits + qcOut->totFillBits) ) );
+
/* Number of bits which can be moved to bitreservoir. */
- INT bitsToBitres = qcKernel->globHdrBits - exactTpBits;
+ const INT bitsToBitres = qcKernel->globHdrBits - exactTpBits;
+ FDK_ASSERT(bitsToBitres>=0); /* is always positive */
- if (bitsToBitres>0) {
- /* if bitreservoir can not take all bits, move ramaining bits to fillbits */
- diffFillBits = FDKmax(0, bitsToBitres - (qcKernel->bitResTotMax-qcKernel->bitResTot));
- }
- else if (bitsToBitres<0) {
- /* if bits mus be taken from bitreservoir, reduce fillbits first. */
- diffFillBits = (FDKmax(FDKmax(bitsToBitres, -qcKernel->bitResTot), -qcOut->totFillBits));
- }
+ /* If bitreservoir can not take all bits, move ramaining bits to fillbits */
+ diffFillBits = FDKmax(0, bitsToBitres - bitresSpace);
+
+ /* Assure previous alignment */
+ diffFillBits = (diffFillBits+7)&~7;
- diffFillBits = (diffFillBits+7)&~7; /* assure previous alignment */
+ /* Move as many bits as possible to bitreservoir */
+ qcKernel->bitResTot += (bitsToBitres-diffFillBits);
+ /* Write remaing bits as fill bits */
qcOut->totFillBits += diffFillBits;
qcOut->totalBits += diffFillBits;
qcOut->grantedDynBits += diffFillBits;
- /* new header bits */
+ /* Get new header bits */
qcKernel->globHdrBits = transportEnc_GetStaticBits(hTpEnc, qcOut->totalBits);
+
+ if (qcKernel->globHdrBits != exactTpBits) {
+ /* In previous step, fill bits and corresponding total bits were changed when bitreservoir was completely filled.
+ Now we can take the too much taken bits caused by header overhead from bitreservoir.
+ */
+ qcKernel->bitResTot -= (qcKernel->globHdrBits - exactTpBits);
+ }
}
- }
+
+ } /* MODE_CBR */
+
+ /* Update exact number of consumed header bits. */
+ qcKernel->globHdrBits = transportEnc_GetStaticBits(hTpEnc, qcOut->totalBits);
/* Save total fill bits and distribut to alignment and fill bits */
totFillBits = qcOut->totFillBits;
diff --git a/libAACenc/src/quantize.cpp b/libAACenc/src/quantize.cpp
index dc85a6d..a1698a8 100644
--- a/libAACenc/src/quantize.cpp
+++ b/libAACenc/src/quantize.cpp
@@ -127,10 +127,7 @@ static void FDKaacEnc_quantizeLines(INT gain,
accu = fMultDiv2(FDKaacEnc_mTab_3_4[tabIndex],FDKaacEnc_quantTableE[totalShift&3]);
totalShift = (16-4)-(3*(totalShift>>2));
FDK_ASSERT(totalShift >=0); /* MAX_QUANT_VIOLATION */
- if (totalShift < 32)
- accu>>=totalShift;
- else
- accu = 0;
+ accu>>=totalShift;
quaSpectrum[line] = (SHORT)(-((LONG)(k + accu) >> (DFRACT_BITS-1-16)));
}
else if(accu > FL2FXCONST_DBL(0.0f))
@@ -143,10 +140,7 @@ static void FDKaacEnc_quantizeLines(INT gain,
accu = fMultDiv2(FDKaacEnc_mTab_3_4[tabIndex],FDKaacEnc_quantTableE[totalShift&3]);
totalShift = (16-4)-(3*(totalShift>>2));
FDK_ASSERT(totalShift >=0); /* MAX_QUANT_VIOLATION */
- if (totalShift < 32)
- accu>>=totalShift;
- else
- accu = 0;
+ accu>>=totalShift;
quaSpectrum[line] = (SHORT)((LONG)(k + accu) >> (DFRACT_BITS-1-16));
}
else
@@ -319,6 +313,9 @@ FIXP_DBL FDKaacEnc_calcSfbDist(FIXP_DBL *mdctSpectrum,
&mdctSpectrum[i],
&quantSpectrum[i]);
+ if (fAbs(quantSpectrum[i])>MAX_QUANT) {
+ return FL2FXCONST_DBL(0.0f);
+ }
/* inverse quantization */
FDKaacEnc_invQuantizeLines(gain,1,&quantSpectrum[i],&invQuantSpec);
@@ -361,15 +358,22 @@ void FDKaacEnc_calcSfbQuantEnergyAndDist(FIXP_DBL *mdctSpectrum,
FIXP_DBL invQuantSpec;
FIXP_DBL diff;
- *en = FL2FXCONST_DBL(0.0f);
- *dist = FL2FXCONST_DBL(0.0f);
+ FIXP_DBL energy = FL2FXCONST_DBL(0.0f);
+ FIXP_DBL distortion = FL2FXCONST_DBL(0.0f);
for (i=0; i<noOfLines; i++) {
+
+ if (fAbs(quantSpectrum[i])>MAX_QUANT) {
+ *en = FL2FXCONST_DBL(0.0f);
+ *dist = FL2FXCONST_DBL(0.0f);
+ return;
+ }
+
/* inverse quantization */
FDKaacEnc_invQuantizeLines(gain,1,&quantSpectrum[i],&invQuantSpec);
/* energy */
- *en += fPow2(invQuantSpec);
+ energy += fPow2(invQuantSpec);
/* dist */
diff = fixp_abs(fixp_abs(invQuantSpec) - fixp_abs(mdctSpectrum[i]>>1));
@@ -382,10 +386,10 @@ void FDKaacEnc_calcSfbQuantEnergyAndDist(FIXP_DBL *mdctSpectrum,
diff = scaleValue(diff, -scale);
- *dist += diff;
+ distortion += diff;
}
- *en = CalcLdData(*en)+FL2FXCONST_DBL(0.03125f);
- *dist = CalcLdData(*dist);
+ *en = CalcLdData(energy)+FL2FXCONST_DBL(0.03125f);
+ *dist = CalcLdData(distortion);
}