Index: webrtc/media/engine/webrtcvoiceengine_unittest.cc |
diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc |
index 98a9101811fa7b90bbda8acbe4e24e06ac673ae3..0a7955c0175752dc00ffcb4ce37cedb380d9f535 100644 |
--- a/webrtc/media/engine/webrtcvoiceengine_unittest.cc |
+++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc |
@@ -134,7 +134,7 @@ TEST(WebRtcVoiceEngineTestStubLibrary, StartupShutdown) { |
cricket::WebRtcVoiceEngine engine( |
&adm, webrtc::MockAudioEncoderFactory::CreateUnusedFactory(), |
webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr, |
- new FakeVoEWrapper(&voe)); |
+ nullptr, new FakeVoEWrapper(&voe)); |
EXPECT_TRUE(voe.IsInited()); |
} |
EXPECT_FALSE(voe.IsInited()); |
@@ -184,9 +184,9 @@ class WebRtcVoiceEngineTestFake : public testing::Test { |
// factories. Those tests should probably be moved elsewhere. |
auto encoder_factory = webrtc::CreateBuiltinAudioEncoderFactory(); |
auto decoder_factory = webrtc::CreateBuiltinAudioDecoderFactory(); |
- engine_.reset(new cricket::WebRtcVoiceEngine(&adm_, encoder_factory, |
- decoder_factory, nullptr, |
- new FakeVoEWrapper(&voe_))); |
+ engine_.reset(new cricket::WebRtcVoiceEngine( |
+ &adm_, encoder_factory, decoder_factory, nullptr, nullptr, |
+ new FakeVoEWrapper(&voe_))); |
send_parameters_.codecs.push_back(kPcmuCodec); |
recv_parameters_.codecs.push_back(kPcmuCodec); |
// Default Options. |
@@ -3262,7 +3262,7 @@ TEST(WebRtcVoiceEngineTest, StartupShutdown) { |
// we never want it to create a decoder at this stage. |
cricket::WebRtcVoiceEngine engine( |
nullptr, webrtc::MockAudioEncoderFactory::CreateUnusedFactory(), |
- webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr); |
+ webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr, nullptr); |
webrtc::RtcEventLogNullImpl event_log; |
std::unique_ptr<webrtc::Call> call( |
webrtc::Call::Create(webrtc::Call::Config(&event_log))); |
@@ -3283,7 +3283,8 @@ TEST(WebRtcVoiceEngineTest, StartupShutdownWithExternalADM) { |
{ |
cricket::WebRtcVoiceEngine engine( |
&adm, webrtc::MockAudioEncoderFactory::CreateUnusedFactory(), |
- webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr); |
+ webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr, |
+ nullptr); |
webrtc::RtcEventLogNullImpl event_log; |
std::unique_ptr<webrtc::Call> call( |
webrtc::Call::Create(webrtc::Call::Config(&event_log))); |
@@ -3300,7 +3301,7 @@ TEST(WebRtcVoiceEngineTest, HasCorrectPayloadTypeMapping) { |
// type assignments checked here? It shouldn't really matter. |
cricket::WebRtcVoiceEngine engine( |
nullptr, webrtc::MockAudioEncoderFactory::CreateUnusedFactory(), |
- webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr); |
+ webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr, nullptr); |
for (const cricket::AudioCodec& codec : engine.send_codecs()) { |
auto is_codec = [&codec](const char* name, int clockrate = 0) { |
return STR_CASE_CMP(codec.name.c_str(), name) == 0 && |
@@ -3341,7 +3342,7 @@ TEST(WebRtcVoiceEngineTest, HasCorrectPayloadTypeMapping) { |
TEST(WebRtcVoiceEngineTest, Has32Channels) { |
cricket::WebRtcVoiceEngine engine( |
nullptr, webrtc::MockAudioEncoderFactory::CreateUnusedFactory(), |
- webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr); |
+ webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr, nullptr); |
webrtc::RtcEventLogNullImpl event_log; |
std::unique_ptr<webrtc::Call> call( |
webrtc::Call::Create(webrtc::Call::Config(&event_log))); |
@@ -3375,7 +3376,7 @@ TEST(WebRtcVoiceEngineTest, SetRecvCodecs) { |
// I think it will become clear once audio decoder injection is completed. |
cricket::WebRtcVoiceEngine engine( |
nullptr, webrtc::MockAudioEncoderFactory::CreateUnusedFactory(), |
- webrtc::CreateBuiltinAudioDecoderFactory(), nullptr); |
+ webrtc::CreateBuiltinAudioDecoderFactory(), nullptr, nullptr); |
webrtc::RtcEventLogNullImpl event_log; |
std::unique_ptr<webrtc::Call> call( |
webrtc::Call::Create(webrtc::Call::Config(&event_log))); |
@@ -3412,7 +3413,7 @@ TEST(WebRtcVoiceEngineTest, CollectRecvCodecs) { |
.WillOnce(Return(specs)); |
cricket::WebRtcVoiceEngine engine(nullptr, unused_encoder_factory, |
- mock_decoder_factory, nullptr); |
+ mock_decoder_factory, nullptr, nullptr); |
auto codecs = engine.recv_codecs(); |
EXPECT_EQ(11, codecs.size()); |