Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1121)

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

Issue 1801003002: Removed the dependency on AudioProcessingImpl in GainControlImpl (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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
Index: webrtc/modules/audio_processing/gain_control_impl.h
diff --git a/webrtc/modules/audio_processing/gain_control_impl.h b/webrtc/modules/audio_processing/gain_control_impl.h
index b5fe1e33ec4d39ad744134d82d1008b7816024ba..6841d5d4f508faedb27d28ab67756774505c8928 100644
--- a/webrtc/modules/audio_processing/gain_control_impl.h
+++ b/webrtc/modules/audio_processing/gain_control_impl.h
@@ -27,16 +27,15 @@ class AudioBuffer;
class GainControlImpl : public GainControl {
public:
- GainControlImpl(const AudioProcessing* apm,
- rtc::CriticalSection* crit_render,
+ GainControlImpl(rtc::CriticalSection* crit_render,
rtc::CriticalSection* crit_capture);
~GainControlImpl() override;
int ProcessRenderAudio(AudioBuffer* audio);
int AnalyzeCaptureAudio(AudioBuffer* audio);
- int ProcessCaptureAudio(AudioBuffer* audio);
+ int ProcessCaptureAudio(AudioBuffer* audio, bool stream_has_echo);
- void Initialize();
+ void Initialize(size_t num_proc_channels, int sample_rate_hz);
// GainControl implementation.
bool is_enabled() const override;
@@ -64,14 +63,9 @@ class GainControlImpl : public GainControl {
int analog_level_maximum() const override;
bool stream_is_saturated() const override;
- size_t num_handles_required() const;
-
void AllocateRenderQueue();
int Configure();
- // Not guarded as its public API is thread safe.
- const AudioProcessing* apm_;
-
rtc::CriticalSection* const crit_render_ ACQUIRED_BEFORE(crit_capture_);
rtc::CriticalSection* const crit_capture_;
@@ -99,6 +93,9 @@ class GainControlImpl : public GainControl {
std::vector<std::unique_ptr<GainController>> gain_controllers_;
+ rtc::Optional<size_t> num_proc_channels_ GUARDED_BY(crit_capture_);
+ rtc::Optional<int> sample_rate_hz_ GUARDED_BY(crit_capture_);
+
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(GainControlImpl);
};
} // namespace webrtc
« no previous file with comments | « webrtc/modules/audio_processing/audio_processing_impl.cc ('k') | webrtc/modules/audio_processing/gain_control_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698