Changed AECM to be built using C++

webrtc/modules/audio_processing/aecm/echo_control_mobile.cc

 /*
  *  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.
  */
 
 #include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h"
 
 #ifdef AEC_DEBUG
 #include <stdio.h>
 #endif
 #include <stdlib.h>
 
+extern "C" {
 #include "webrtc/common_audio/ring_buffer.h"
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+}
 #include "webrtc/modules/audio_processing/aecm/aecm_core.h"
 
 #define BUF_SIZE_FRAMES 50 // buffer size (frames)
 // Maximum length of resampled signal. Must be an integer multiple of frames
 // (ceil(1/(1 + MIN_SKEW)*2) + 1)*FRAME_LEN
 // The factor of 2 handles wb, and the + 1 is as a safety margin
 #define MAX_RESAMP_LEN (5 * FRAME_LEN)
 
 static const size_t kBufSizeSamp = BUF_SIZE_FRAMES * FRAME_LEN; // buffer size (samples)
 static const int kSampMsNb = 8; // samples per ms in nb
@@ skipping 42 matching lines @@
 } AecMobile;
 
 // Estimates delay to set the position of the farend buffer read pointer
 // (controlled by knownDelay)
 static int WebRtcAecm_EstBufDelay(AecMobile* aecmInst, short msInSndCardBuf);
 
 // Stuffs the farend buffer if the estimated delay is too large
 static int WebRtcAecm_DelayComp(AecMobile* aecmInst);
 
 void* WebRtcAecm_Create() {
-    AecMobile* aecm = malloc(sizeof(AecMobile));
+    AecMobile* aecm = static_cast<AecMobile*>(malloc(sizeof(AecMobile)));
 
     WebRtcSpl_Init();
 
     aecm->aecmCore = WebRtcAecm_CreateCore();
     if (!aecm->aecmCore) {
         WebRtcAecm_Free(aecm);
         return NULL;
     }
 
     aecm->farendBuf = WebRtc_CreateBuffer(kBufSizeSamp,
@@ skipping 14 matching lines @@
 
     aecm->bufFile = fopen("aecBuf.dat", "wb");
     aecm->delayFile = fopen("aecDelay.dat", "wb");
     aecm->preCompFile = fopen("preComp.pcm", "wb");
     aecm->postCompFile = fopen("postComp.pcm", "wb");
 #endif // AEC_DEBUG
     return aecm;
 }
 
 void WebRtcAecm_Free(void* aecmInst) {
-  AecMobile* aecm = aecmInst;
+  AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
 
     if (aecm == NULL) {
       return;
     }
 
 #ifdef AEC_DEBUG
     fclose(aecm->aecmCore->farFile);
     fclose(aecm->aecmCore->nearFile);
     fclose(aecm->aecmCore->outFile);
     //fclose(aecm->aecmCore->outLpFile);
 
     fclose(aecm->bufFile);
     fclose(aecm->delayFile);
     fclose(aecm->preCompFile);
     fclose(aecm->postCompFile);
 #endif // AEC_DEBUG
     WebRtcAecm_FreeCore(aecm->aecmCore);
     WebRtc_FreeBuffer(aecm->farendBuf);
     free(aecm);
 }
 
 int32_t WebRtcAecm_Init(void *aecmInst, int32_t sampFreq)
 {
-  AecMobile* aecm = aecmInst;
+    AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
     AecmConfig aecConfig;
 
     if (aecm == NULL)
     {
         return -1;
     }
 
     if (sampFreq != 8000 && sampFreq != 16000)
     {
         return AECM_BAD_PARAMETER_ERROR;
@@ skipping 37 matching lines @@
         return AECM_UNSPECIFIED_ERROR;
     }
 
     return 0;
 }
 
 // Returns any error that is caused when buffering the
 // farend signal.
 int32_t WebRtcAecm_GetBufferFarendError(void *aecmInst, const int16_t *farend,
                                 size_t nrOfSamples) {
-  AecMobile* aecm = aecmInst;
+  AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
 
   if (aecm == NULL)
     return -1;
 
   if (farend == NULL)
     return AECM_NULL_POINTER_ERROR;
 
   if (aecm->initFlag != kInitCheck)
     return AECM_UNINITIALIZED_ERROR;
 
   if (nrOfSamples != 80 && nrOfSamples != 160)
     return AECM_BAD_PARAMETER_ERROR;
 
   return 0;
 }
 
 
 int32_t WebRtcAecm_BufferFarend(void *aecmInst, const int16_t *farend,
                                 size_t nrOfSamples) {
-  AecMobile* aecm = aecmInst;
+  AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
 
   const int32_t err =
       WebRtcAecm_GetBufferFarendError(aecmInst, farend, nrOfSamples);
 
   if (err != 0)
     return err;
 
   // TODO(unknown): Is this really a good idea?
   if (!aecm->ECstartup)
   {
     WebRtcAecm_DelayComp(aecm);
   }
 
   WebRtc_WriteBuffer(aecm->farendBuf, farend, nrOfSamples);
 
   return 0;
 }
 
 int32_t WebRtcAecm_Process(void *aecmInst, const int16_t *nearendNoisy,
                            const int16_t *nearendClean, int16_t *out,
                            size_t nrOfSamples, int16_t msInSndCardBuf)
 {
-  AecMobile* aecm = aecmInst;
+    AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
     int32_t retVal = 0;
     size_t i;
     short nmbrOfFilledBuffers;
     size_t nBlocks10ms;
     size_t nFrames;
 #ifdef AEC_DEBUG
     short msInAECBuf;
 #endif
 
     if (aecm == NULL)
@@ skipping 175 matching lines @@
         (kSampMsNb * aecm->aecmCore->mult);
     fwrite(&msInAECBuf, 2, 1, aecm->bufFile);
     fwrite(&(aecm->knownDelay), sizeof(aecm->knownDelay), 1, aecm->delayFile);
 #endif
 
     return retVal;
 }
 
 int32_t WebRtcAecm_set_config(void *aecmInst, AecmConfig config)
 {
-  AecMobile* aecm = aecmInst;
+    AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
 
     if (aecm == NULL)
     {
         return -1;
     }
 
     if (aecm->initFlag != kInitCheck)
     {
         return AECM_UNINITIALIZED_ERROR;
     }
@@ skipping 60 matching lines @@
                 - (SUPGAIN_ERROR_PARAM_D << 1);
     }
 
     return 0;
 }
 
 int32_t WebRtcAecm_InitEchoPath(void* aecmInst,
                                 const void* echo_path,
                                 size_t size_bytes)
 {
-  AecMobile* aecm = aecmInst;
-    const int16_t* echo_path_ptr = echo_path;
+    AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
+    const int16_t* echo_path_ptr = static_cast<const int16_t*>(echo_path);
 
     if (aecmInst == NULL) {
       return -1;
     }
     if (echo_path == NULL) {
       return AECM_NULL_POINTER_ERROR;
     }
     if (size_bytes != WebRtcAecm_echo_path_size_bytes())
     {
         // Input channel size does not match the size of AECM
         return AECM_BAD_PARAMETER_ERROR;
     }
     if (aecm->initFlag != kInitCheck)
     {
         return AECM_UNINITIALIZED_ERROR;
     }
 
     WebRtcAecm_InitEchoPathCore(aecm->aecmCore, echo_path_ptr);
 
     return 0;
 }
 
 int32_t WebRtcAecm_GetEchoPath(void* aecmInst,
                                void* echo_path,
                                size_t size_bytes)
 {
-  AecMobile* aecm = aecmInst;
-    int16_t* echo_path_ptr = echo_path;
+    AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
+    int16_t* echo_path_ptr = static_cast<int16_t*>(echo_path);
 
     if (aecmInst == NULL) {
       return -1;
     }
     if (echo_path == NULL) {
       return AECM_NULL_POINTER_ERROR;
     }
     if (size_bytes != WebRtcAecm_echo_path_size_bytes())
     {
         // Input channel size does not match the size of AECM
@@ skipping 78 matching lines @@
         nSampAdd = (int)(WEBRTC_SPL_MAX(((nSampSndCard >> 1) - nSampFar),
                 FRAME_LEN));
         nSampAdd = WEBRTC_SPL_MIN(nSampAdd, maxStuffSamp);
 
         WebRtc_MoveReadPtr(aecm->farendBuf, -nSampAdd);
         aecm->delayChange = 1; // the delay needs to be updated
     }
 
     return 0;
 }