mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 06:40:43 +01:00
2fbb83b16b
This is a sibling CL to a similar one for EchoCancellation: https://webrtc-review.googlesource.com/c/src/+/97603 - EchoControlMobileImpl will no longer inherit EchoControlMobile. - Removes usage of AudioProcessing::echo_control_mobile() inside most of the audio processing module and unit tests. The CL breaks audioproc_f backwards compatibility: It can no longer use all recorded settings (comfort noise, routing mode), but prints an error message when unsupported settings are encountered. Tested: audioproc_f with .wav and aecdump inputs. Bug: webrtc:9535 Change-Id: I63c3c81bcaf44021315978e1a0f3e42173b988ce Reviewed-on: https://webrtc-review.googlesource.com/101621 Reviewed-by: Alex Loiko <aleloi@webrtc.org> Commit-Queue: Sam Zackrisson <saza@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24888}
45 lines
1.7 KiB
C++
45 lines
1.7 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_CONTROL_MOBILE_PROXY_H_
|
|
#define MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_PROXY_H_
|
|
|
|
#include "modules/audio_processing/echo_control_mobile_impl.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 AECM configuration to a new API.
|
|
class EchoControlMobileProxy : public EchoControlMobile {
|
|
public:
|
|
EchoControlMobileProxy(AudioProcessing* audio_processing,
|
|
EchoControlMobileImpl* echo_control_mobile);
|
|
~EchoControlMobileProxy() override;
|
|
|
|
bool is_enabled() const override;
|
|
RoutingMode routing_mode() const override;
|
|
bool is_comfort_noise_enabled() const override;
|
|
int Enable(bool enable) override;
|
|
int set_routing_mode(RoutingMode mode) override;
|
|
int enable_comfort_noise(bool enable) override;
|
|
int SetEchoPath(const void* echo_path, size_t size_bytes) override;
|
|
int GetEchoPath(void* echo_path, size_t size_bytes) const override;
|
|
|
|
private:
|
|
AudioProcessing* audio_processing_;
|
|
EchoControlMobileImpl* echo_control_mobile_;
|
|
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoControlMobileProxy);
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_PROXY_H_
|