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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2539213003: Support external audio mixer. (Closed)
Patch Set: Review response Created 4 years 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
« webrtc/audio/audio_receive_stream.cc ('K') | « webrtc/media/base/mediaengine.h ('k') | webrtc/media/engine/webrtcmediaengine.h » ('j') | webrtc/media/engine/webrtcmediaengine.cc » ('J')
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 c63dbfb0109b623149fab5e2a4ab1549aef3f671..a8f2421610243413b927f907d7bdc0fbbdb84938 100644
--- a/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
+++ b/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc
@@ -25,7 +25,9 @@ class WebRtcMediaEngineNullVideo
WebRtcVideoEncoderFactory* video_encoder_factory,
WebRtcVideoDecoderFactory* video_decoder_factory)
: CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(
- adm, audio_decoder_factory) {
+ adm,
+ audio_decoder_factory,
+ nullptr) {
video_.SetExternalDecoderFactory(video_decoder_factory);
video_.SetExternalEncoderFactory(video_encoder_factory);
}
« webrtc/audio/audio_receive_stream.cc ('K') | « webrtc/media/base/mediaengine.h ('k') | webrtc/media/engine/webrtcmediaengine.h » ('j') | webrtc/media/engine/webrtcmediaengine.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698