iSAC: Functions for importing and exporting bandwidth est. info

webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.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 54 matching lines @@
  * WebRtcIsacfix_Assign(...)
  *
  * Functions used when malloc is not allowed
  * Place struct at given address
  *
  * If successful, Return 0, else Return -1
  */
 
 int16_t WebRtcIsacfix_Assign(ISACFIX_MainStruct **inst, void *ISACFIX_inst_Addr) {
   if (ISACFIX_inst_Addr!=NULL) {
-    *inst = (ISACFIX_MainStruct*)ISACFIX_inst_Addr;
-    (*(ISACFIX_SubStruct**)inst)->errorcode = 0;
-    (*(ISACFIX_SubStruct**)inst)->initflag = 0;
-    (*(ISACFIX_SubStruct**)inst)->ISACenc_obj.SaveEnc_ptr = NULL;
+    ISACFIX_SubStruct* self = ISACFIX_inst_Addr;
+    *inst = (ISACFIX_MainStruct*)self;
+    self->errorcode = 0;
+    self->initflag = 0;
+    self->ISACenc_obj.SaveEnc_ptr = NULL;
+    WebRtcIsacfix_InitBandwidthEstimator(&self->bwestimator_obj);
     return(0);
   } else {
     return(-1);
   }
 }
 
 
 #ifndef ISACFIX_NO_DYNAMIC_MEM
 
 /****************************************************************************
@@ skipping 12 matching lines @@
 int16_t WebRtcIsacfix_Create(ISACFIX_MainStruct **ISAC_main_inst)
 {
   ISACFIX_SubStruct *tempo;
   tempo = malloc(1 * sizeof(ISACFIX_SubStruct));
   *ISAC_main_inst = (ISACFIX_MainStruct *)tempo;
   if (*ISAC_main_inst!=NULL) {
     (*(ISACFIX_SubStruct**)ISAC_main_inst)->errorcode = 0;
     (*(ISACFIX_SubStruct**)ISAC_main_inst)->initflag = 0;
     (*(ISACFIX_SubStruct**)ISAC_main_inst)->ISACenc_obj.SaveEnc_ptr = NULL;
     WebRtcSpl_Init();
+    WebRtcIsacfix_InitBandwidthEstimator(&tempo->bwestimator_obj);
     return(0);
   } else {
     return(-1);
   }
 }
 
 
 /****************************************************************************
  * WebRtcIsacfix_CreateInternal(...)
  *
@@ skipping 165 matching lines @@
     statusInit = -1;
   }
 
   ISAC_inst->CodingMode = CodingMode;
 
   WebRtcIsacfix_InitMaskingEnc(&ISAC_inst->ISACenc_obj.maskfiltstr_obj);
   WebRtcIsacfix_InitPreFilterbank(&ISAC_inst->ISACenc_obj.prefiltbankstr_obj);
   WebRtcIsacfix_InitPitchFilter(&ISAC_inst->ISACenc_obj.pitchfiltstr_obj);
   WebRtcIsacfix_InitPitchAnalysis(&ISAC_inst->ISACenc_obj.pitchanalysisstr_obj);
 
-
-  WebRtcIsacfix_InitBandwidthEstimator(&ISAC_inst->bwestimator_obj);
   WebRtcIsacfix_InitRateModel(&ISAC_inst->ISACenc_obj.rate_data_obj);
 
 
   ISAC_inst->ISACenc_obj.buffer_index   = 0;
   ISAC_inst->ISACenc_obj.frame_nb    = 0;
   ISAC_inst->ISACenc_obj.BottleNeck      = 32000; /* default for I-mode */
   ISAC_inst->ISACenc_obj.MaxDelay    = 10;    /* default for I-mode */
   ISAC_inst->ISACenc_obj.current_framesamples = 0;
   ISAC_inst->ISACenc_obj.s2nr     = 0;
   ISAC_inst->ISACenc_obj.MaxBits    = 0;
@@ skipping 1211 matching lines @@
  *
  * Output:
  *      - version  : Pointer to character string
  *
  */
 
 void WebRtcIsacfix_version(char *version)
 {
   strcpy(version, "3.6.0");
 }
+
+void WebRtcIsacfix_GetBandwidthInfo(ISACFIX_MainStruct* ISAC_main_inst,
+                                    IsacBandwidthInfo* bwinfo) {
+  ISACFIX_SubStruct* inst = (ISACFIX_SubStruct*)ISAC_main_inst;
+  assert(inst->initflag & 1);  // Decoder initialized.
+  WebRtcIsacfixBw_GetBandwidthInfo(&inst->bwestimator_obj, bwinfo);
+}
+
+void WebRtcIsacfix_SetBandwidthInfo(ISACFIX_MainStruct* ISAC_main_inst,
+                                    const IsacBandwidthInfo* bwinfo) {
+  ISACFIX_SubStruct* inst = (ISACFIX_SubStruct*)ISAC_main_inst;
+  assert(inst->initflag & 2);  // Encoder initialized.
+  WebRtcIsacfixBw_SetBandwidthInfo(&inst->bwestimator_obj, bwinfo);
+}