mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-16 23:30:48 +01:00
5c532d3774
This CL robustifies the echo removal behavior when headsets are used. In particular it: -Introduces a secondary, more refined alignment when no alignment can be found using the delay estimator. -Changes decision logic for when to use the linear filter output. -Changes the decision logic for when to be transparent. -Changes the way that the transparent mode works. -Makes the nonlinear mode less aggressive. -Removes the detector for non-audible echoes. -Makes the attenuation when there are signals with strong narrowband characteristics more mild in scenarios with low render. Furthermore the CL: -Removes the input of external echo leakage information. Bug: webrtc:9047,chromium:824111,webrtc:8314,webrtc:8671,webrtc:5201,webrtc:5919 Change-Id: Ied1fe0c0a35d3c31b47606ed2db319a73644d406 Reviewed-on: https://webrtc-review.googlesource.com/60866 Commit-Queue: Per Åhgren <peah@webrtc.org> Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22548}
80 lines
2.6 KiB
C++
80 lines
2.6 KiB
C++
/*
|
|
* Copyright (c) 2017 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_RENDER_DELAY_BUFFER_H_
|
|
#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_
|
|
|
|
#include <stddef.h>
|
|
#include <array>
|
|
#include <vector>
|
|
|
|
#include "api/array_view.h"
|
|
#include "api/audio/echo_canceller3_config.h"
|
|
#include "api/optional.h"
|
|
#include "modules/audio_processing/aec3/aec3_common.h"
|
|
#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
|
|
#include "modules/audio_processing/aec3/fft_data.h"
|
|
#include "modules/audio_processing/aec3/render_buffer.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Class for buffering the incoming render blocks such that these may be
|
|
// extracted with a specified delay.
|
|
class RenderDelayBuffer {
|
|
public:
|
|
enum class BufferingEvent {
|
|
kNone,
|
|
kRenderUnderrun,
|
|
kRenderOverrun,
|
|
kApiCallSkew,
|
|
kRenderDataLost
|
|
};
|
|
|
|
static RenderDelayBuffer* Create(const EchoCanceller3Config& config,
|
|
size_t num_bands);
|
|
virtual ~RenderDelayBuffer() = default;
|
|
|
|
// Resets the buffer alignment.
|
|
virtual void Reset() = 0;
|
|
|
|
// Inserts a block into the buffer.
|
|
virtual BufferingEvent Insert(
|
|
const std::vector<std::vector<float>>& block) = 0;
|
|
|
|
// Updates the buffers one step based on the specified buffer delay. Returns
|
|
// an enum indicating whether there was a special event that occurred.
|
|
virtual BufferingEvent PrepareCaptureProcessing() = 0;
|
|
|
|
// Sets the buffer delay and returns a bool indicating whether the delay
|
|
// changed.
|
|
virtual bool SetDelay(size_t delay) = 0;
|
|
|
|
// Gets the buffer delay.
|
|
virtual size_t Delay() const = 0;
|
|
|
|
// Gets the buffer delay.
|
|
virtual size_t MaxDelay() const = 0;
|
|
|
|
// Returns the render buffer for the echo remover.
|
|
virtual RenderBuffer* GetRenderBuffer() = 0;
|
|
|
|
// Returns the downsampled render buffer.
|
|
virtual const DownsampledRenderBuffer& GetDownsampledRenderBuffer() const = 0;
|
|
|
|
// Returns whether the current delay is noncausal.
|
|
virtual bool CausalDelay(size_t delay) const = 0;
|
|
|
|
// Returns the maximum non calusal offset that can occur in the delay buffer.
|
|
static int DelayEstimatorOffset(const EchoCanceller3Config& config);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_
|