| Index: webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
|
| diff --git a/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc b/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
|
| index 31a2754e19a7a9eb4de357805f67a981556ffe3e..79ccf2535d7d689fb396482e477690e4bf369d5c 100644
|
| --- a/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
|
| +++ b/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
|
| @@ -18,19 +18,24 @@ namespace cricket {
|
| class WebRtcMediaEngineNullVideo
|
| : public CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine> {
|
| public:
|
| - WebRtcMediaEngineNullVideo(webrtc::AudioDeviceModule* adm,
|
| - WebRtcVideoEncoderFactory* encoder_factory,
|
| - WebRtcVideoDecoderFactory* decoder_factory)
|
| - : CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(adm) {
|
| - video_.SetExternalDecoderFactory(decoder_factory);
|
| - video_.SetExternalEncoderFactory(encoder_factory);
|
| + WebRtcMediaEngineNullVideo(
|
| + webrtc::AudioDeviceModule* adm,
|
| + std::shared_ptr<webrtc::AudioDecoderFactory> audio_decoder_factory,
|
| + WebRtcVideoEncoderFactory* video_encoder_factory,
|
| + WebRtcVideoDecoderFactory* video_decoder_factory)
|
| + : CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(
|
| + adm, std::move(audio_decoder_factory)) {
|
| + video_.SetExternalDecoderFactory(video_decoder_factory);
|
| + video_.SetExternalEncoderFactory(video_encoder_factory);
|
| }
|
| };
|
|
|
| // Simple test to check if NullWebRtcVideoEngine implements the methods
|
| // required by CompositeMediaEngine.
|
| TEST(NullWebRtcVideoEngineTest, CheckInterface) {
|
| - WebRtcMediaEngineNullVideo engine(nullptr, nullptr, nullptr);
|
| + WebRtcMediaEngineNullVideo engine(
|
| + nullptr, std::shared_ptr<webrtc::AudioDecoderFactory>(),
|
| + nullptr, nullptr);
|
| EXPECT_TRUE(engine.Init());
|
| }
|
|
|
|
|