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

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

Issue 2961723004: Allow an external audio processing module to be used in WebRTC (Closed)
Patch Set: Moved creation of APMs from CreateVoiceEngines Created 3 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/media/engine/apm_helpers_unittest.cc ('k') | webrtc/media/engine/nullwebrtcvideoengine_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/fakewebrtcvoiceengine.h
diff --git a/webrtc/media/engine/fakewebrtcvoiceengine.h b/webrtc/media/engine/fakewebrtcvoiceengine.h
index 13721ea5546c4a531c866628a24db273d6766d3f..f8343f2e49175ca75836e287a25d4a0c05530bea 100644
--- a/webrtc/media/engine/fakewebrtcvoiceengine.h
+++ b/webrtc/media/engine/fakewebrtcvoiceengine.h
@@ -16,7 +16,6 @@
#include "webrtc/base/checks.h"
#include "webrtc/media/engine/webrtcvoe.h"
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
namespace webrtc {
namespace voe {
@@ -42,10 +41,8 @@ class FakeWebRtcVoiceEngine : public webrtc::VoEBase {
bool neteq_fast_accelerate = false;
};
- explicit FakeWebRtcVoiceEngine(webrtc::AudioProcessing* apm,
- webrtc::voe::TransmitMixer* transmit_mixer)
- : apm_(apm), transmit_mixer_(transmit_mixer) {
- }
+ explicit FakeWebRtcVoiceEngine(webrtc::voe::TransmitMixer* transmit_mixer)
+ : transmit_mixer_(transmit_mixer) {}
~FakeWebRtcVoiceEngine() override {
RTC_CHECK(channels_.empty());
}
@@ -75,9 +72,9 @@ class FakeWebRtcVoiceEngine : public webrtc::VoEBase {
inited_ = false;
return 0;
}
- webrtc::AudioProcessing* audio_processing() override {
- return apm_;
- }
+ // TODO(peah): Remove this when downstream dependencies have properly been
+ // resolved.
+ webrtc::AudioProcessing* audio_processing() override { return nullptr; }
webrtc::AudioDeviceModule* audio_device_module() override {
return nullptr;
}
@@ -131,7 +128,6 @@ class FakeWebRtcVoiceEngine : public webrtc::VoEBase {
int last_channel_ = -1;
std::map<int, Channel*> channels_;
bool fail_create_channel_ = false;
- webrtc::AudioProcessing* apm_ = nullptr;
webrtc::voe::TransmitMixer* transmit_mixer_ = nullptr;
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FakeWebRtcVoiceEngine);
« no previous file with comments | « webrtc/media/engine/apm_helpers_unittest.cc ('k') | webrtc/media/engine/nullwebrtcvideoengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698