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

Unified Diff: webrtc/pc/peerconnectionfactory.cc

Issue 2854123003: Build WebRTC with data channel only. (Closed)
Patch Set: Add an end to end test for libjingle_peerconnection_datachannel_only. Make it 2.37Mb. Created 3 years, 7 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
Index: webrtc/pc/peerconnectionfactory.cc
diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc
index 777bac1eb59aadd49bcc9af1d44ac66e9d02276f..f0b112dda4058e8a3b1c3f9fb8a36cdef77b9d44 100644
--- a/webrtc/pc/peerconnectionfactory.cc
+++ b/webrtc/pc/peerconnectionfactory.cc
@@ -56,8 +56,14 @@ rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
rtc::scoped_refptr<PeerConnectionFactoryInterface>
CreatePeerConnectionFactory() {
- return CreatePeerConnectionFactory(CreateBuiltinAudioEncoderFactory(),
- CreateBuiltinAudioDecoderFactory());
+ rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory;
+ rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory;
+#if defined(HAVE_WEBRTC_VOICE) && defined(HAVE_WEBRTC_VIDEO)
+ audio_encoder_factory = CreateBuiltinAudioEncoderFactory();
+ audio_decoder_factory = CreateBuiltinAudioDecoderFactory();
+#endif
+ return CreatePeerConnectionFactory(audio_encoder_factory,
+ audio_decoder_factory);
}
rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
@@ -125,10 +131,16 @@ CreatePeerConnectionFactoryWithAudioMixer(
cricket::WebRtcVideoEncoderFactory* encoder_factory,
cricket::WebRtcVideoDecoderFactory* decoder_factory,
rtc::scoped_refptr<AudioMixer> audio_mixer) {
+ rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory;
+ rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory;
+#if defined(HAVE_WEBRTC_VOICE) && defined(HAVE_WEBRTC_VIDEO)
+ audio_encoder_factory = CreateBuiltinAudioEncoderFactory();
+ audio_decoder_factory = CreateBuiltinAudioDecoderFactory();
+#endif
return CreatePeerConnectionFactoryWithAudioMixer(
network_thread, worker_thread, signaling_thread, default_adm,
- CreateBuiltinAudioEncoderFactory(), CreateBuiltinAudioDecoderFactory(),
- encoder_factory, decoder_factory, audio_mixer);
+ audio_encoder_factory, audio_decoder_factory, encoder_factory,
+ decoder_factory, audio_mixer);
}
PeerConnectionFactory::PeerConnectionFactory(
@@ -385,12 +397,15 @@ rtc::Thread* PeerConnectionFactory::network_thread() {
std::unique_ptr<cricket::MediaEngineInterface>
PeerConnectionFactory::CreateMediaEngine_w() {
RTC_DCHECK(worker_thread_ == rtc::Thread::Current());
+#if defined(HAVE_WEBRTC_VOICE) && defined(HAVE_WEBRTC_VIDEO)
return std::unique_ptr<cricket::MediaEngineInterface>(
cricket::WebRtcMediaEngineFactory::Create(
- default_adm_.get(), audio_encoder_factory_,
- audio_decoder_factory_,
+ default_adm_.get(), audio_encoder_factory_, audio_decoder_factory_,
video_encoder_factory_.get(), video_decoder_factory_.get(),
external_audio_mixer_));
+#else
+ return std::unique_ptr<cricket::MediaEngineInterface>();
+#endif
}
} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698