05a7004442
This reverts commit 2fbb83b16b4c2c1712cbe898ca3ba42d6da3e96f. Reason for revert: Speculative revert over failing Chromium bot: https://ci.chromium.org/p/chromium/builders/luci.chromium.webrtc.fyi/WebRTC%20Chromium%20FYI%20Android%20Tests%20%28dbg%29%20%28M%20Nexus5X%29/117 Original change's description: > Remove APM-internal usage of EchoControlMobile > > 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} TBR=saza@webrtc.org,aleloi@webrtc.org Change-Id: I1f8a27ac291f2cdc16c8daa32e399b74d489dbb9 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9535 Reviewed-on: https://webrtc-review.googlesource.com/102642 Reviewed-by: Sam Zackrisson <saza@webrtc.org> Commit-Queue: Sam Zackrisson <saza@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24895}
85 lines
2.9 KiB
C++
85 lines
2.9 KiB
C++
/*
|
|
* Copyright (c) 2012 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_IMPL_H_
|
|
#define MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "modules/audio_processing/include/audio_processing.h"
|
|
#include "modules/audio_processing/render_queue_item_verifier.h"
|
|
#include "rtc_base/constructormagic.h"
|
|
#include "rtc_base/criticalsection.h"
|
|
#include "rtc_base/swap_queue.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class AudioBuffer;
|
|
|
|
class EchoControlMobileImpl : public EchoControlMobile {
|
|
public:
|
|
EchoControlMobileImpl(rtc::CriticalSection* crit_render,
|
|
rtc::CriticalSection* crit_capture);
|
|
|
|
~EchoControlMobileImpl() override;
|
|
|
|
void ProcessRenderAudio(rtc::ArrayView<const int16_t> packed_render_audio);
|
|
int ProcessCaptureAudio(AudioBuffer* audio, int stream_delay_ms);
|
|
|
|
// EchoControlMobile implementation.
|
|
bool is_enabled() const override;
|
|
RoutingMode routing_mode() const override;
|
|
bool is_comfort_noise_enabled() const override;
|
|
|
|
void Initialize(int sample_rate_hz,
|
|
size_t num_reverse_channels,
|
|
size_t num_output_channels);
|
|
|
|
static void PackRenderAudioBuffer(const AudioBuffer* audio,
|
|
size_t num_output_channels,
|
|
size_t num_channels,
|
|
std::vector<int16_t>* packed_buffer);
|
|
|
|
static size_t NumCancellersRequired(size_t num_output_channels,
|
|
size_t num_reverse_channels);
|
|
|
|
private:
|
|
class Canceller;
|
|
struct StreamProperties;
|
|
|
|
// EchoControlMobile implementation.
|
|
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;
|
|
|
|
int Configure();
|
|
|
|
rtc::CriticalSection* const crit_render_ RTC_ACQUIRED_BEFORE(crit_capture_);
|
|
rtc::CriticalSection* const crit_capture_;
|
|
|
|
bool enabled_ = false;
|
|
|
|
RoutingMode routing_mode_ RTC_GUARDED_BY(crit_capture_);
|
|
bool comfort_noise_enabled_ RTC_GUARDED_BY(crit_capture_);
|
|
unsigned char* external_echo_path_ RTC_GUARDED_BY(crit_render_)
|
|
RTC_GUARDED_BY(crit_capture_);
|
|
|
|
std::vector<std::unique_ptr<Canceller>> cancellers_;
|
|
std::unique_ptr<StreamProperties> stream_properties_;
|
|
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoControlMobileImpl);
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_
|