0f133b99c6
We use this Config struct for enabling/disabling the delay agnostic AEC. This change renames it to DelayAgnostic for readability reasons. NOTE: The logic is reversed in this CL. The old ReportedDelay config turned DA-AEC off, while the new DelayAgnostic turns it on. The old Config is kept in parallel with the new during a transition period. This is to avoid problems with API breakages. During this period, ReportedDelay is disabled or DelayAgnostic is enabled, DA-AEC is engaged in APM. BUG=webrtc:4651 R=bjornv@webrtc.org, tommi@webrtc.org Review URL: https://codereview.webrtc.org/1211053006 Cr-Commit-Position: refs/heads/master@{#9531}
82 lines
2.9 KiB
C++
82 lines
2.9 KiB
C++
/*
|
|
* Copyright (c) 2013 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 "testing/gtest/include/gtest/gtest.h"
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
extern "C" {
|
|
#include "webrtc/modules/audio_processing/aec/aec_core.h"
|
|
}
|
|
#include "webrtc/modules/audio_processing/include/audio_processing.h"
|
|
#include "webrtc/test/testsupport/gtest_disable.h"
|
|
|
|
namespace webrtc {
|
|
|
|
TEST(EchoCancellationInternalTest, ExtendedFilter) {
|
|
rtc::scoped_ptr<AudioProcessing> ap(AudioProcessing::Create());
|
|
EXPECT_TRUE(ap->echo_cancellation()->aec_core() == NULL);
|
|
|
|
EXPECT_EQ(ap->kNoError, ap->echo_cancellation()->Enable(true));
|
|
EXPECT_TRUE(ap->echo_cancellation()->is_enabled());
|
|
|
|
AecCore* aec_core = ap->echo_cancellation()->aec_core();
|
|
ASSERT_TRUE(aec_core != NULL);
|
|
// Disabled by default.
|
|
EXPECT_EQ(0, WebRtcAec_extended_filter_enabled(aec_core));
|
|
|
|
Config config;
|
|
config.Set<ExtendedFilter>(new ExtendedFilter(true));
|
|
ap->SetExtraOptions(config);
|
|
EXPECT_EQ(1, WebRtcAec_extended_filter_enabled(aec_core));
|
|
|
|
// Retains setting after initialization.
|
|
EXPECT_EQ(ap->kNoError, ap->Initialize());
|
|
EXPECT_EQ(1, WebRtcAec_extended_filter_enabled(aec_core));
|
|
|
|
config.Set<ExtendedFilter>(new ExtendedFilter(false));
|
|
ap->SetExtraOptions(config);
|
|
EXPECT_EQ(0, WebRtcAec_extended_filter_enabled(aec_core));
|
|
|
|
// Retains setting after initialization.
|
|
EXPECT_EQ(ap->kNoError, ap->Initialize());
|
|
EXPECT_EQ(0, WebRtcAec_extended_filter_enabled(aec_core));
|
|
}
|
|
|
|
TEST(EchoCancellationInternalTest, DelayAgnostic) {
|
|
rtc::scoped_ptr<AudioProcessing> ap(AudioProcessing::Create());
|
|
EXPECT_TRUE(ap->echo_cancellation()->aec_core() == NULL);
|
|
|
|
EXPECT_EQ(ap->kNoError, ap->echo_cancellation()->Enable(true));
|
|
EXPECT_TRUE(ap->echo_cancellation()->is_enabled());
|
|
|
|
AecCore* aec_core = ap->echo_cancellation()->aec_core();
|
|
ASSERT_TRUE(aec_core != NULL);
|
|
// Enabled by default.
|
|
EXPECT_EQ(0, WebRtcAec_delay_agnostic_enabled(aec_core));
|
|
|
|
Config config;
|
|
config.Set<DelayAgnostic>(new DelayAgnostic(true));
|
|
ap->SetExtraOptions(config);
|
|
EXPECT_EQ(1, WebRtcAec_delay_agnostic_enabled(aec_core));
|
|
|
|
// Retains setting after initialization.
|
|
EXPECT_EQ(ap->kNoError, ap->Initialize());
|
|
EXPECT_EQ(1, WebRtcAec_delay_agnostic_enabled(aec_core));
|
|
|
|
config.Set<DelayAgnostic>(new DelayAgnostic(false));
|
|
ap->SetExtraOptions(config);
|
|
EXPECT_EQ(0, WebRtcAec_delay_agnostic_enabled(aec_core));
|
|
|
|
// Retains setting after initialization.
|
|
EXPECT_EQ(ap->kNoError, ap->Initialize());
|
|
EXPECT_EQ(0, WebRtcAec_delay_agnostic_enabled(aec_core));
|
|
}
|
|
|
|
} // namespace webrtc
|