mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-16 15:20:42 +01:00
271812a893
This reverts commit 1a03960e63.
Reason for revert: breaks downstream projects.
Original change's description:
> Remove APM internal usage of EchoCancellation
>
> This CL:
> - Changes EchoCancellationImpl to inherit privately from
> EchoCancellation.
> - Removes usage of AudioProcessing::echo_cancellation() inside most of
> the audio processing module and unit tests.
> - Default-enables metrics collection in AEC2.
>
> This CL breaks audioproc_f backwards compatibility: It can no longer
> use all recorded settings (drift compensation, suppression level), but
> prints an error message when such settings are encountered.
>
> Some code in audio_processing_unittest.cc still uses the old interface.
> I'll handle that in a separate change, as it is not as straightforward
> to preserve coverage.
>
> Bug: webrtc:9535
> Change-Id: Ia4d4b8d117ccbe516e5345c15d37298418590686
> Reviewed-on: https://webrtc-review.googlesource.com/97603
> Commit-Queue: Sam Zackrisson <saza@webrtc.org>
> Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#24724}
TBR=gustaf@webrtc.org,saza@webrtc.org
Change-Id: Ifdc4235f9c5ee8a8a5d32cc8e1dda0853b941693
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9535
Reviewed-on: https://webrtc-review.googlesource.com/100305
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24729}
79 lines
2.8 KiB
C++
79 lines
2.8 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 <memory>
|
|
|
|
#include "modules/audio_processing/aec/aec_core.h"
|
|
#include "modules/audio_processing/include/audio_processing.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
|
|
TEST(EchoCancellationInternalTest, ExtendedFilter) {
|
|
std::unique_ptr<AudioProcessing> ap(AudioProcessingBuilder().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) {
|
|
std::unique_ptr<AudioProcessing> ap(AudioProcessingBuilder().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
|