iSAC: Move global trig tables into the codec instance

webrtc/modules/audio_coding/codecs/isac/main/source/isac.c

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 233 matching lines @@
     instISAC->initFlag = 0;
 
     /* Assign the address. */
     *ISAC_main_inst = (ISACStruct*)instISAC_Addr;
 
     /* Default is wideband. */
     instISAC->encoderSamplingRateKHz = kIsacWideband;
     instISAC->decoderSamplingRateKHz = kIsacWideband;
     instISAC->bandwidthKHz           = isac8kHz;
     instISAC->in_sample_rate_hz = 16000;
+
+    WebRtcIsac_InitTransform(&instISAC->transform_tables);
     return 0;
   } else {
     return -1;
   }
 }
 
 
 /****************************************************************************
  * WebRtcIsac_Create(...)
  *
@@ skipping 13 matching lines @@
     instISAC = (ISACMainStruct*)malloc(sizeof(ISACMainStruct));
     *ISAC_main_inst = (ISACStruct*)instISAC;
     if (*ISAC_main_inst != NULL) {
       instISAC->errorCode = 0;
       instISAC->initFlag = 0;
       /* Default is wideband. */
       instISAC->bandwidthKHz = isac8kHz;
       instISAC->encoderSamplingRateKHz = kIsacWideband;
       instISAC->decoderSamplingRateKHz = kIsacWideband;
       instISAC->in_sample_rate_hz = 16000;
+
+      WebRtcIsac_InitTransform(&instISAC->transform_tables);
       return 0;
     } else {
       return -1;
     }
   } else {
     return -1;
   }
 }
 
 
@@ skipping 275 matching lines @@
   inFrame[2] += (float)1.90854954e-3;
   inFrame[9] += (float)1.84854878e-3;
 
   /* This function will update the bottleneck if required. */
   UpdateBottleneck(instISAC);
 
   /* Get the bandwith information which has to be sent to the other side. */
   GetSendBandwidthInfo(instISAC, &bottleneckIdx, &jitterInfo);
 
   /* Encode lower-band. */
-  streamLenLB = WebRtcIsac_EncodeLb(inFrame, &instLB->ISACencLB_obj,
+  streamLenLB = WebRtcIsac_EncodeLb(&instISAC->transform_tables,
+                                    inFrame, &instLB->ISACencLB_obj,
                                     instISAC->codingMode, bottleneckIdx);
   if (streamLenLB < 0) {
     return -1;
   }
 
   if (instISAC->encoderSamplingRateKHz == kIsacSuperWideband) {
     instUB = &(instISAC->instUB);
 
     /* Convert to float. */
     for (k = 0; k < FRAMESAMPLES_10ms; k++) {
       inFrame[k] = (float) speechInUB[k];
     }
 
     /* Add some noise to avoid denormal numbers. */
     inFrame[0] += (float)1.23455334e-3;
     inFrame[1] -= (float)2.04324239e-3;
     inFrame[2] += (float)1.90854954e-3;
     inFrame[9] += (float)1.84854878e-3;
 
     /* Tell to upper-band the number of bytes used so far.
      * This is for payload limitation. */
     instUB->ISACencUB_obj.numBytesUsed =
         (int16_t)(streamLenLB + 1 + LEN_CHECK_SUM_WORD8);
     /* Encode upper-band. */
     switch (instISAC->bandwidthKHz) {
       case isac12kHz: {
-        streamLenUB = WebRtcIsac_EncodeUb12(inFrame, &instUB->ISACencUB_obj,
+        streamLenUB = WebRtcIsac_EncodeUb12(&instISAC->transform_tables,
+                                            inFrame, &instUB->ISACencUB_obj,
                                             jitterInfo);
         break;
       }
       case isac16kHz: {
-        streamLenUB = WebRtcIsac_EncodeUb16(inFrame, &instUB->ISACencUB_obj,
+        streamLenUB = WebRtcIsac_EncodeUb16(&instISAC->transform_tables,
+                                            inFrame, &instUB->ISACencUB_obj,
                                             jitterInfo);
         break;
       }
       case isac8kHz: {
         streamLenUB = 0;
         break;
       }
     }
 
     if ((streamLenUB < 0) && (streamLenUB != -ISAC_PAYLOAD_LARGER_THAN_LIMIT)) {
@@ skipping 474 matching lines @@
   /* We need to initialize numSamplesLB to something; otherwise, in the test
      for whether we should return -1 below, the compiler might generate code
      that fools Memcheck (Valgrind) into thinking that the control flow depends
      on the uninitialized value in numSamplesLB (since WebRtcIsac_DecodeLb will
      not fill it in if it fails and returns -1). */
   numSamplesLB = 0;
 
   /* Regardless of that the current codec is setup to work in
    * wideband or super-wideband, the decoding of the lower-band
    * has to be performed. */
-  numDecodedBytesLB = WebRtcIsac_DecodeLb(outFrame, decInstLB,
+  numDecodedBytesLB = WebRtcIsac_DecodeLb(&instISAC->transform_tables,
+                                          outFrame, decInstLB,
                                           &numSamplesLB, isRCUPayload);
 
   if ((numDecodedBytesLB < 0) || (numDecodedBytesLB > lenEncodedLBBytes) ||
       (numSamplesLB > MAX_FRAMESAMPLES)) {
     instISAC->errorCode = ISAC_LENGTH_MISMATCH;
     return -1;
   }
 
   /* Error Check, we accept multi-layer bit-stream This will limit number
    * of iterations of the while loop. Even without this the number
@@ skipping 122 matching lines @@
         /* Decode bandwidth information. */
         err = WebRtcIsac_DecodeBandwidth(&decInstUB->bitstr_obj,
                                          &bandwidthKHz);
         if (err < 0) {
           instISAC->errorCode = -err;
           return -1;
         }
 
         switch (bandwidthKHz) {
           case isac12kHz: {
-            numDecodedBytesUB = WebRtcIsac_DecodeUb12(outFrame, decInstUB,
-                                                      isRCUPayload);
+            numDecodedBytesUB = WebRtcIsac_DecodeUb12(
+                &instISAC->transform_tables, outFrame, decInstUB, isRCUPayload);
 
             /* Hang-over for transient alleviation -
              * wait two frames to add the upper band going up from 8 kHz. */
             if (instISAC->resetFlag_8kHz > 0) {
               if (instISAC->resetFlag_8kHz == 2) {
                 /* Silence first and a half frame. */
                 memset(outFrame, 0, MAX_FRAMESAMPLES *
                        sizeof(float));
               } else {
                 const float rampStep = 2.0f / MAX_FRAMESAMPLES;
                 float rampVal = 0;
                 memset(outFrame, 0, (MAX_FRAMESAMPLES >> 1) *
                        sizeof(float));
 
                 /* Ramp up second half of second frame. */
                 for (k = MAX_FRAMESAMPLES / 2; k < MAX_FRAMESAMPLES; k++) {
                   outFrame[k] *= rampVal;
                   rampVal += rampStep;
                 }
               }
               instISAC->resetFlag_8kHz -= 1;
             }
 
             break;
           }
           case isac16kHz: {
-            numDecodedBytesUB = WebRtcIsac_DecodeUb16(outFrame, decInstUB,
-                                                      isRCUPayload);
+            numDecodedBytesUB = WebRtcIsac_DecodeUb16(
+                &instISAC->transform_tables, outFrame, decInstUB, isRCUPayload);
             break;
           }
           default:
             return -1;
         }
 
         /* It might be less due to garbage. */
         if ((numDecodedBytesUB != lenNextStream) &&
             (numDecodedBytesUB != (lenNextStream -
                 encoded[numDecodedBytesLB + 1 + numDecodedBytesUB]))) {
@@ skipping 1076 matching lines @@
  *        - ISAC_main_inst    : iSAC instance
  *
  * Return value               : sampling rate in Hertz. Decoder output is
  *                              sampled at this rate.
  *
  */
 uint16_t WebRtcIsac_DecSampRate(ISACStruct* ISAC_main_inst) {
   ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
   return instISAC->decoderSamplingRateKHz == kIsacWideband ? 16000 : 32000;
 }