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

Side by Side Diff: webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc

Issue 1166463006: Revert r9378 "Rename APM Config DelayCorrection to ExtendedFilter" (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 6 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "webrtc/base/scoped_ptr.h" 12 #include "webrtc/base/scoped_ptr.h"
13 extern "C" { 13 extern "C" {
14 #include "webrtc/modules/audio_processing/aec/aec_core.h" 14 #include "webrtc/modules/audio_processing/aec/aec_core.h"
15 } 15 }
16 #include "webrtc/modules/audio_processing/include/audio_processing.h" 16 #include "webrtc/modules/audio_processing/include/audio_processing.h"
17 #include "webrtc/test/testsupport/gtest_disable.h" 17 #include "webrtc/test/testsupport/gtest_disable.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 TEST(EchoCancellationInternalTest, ExtendedFilter) { 21 TEST(EchoCancellationInternalTest, DelayCorrection) {
22 rtc::scoped_ptr<AudioProcessing> ap(AudioProcessing::Create()); 22 rtc::scoped_ptr<AudioProcessing> ap(AudioProcessing::Create());
23 EXPECT_TRUE(ap->echo_cancellation()->aec_core() == NULL); 23 EXPECT_TRUE(ap->echo_cancellation()->aec_core() == NULL);
24 24
25 EXPECT_EQ(ap->kNoError, ap->echo_cancellation()->Enable(true)); 25 EXPECT_EQ(ap->kNoError, ap->echo_cancellation()->Enable(true));
26 EXPECT_TRUE(ap->echo_cancellation()->is_enabled()); 26 EXPECT_TRUE(ap->echo_cancellation()->is_enabled());
27 27
28 AecCore* aec_core = ap->echo_cancellation()->aec_core(); 28 AecCore* aec_core = ap->echo_cancellation()->aec_core();
29 ASSERT_TRUE(aec_core != NULL); 29 ASSERT_TRUE(aec_core != NULL);
30 // Disabled by default. 30 // Disabled by default.
31 EXPECT_EQ(0, WebRtcAec_extended_filter_enabled(aec_core)); 31 EXPECT_EQ(0, WebRtcAec_delay_correction_enabled(aec_core));
32 32
33 Config config; 33 Config config;
34 config.Set<ExtendedFilter>(new ExtendedFilter(true)); 34 config.Set<DelayCorrection>(new DelayCorrection(true));
35 ap->SetExtraOptions(config); 35 ap->SetExtraOptions(config);
36 EXPECT_EQ(1, WebRtcAec_extended_filter_enabled(aec_core)); 36 EXPECT_EQ(1, WebRtcAec_delay_correction_enabled(aec_core));
37 37
38 // Retains setting after initialization. 38 // Retains setting after initialization.
39 EXPECT_EQ(ap->kNoError, ap->Initialize()); 39 EXPECT_EQ(ap->kNoError, ap->Initialize());
40 EXPECT_EQ(1, WebRtcAec_extended_filter_enabled(aec_core)); 40 EXPECT_EQ(1, WebRtcAec_delay_correction_enabled(aec_core));
41 41
42 config.Set<ExtendedFilter>(new ExtendedFilter(false)); 42 config.Set<DelayCorrection>(new DelayCorrection(false));
43 ap->SetExtraOptions(config); 43 ap->SetExtraOptions(config);
44 EXPECT_EQ(0, WebRtcAec_extended_filter_enabled(aec_core)); 44 EXPECT_EQ(0, WebRtcAec_delay_correction_enabled(aec_core));
45 45
46 // Retains setting after initialization. 46 // Retains setting after initialization.
47 EXPECT_EQ(ap->kNoError, ap->Initialize()); 47 EXPECT_EQ(ap->kNoError, ap->Initialize());
48 EXPECT_EQ(0, WebRtcAec_extended_filter_enabled(aec_core)); 48 EXPECT_EQ(0, WebRtcAec_delay_correction_enabled(aec_core));
49 } 49 }
50 50
51 TEST(EchoCancellationInternalTest, ReportedDelay) { 51 TEST(EchoCancellationInternalTest, ReportedDelay) {
52 rtc::scoped_ptr<AudioProcessing> ap(AudioProcessing::Create()); 52 rtc::scoped_ptr<AudioProcessing> ap(AudioProcessing::Create());
53 EXPECT_TRUE(ap->echo_cancellation()->aec_core() == NULL); 53 EXPECT_TRUE(ap->echo_cancellation()->aec_core() == NULL);
54 54
55 EXPECT_EQ(ap->kNoError, ap->echo_cancellation()->Enable(true)); 55 EXPECT_EQ(ap->kNoError, ap->echo_cancellation()->Enable(true));
56 EXPECT_TRUE(ap->echo_cancellation()->is_enabled()); 56 EXPECT_TRUE(ap->echo_cancellation()->is_enabled());
57 57
58 AecCore* aec_core = ap->echo_cancellation()->aec_core(); 58 AecCore* aec_core = ap->echo_cancellation()->aec_core();
(...skipping 13 matching lines...) Expand all
72 config.Set<ReportedDelay>(new ReportedDelay(true)); 72 config.Set<ReportedDelay>(new ReportedDelay(true));
73 ap->SetExtraOptions(config); 73 ap->SetExtraOptions(config);
74 EXPECT_EQ(1, WebRtcAec_reported_delay_enabled(aec_core)); 74 EXPECT_EQ(1, WebRtcAec_reported_delay_enabled(aec_core));
75 75
76 // Retains setting after initialization. 76 // Retains setting after initialization.
77 EXPECT_EQ(ap->kNoError, ap->Initialize()); 77 EXPECT_EQ(ap->kNoError, ap->Initialize());
78 EXPECT_EQ(1, WebRtcAec_reported_delay_enabled(aec_core)); 78 EXPECT_EQ(1, WebRtcAec_reported_delay_enabled(aec_core));
79 } 79 }
80 80
81 } // namespace webrtc 81 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_processing/echo_cancellation_impl.cc ('k') | webrtc/modules/audio_processing/include/audio_processing.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698