webrtc/modules/audio_processing/audio_processing_impl.h - Issue 2090583002: New module for the adaptive level controlling functionality in the audio processing module

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2090583002: New module for the adaptive level controlling functionality in the audio processing module (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Temporarily deactivated the level controller until the CL with the proper tuning has been landed Created 4 years, 6 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

« no previous file with comments | « webrtc/modules/audio_processing/audio_processing.gypi ('k') | webrtc/modules/audio_processing/audio_processing_impl.cc » ('j') | webrtc/webrtc_tests.gypi » ('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 04ddabd1c7f205ba79bd53cb0137f00b385a2c42..a79d0289e37b5e18112c99fd2bac26eaa2f5bced 100644

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

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

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

EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);

int InitializeLocked(const ProcessingConfig& config)

EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);

+ void InitializeLevelController() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);

// Capture-side exclusive methods possibly running APM in a multi-threaded

// manner that are called with the render lock already acquired.

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

struct ApmCaptureNonLockedState {

ApmCaptureNonLockedState(bool beamformer_enabled,

- bool intelligibility_enabled)

+ bool intelligibility_enabled,

+ bool level_controller_enabled)

: fwd_proc_format(kSampleRate16kHz),

split_rate(kSampleRate16kHz),

stream_delay_ms(0),

beamformer_enabled(beamformer_enabled),

- intelligibility_enabled(intelligibility_enabled) {}

+ intelligibility_enabled(intelligibility_enabled),

+ level_controller_enabled(level_controller_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_.

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

int stream_delay_ms;

bool beamformer_enabled;

bool intelligibility_enabled;

+ bool level_controller_enabled;

} capture_nonlocked_;

struct ApmRenderState {