Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side Diff: webrtc/modules/audio_processing/aecm/aecm_core.cc

Issue 1876143002: Corrected include of C++ header file in AECM that was done using external inclusion (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/modules/audio_processing/aecm/aecm_core.h" 11 #include "webrtc/modules/audio_processing/aecm/aecm_core.h"
12 12
13 #include <assert.h> 13 #include <assert.h>
14 #include <stddef.h> 14 #include <stddef.h>
15 #include <stdlib.h> 15 #include <stdlib.h>
16 16
17 extern "C" { 17 extern "C" {
18 #include "webrtc/common_audio/ring_buffer.h" 18 #include "webrtc/common_audio/ring_buffer.h"
19 #include "webrtc/common_audio/signal_processing/include/real_fft.h" 19 #include "webrtc/common_audio/signal_processing/include/real_fft.h"
20 }
20 #include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" 21 #include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h"
22 extern "C" {
21 #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" 23 #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h"
22 #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" 24 #include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
23 } 25 }
24 #include "webrtc/typedefs.h" 26 #include "webrtc/typedefs.h"
25 27
26 #ifdef AEC_DEBUG 28 #ifdef AEC_DEBUG
27 FILE *dfile; 29 FILE *dfile;
28 FILE *testfile; 30 FILE *testfile;
29 #endif 31 #endif
30 32
(...skipping 1194 matching lines...) Expand 10 before | Expand all | Expand 10 after
1225 memcpy(farend + readPos, aecm->farBuf + aecm->farBufReadPos, 1227 memcpy(farend + readPos, aecm->farBuf + aecm->farBufReadPos,
1226 sizeof(int16_t) * readLen); 1228 sizeof(int16_t) * readLen);
1227 aecm->farBufReadPos = 0; 1229 aecm->farBufReadPos = 0;
1228 readPos = readLen; 1230 readPos = readLen;
1229 readLen = farLen - readLen; 1231 readLen = farLen - readLen;
1230 } 1232 }
1231 memcpy(farend + readPos, aecm->farBuf + aecm->farBufReadPos, 1233 memcpy(farend + readPos, aecm->farBuf + aecm->farBufReadPos,
1232 sizeof(int16_t) * readLen); 1234 sizeof(int16_t) * readLen);
1233 aecm->farBufReadPos += readLen; 1235 aecm->farBufReadPos += readLen;
1234 } 1236 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698