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

Unified Diff: webrtc/media/engine/webrtcvoiceengine.h

Issue 2985633002: Avoid that previous settings in APM are overwritten by WebRtcVoiceEngine (Closed)
Patch Set: Added solution based on ReturnPointee and SaveArg Created 3 years, 5 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/media/engine/webrtcvoiceengine.h
diff --git a/webrtc/media/engine/webrtcvoiceengine.h b/webrtc/media/engine/webrtcvoiceengine.h
index 93101fcc00a126ebd370091e2e116ab54d7b9f25..f93844684220b1246b71498c33bb6a9aa854c608 100644
--- a/webrtc/media/engine/webrtcvoiceengine.h
+++ b/webrtc/media/engine/webrtcvoiceengine.h
@@ -101,8 +101,8 @@ class WebRtcVoiceEngine final : public webrtc::TraceCallback {
// Stops AEC dump.
void StopAecDump();
- const webrtc::AudioProcessing::Config& GetApmConfigForTest() const {
- return apm_config_;
+ const webrtc::AudioProcessing::Config GetApmConfigForTest() const {
+ return apm()->GetConfig();
}
private:
@@ -120,7 +120,7 @@ class WebRtcVoiceEngine final : public webrtc::TraceCallback {
std::unique_ptr<rtc::TaskQueue> low_priority_worker_queue_;
webrtc::AudioDeviceModule* adm();
- webrtc::AudioProcessing* apm();
+ webrtc::AudioProcessing* apm() const;
webrtc::voe::TransmitMixer* transmit_mixer();
AudioCodecs CollectCodecs(
@@ -160,8 +160,6 @@ class WebRtcVoiceEngine final : public webrtc::TraceCallback {
rtc::Optional<bool> intelligibility_enhancer_;
rtc::Optional<bool> level_control_;
- webrtc::AudioProcessing::Config apm_config_;
-
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceEngine);
};
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvoiceengine.cc » ('j') | webrtc/media/engine/webrtcvoiceengine_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698