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

Side by Side Diff: webrtc/modules/audio_processing/aec/echo_cancellation.cc

Issue 1856323002: Revert of Moved ring-buffer related files from common_audio to audio_processing (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
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 /* 11 /*
12 * Contains the API functions for the AEC. 12 * Contains the API functions for the AEC.
13 */ 13 */
14 #include "webrtc/modules/audio_processing/aec/echo_cancellation.h" 14 #include "webrtc/modules/audio_processing/aec/echo_cancellation.h"
15 15
16 #include <math.h> 16 #include <math.h>
17 #ifdef WEBRTC_AEC_DEBUG_DUMP 17 #ifdef WEBRTC_AEC_DEBUG_DUMP
18 #include <stdio.h> 18 #include <stdio.h>
19 #endif 19 #endif
20 #include <stdlib.h> 20 #include <stdlib.h>
21 #include <string.h> 21 #include <string.h>
22 22
23 extern "C" { 23 extern "C" {
24 #include "webrtc/common_audio/ring_buffer.h"
24 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h" 25 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h"
25 } 26 }
26 #include "webrtc/modules/audio_processing/aec/aec_core.h" 27 #include "webrtc/modules/audio_processing/aec/aec_core.h"
27 #include "webrtc/modules/audio_processing/aec/aec_resampler.h" 28 #include "webrtc/modules/audio_processing/aec/aec_resampler.h"
28 #include "webrtc/modules/audio_processing/aec/echo_cancellation_internal.h" 29 #include "webrtc/modules/audio_processing/aec/echo_cancellation_internal.h"
29 extern "C" {
30 #include "webrtc/modules/audio_processing/utility/ring_buffer.h"
31 }
32 #include "webrtc/typedefs.h" 30 #include "webrtc/typedefs.h"
33 31
34 namespace webrtc { 32 namespace webrtc {
35 33
36 // Measured delays [ms] 34 // Measured delays [ms]
37 // Device Chrome GTP 35 // Device Chrome GTP
38 // MacBook Air 10 36 // MacBook Air 10
39 // MacBook Retina 10 100 37 // MacBook Retina 10 100
40 // MacPro 30? 38 // MacPro 30?
41 // 39 //
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 } else { 877 } else {
880 self->timeForDelayChange = 0; 878 self->timeForDelayChange = 0;
881 } 879 }
882 self->lastDelayDiff = delay_difference; 880 self->lastDelayDiff = delay_difference;
883 881
884 if (self->timeForDelayChange > 25) { 882 if (self->timeForDelayChange > 25) {
885 self->knownDelay = WEBRTC_SPL_MAX((int)self->filtDelay - 256, 0); 883 self->knownDelay = WEBRTC_SPL_MAX((int)self->filtDelay - 256, 0);
886 } 884 }
887 } 885 }
888 } // namespace webrtc 886 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698