e3e30ae5c5
This reverts commit f3a197e55323aee974a932c52dd19fa88e5d4e38. Reason for revert: Speculative revert, as this may'be broken some build bots Original change's description: > Add core multi-channel pipeline in AEC3 > This CL adds basic the basic pipeline to support multi-channel > processing in AEC3. > > Apart from that, it removes the 8 kHz processing support in several > places of the AEC3 code. > > Bug: webrtc:10913 > Change-Id: If5b75fa325ed0071deea94a7546cb4a7adf22137 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/150332 > Commit-Queue: Per Åhgren <peah@webrtc.org> > Reviewed-by: Sam Zackrisson <saza@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#29017} TBR=saza@webrtc.org,peah@webrtc.org Change-Id: I877d2993b9ccf024bd1d57bca1513c3e24d0bed3 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10913 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/150940 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29022}
70 lines
2.4 KiB
C++
70 lines
2.4 KiB
C++
/*
|
|
* Copyright (c) 2016 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_AEC3_BLOCK_PROCESSOR_H_
|
|
#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "api/audio/echo_canceller3_config.h"
|
|
#include "api/audio/echo_control.h"
|
|
#include "modules/audio_processing/aec3/echo_remover.h"
|
|
#include "modules/audio_processing/aec3/render_delay_buffer.h"
|
|
#include "modules/audio_processing/aec3/render_delay_controller.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Class for performing echo cancellation on 64 sample blocks of audio data.
|
|
class BlockProcessor {
|
|
public:
|
|
static BlockProcessor* Create(const EchoCanceller3Config& config,
|
|
int sample_rate_hz);
|
|
// Only used for testing purposes.
|
|
static BlockProcessor* Create(
|
|
const EchoCanceller3Config& config,
|
|
int sample_rate_hz,
|
|
std::unique_ptr<RenderDelayBuffer> render_buffer);
|
|
static BlockProcessor* Create(
|
|
const EchoCanceller3Config& config,
|
|
int sample_rate_hz,
|
|
std::unique_ptr<RenderDelayBuffer> render_buffer,
|
|
std::unique_ptr<RenderDelayController> delay_controller,
|
|
std::unique_ptr<EchoRemover> echo_remover);
|
|
|
|
virtual ~BlockProcessor() = default;
|
|
|
|
// Get current metrics.
|
|
virtual void GetMetrics(EchoControl::Metrics* metrics) const = 0;
|
|
|
|
// Provides an optional external estimate of the audio buffer delay.
|
|
virtual void SetAudioBufferDelay(size_t delay_ms) = 0;
|
|
|
|
// Processes a block of capture data.
|
|
virtual void ProcessCapture(
|
|
bool echo_path_gain_change,
|
|
bool capture_signal_saturation,
|
|
std::vector<std::vector<float>>* capture_block) = 0;
|
|
|
|
// Buffers a block of render data supplied by a FrameBlocker object.
|
|
virtual void BufferRender(
|
|
const std::vector<std::vector<float>>& render_block) = 0;
|
|
|
|
// Reports whether echo leakage has been detected in the echo canceller
|
|
// output.
|
|
virtual void UpdateEchoLeakageStatus(bool leakage_detected) = 0;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_
|