| OLD | NEW |
| 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/ring_buffer.h" |
| 25 #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" |
| 26 } | 26 } |
| 27 #include "webrtc/modules/audio_processing/aec/aec_core.h" | 27 #include "webrtc/modules/audio_processing/aec/aec_core.h" |
| 28 extern "C" { | |
| 29 #include "webrtc/modules/audio_processing/aec/aec_resampler.h" | 28 #include "webrtc/modules/audio_processing/aec/aec_resampler.h" |
| 30 } | |
| 31 #include "webrtc/modules/audio_processing/aec/echo_cancellation_internal.h" | 29 #include "webrtc/modules/audio_processing/aec/echo_cancellation_internal.h" |
| 32 #include "webrtc/typedefs.h" | 30 #include "webrtc/typedefs.h" |
| 33 | 31 |
| 34 // Measured delays [ms] | 32 // Measured delays [ms] |
| 35 // Device Chrome GTP | 33 // Device Chrome GTP |
| 36 // MacBook Air 10 | 34 // MacBook Air 10 |
| 37 // MacBook Retina 10 100 | 35 // MacBook Retina 10 100 |
| 38 // MacPro 30? | 36 // MacPro 30? |
| 39 // | 37 // |
| 40 // Win7 Desktop 70 80? | 38 // Win7 Desktop 70 80? |
| (...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 876 } | 874 } |
| 877 } else { | 875 } else { |
| 878 self->timeForDelayChange = 0; | 876 self->timeForDelayChange = 0; |
| 879 } | 877 } |
| 880 self->lastDelayDiff = delay_difference; | 878 self->lastDelayDiff = delay_difference; |
| 881 | 879 |
| 882 if (self->timeForDelayChange > 25) { | 880 if (self->timeForDelayChange > 25) { |
| 883 self->knownDelay = WEBRTC_SPL_MAX((int)self->filtDelay - 256, 0); | 881 self->knownDelay = WEBRTC_SPL_MAX((int)self->filtDelay - 256, 0); |
| 884 } | 882 } |
| 885 } | 883 } |
| OLD | NEW |