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

Unified Diff: webrtc/media/engine/nullwebrtcvideoengine_unittest.cc

Issue 3008043002: Simplify passing video codec factories in media engine (Closed)
Patch Set: Created 3 years, 3 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/nullwebrtcvideoengine.h ('k') | webrtc/media/engine/webrtcmediaengine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
diff --git a/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc b/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
index e1a2964722171c6db2e09fc61752efd88e367297..5fa7b011f26361702c3713054358229d14c289d6 100644
--- a/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
+++ b/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
@@ -25,18 +25,14 @@ class WebRtcMediaEngineNullVideo
const rtc::scoped_refptr<webrtc::AudioEncoderFactory>&
audio_encoder_factory,
const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
- audio_decoder_factory,
- WebRtcVideoEncoderFactory* video_encoder_factory,
- WebRtcVideoDecoderFactory* video_decoder_factory)
+ audio_decoder_factory)
: CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(
- adm,
- audio_encoder_factory,
- audio_decoder_factory,
- nullptr,
- webrtc::AudioProcessing::Create()) {
- video_.SetExternalDecoderFactory(video_decoder_factory);
- video_.SetExternalEncoderFactory(video_encoder_factory);
- }
+ std::forward_as_tuple(adm,
+ audio_encoder_factory,
+ audio_decoder_factory,
+ nullptr,
+ webrtc::AudioProcessing::Create()),
+ std::forward_as_tuple()) {}
};
// Simple test to check if NullWebRtcVideoEngine implements the methods
@@ -44,7 +40,7 @@ class WebRtcMediaEngineNullVideo
TEST(NullWebRtcVideoEngineTest, CheckInterface) {
WebRtcMediaEngineNullVideo engine(
nullptr, webrtc::MockAudioEncoderFactory::CreateUnusedFactory(),
- webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr, nullptr);
+ webrtc::MockAudioDecoderFactory::CreateUnusedFactory());
EXPECT_TRUE(engine.Init());
}
« no previous file with comments | « webrtc/media/engine/nullwebrtcvideoengine.h ('k') | webrtc/media/engine/webrtcmediaengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698