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

1 files changed, 33 insertions, 21 deletions

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;