271812a893
This reverts commit 1a03960e632a04e2ff866f2048cc36146af83e41. 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}
56 lines
2.1 KiB
C++
56 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2018 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.
|
|
*/
|
|
|
|
#ifndef MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_PROXY_H_
|
|
#define MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_PROXY_H_
|
|
|
|
#include "modules/audio_processing/include/audio_processing.h"
|
|
#include "rtc_base/constructormagic.h"
|
|
#include "rtc_base/scoped_ref_ptr.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Class for temporarily redirecting AEC2 configuration to a new API.
|
|
class EchoCancellationProxy : public EchoCancellation {
|
|
public:
|
|
EchoCancellationProxy(AudioProcessing* audio_processing,
|
|
EchoCancellation* echo_cancellation);
|
|
~EchoCancellationProxy() override;
|
|
|
|
int Enable(bool enable) override;
|
|
bool is_enabled() const override;
|
|
int enable_drift_compensation(bool enable) override;
|
|
bool is_drift_compensation_enabled() const override;
|
|
void set_stream_drift_samples(int drift) override;
|
|
int stream_drift_samples() const override;
|
|
int set_suppression_level(SuppressionLevel level) override;
|
|
SuppressionLevel suppression_level() const override;
|
|
bool stream_has_echo() const override;
|
|
int enable_metrics(bool enable) override;
|
|
bool are_metrics_enabled() const override;
|
|
int GetMetrics(Metrics* metrics) override;
|
|
int enable_delay_logging(bool enable) override;
|
|
bool is_delay_logging_enabled() const override;
|
|
int GetDelayMetrics(int* median, int* std) override;
|
|
int GetDelayMetrics(int* median,
|
|
int* std,
|
|
float* fraction_poor_delays) override;
|
|
struct AecCore* aec_core() const override;
|
|
|
|
private:
|
|
AudioProcessing* audio_processing_;
|
|
EchoCancellation* echo_cancellation_;
|
|
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoCancellationProxy);
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_PROXY_H_
|