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

Unified Diff: webrtc/video/video_quality_test.cc

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/test/mock_voice_engine.h ('k') | webrtc/voice_engine/include/voe_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/video_quality_test.cc
diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc
index 37b47867d31db785967a08ef71384862c40651da..3f0465d361a47e6f90b3033f224df3de9eeae192 100644
--- a/webrtc/video/video_quality_test.cc
+++ b/webrtc/video/video_quality_test.cc
@@ -79,12 +79,13 @@ struct VoiceEngineState {
int receive_channel_id;
};
-void CreateVoiceEngine(VoiceEngineState* voe,
- rtc::scoped_refptr<webrtc::AudioDecoderFactory>
- decoder_factory) {
+void CreateVoiceEngine(
+ VoiceEngineState* voe,
+ webrtc::AudioProcessing* apm,
+ rtc::scoped_refptr<webrtc::AudioDecoderFactory> decoder_factory) {
voe->voice_engine = webrtc::VoiceEngine::Create();
voe->base = webrtc::VoEBase::GetInterface(voe->voice_engine);
- EXPECT_EQ(0, voe->base->Init(nullptr, nullptr, decoder_factory));
+ EXPECT_EQ(0, voe->base->Init(nullptr, apm, decoder_factory));
webrtc::VoEBase::ChannelConfig config;
config.enable_voice_pacing = true;
voe->send_channel_id = voe->base->CreateChannel(config);
@@ -1849,11 +1850,15 @@ void VideoQualityTest::RunWithRenderers(const Params& params) {
call_config.bitrate_config = params_.call.call_bitrate_config;
::VoiceEngineState voe;
+ rtc::scoped_refptr<webrtc::AudioProcessing> audio_processing(
+ webrtc::AudioProcessing::Create());
+
if (params_.audio.enabled) {
- CreateVoiceEngine(&voe, decoder_factory_);
+ CreateVoiceEngine(&voe, audio_processing.get(), decoder_factory_);
AudioState::Config audio_state_config;
audio_state_config.voice_engine = voe.voice_engine;
audio_state_config.audio_mixer = AudioMixerImpl::Create();
+ audio_state_config.audio_processing = audio_processing;
call_config.audio_state = AudioState::Create(audio_state_config);
}
« no previous file with comments | « webrtc/test/mock_voice_engine.h ('k') | webrtc/voice_engine/include/voe_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698