webrtc/modules/audio_processing/audio_processing_impl.h - Issue 2292863002: Introduced new scheme for controlling the functionality inside the audio processing module

Unified Diff: webrtc/modules/audio_processing/audio_processing_impl.h

Issue 2292863002: Introduced new scheme for controlling the functionality inside the audio processing module (Closed)

Patch Set: Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« webrtc/media/engine/webrtcvoiceengine.cc ('K') | « webrtc/media/engine/webrtcvoiceengine.cc ('k') | webrtc/modules/audio_processing/audio_processing_impl.cc » ('j') | webrtc/modules/audio_processing/audio_processing_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_processing/audio_processing_impl.h

diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h

index 4b9011dc8800910010666546f2897fde66691c47..8413c09d57591c842ebcde5c3f572b8f75b2be6c 100644

--- a/webrtc/modules/audio_processing/audio_processing_impl.h

+++ b/webrtc/modules/audio_processing/audio_processing_impl.h

@@ -46,6 +46,7 @@ class AudioProcessingImpl : public AudioProcessing {

// AudioProcessingImpl takes ownership of beamformer.

AudioProcessingImpl(const Config& config, NonlinearBeamformer* beamformer);

virtual ~AudioProcessingImpl();

+ int ApplySettings(const ApmSettings& settings) override;

the sun 2016/08/30 10:32:38 Call, AudioReceiveStream etc, use "Config" for the

hlundin-webrtc 2016/08/30 11:26:26 Acknowledged.

peah-webrtc 2016/08/30 17:05:57 Acknowledged.

peah-webrtc 2016/08/30 17:05:57 Done!

int Initialize() override;

int Initialize(int input_sample_rate_hz,

int output_sample_rate_hz,

@@ -322,14 +323,12 @@ class AudioProcessingImpl : public AudioProcessing {

struct ApmCaptureNonLockedState {

ApmCaptureNonLockedState(bool beamformer_enabled,

- bool intelligibility_enabled,

- bool level_controller_enabled)

+ bool intelligibility_enabled)

: fwd_proc_format(kSampleRate16kHz),

split_rate(kSampleRate16kHz),

stream_delay_ms(0),

beamformer_enabled(beamformer_enabled),

- intelligibility_enabled(intelligibility_enabled),

- level_controller_enabled(level_controller_enabled) {}

+ intelligibility_enabled(intelligibility_enabled) {}

// Only the rate and samples fields of fwd_proc_format_ are used because the

// forward processing number of channels is mutable and is tracked by the

// capture_audio_.

@@ -338,7 +337,7 @@ class AudioProcessingImpl : public AudioProcessing {

int stream_delay_ms;

bool beamformer_enabled;

bool intelligibility_enabled;

- bool level_controller_enabled;

+ bool level_controller_enabled = false;

} capture_nonlocked_;

struct ApmRenderState {