Changed the delay estimator to be built using C++

webrtc/modules/audio_processing/aecm/aecm_core.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/aecm_core.h"
 
 #include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
 
 extern "C" {
 #include "webrtc/common_audio/ring_buffer.h"
 #include "webrtc/common_audio/signal_processing/include/real_fft.h"
 #include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h"
-#include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h"
 #include "webrtc/system_wrappers/include/cpu_features_wrapper.h"

[hlundin-webrtc, 2016/04/12 06:54:12]

Wrong order of includes.

[peah-webrtc, 2016/04/12 11:53:40]

Done.

 }
+#include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h"
 #include "webrtc/typedefs.h"
 
 #ifdef AEC_DEBUG
 FILE *dfile;
 FILE *testfile;
 #endif
 
 const int16_t WebRtcAecm_kCosTable[] = {
     8192,  8190,  8187,  8180,  8172,  8160,  8147,  8130,  8112,
     8091,  8067,  8041,  8012,  7982,  7948,  7912,  7874,  7834,
@@ skipping 1191 matching lines @@
         memcpy(farend + readPos, aecm->farBuf + aecm->farBufReadPos,
                sizeof(int16_t) * readLen);
         aecm->farBufReadPos = 0;
         readPos = readLen;
         readLen = farLen - readLen;
     }
     memcpy(farend + readPos, aecm->farBuf + aecm->farBufReadPos,
            sizeof(int16_t) * readLen);
     aecm->farBufReadPos += readLen;
 }