Index: webrtc/pc/peerconnectionfactory.cc |
diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc |
index 777bac1eb59aadd49bcc9af1d44ac66e9d02276f..e665c83523e06e355765b1f11797d32c69a51a7e 100644 |
--- a/webrtc/pc/peerconnectionfactory.cc |
+++ b/webrtc/pc/peerconnectionfactory.cc |
@@ -12,8 +12,6 @@ |
#include <utility> |
-#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" |
-#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" |
#include "webrtc/api/mediaconstraintsinterface.h" |
#include "webrtc/api/mediastreamproxy.h" |
#include "webrtc/api/mediastreamtrackproxy.h" |
@@ -22,10 +20,12 @@ |
#include "webrtc/api/videosourceproxy.h" |
#include "webrtc/base/bind.h" |
#include "webrtc/base/checks.h" |
-#include "webrtc/media/engine/webrtcmediaengine.h" |
-#include "webrtc/media/engine/webrtcvideodecoderfactory.h" |
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h" |
-#include "webrtc/modules/audio_device/include/audio_device.h" |
+// Adding 'nogncheck' to disable the gn include headers check to support modular |
+// WebRTC build targets. |
+#include "webrtc/media/engine/webrtcmediaengine.h" // nogncheck |
+#include "webrtc/media/engine/webrtcvideodecoderfactory.h" // nogncheck |
+#include "webrtc/media/engine/webrtcvideoencoderfactory.h" // nogncheck |
+#include "webrtc/modules/audio_device/include/audio_device.h" // nogncheck |
#include "webrtc/p2p/base/basicpacketsocketfactory.h" |
#include "webrtc/p2p/client/basicportallocator.h" |
#include "webrtc/pc/audiotrack.h" |
@@ -54,12 +54,6 @@ rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory( |
pc_factory); |
} |
-rtc::scoped_refptr<PeerConnectionFactoryInterface> |
-CreatePeerConnectionFactory() { |
- return CreatePeerConnectionFactory(CreateBuiltinAudioEncoderFactory(), |
- CreateBuiltinAudioDecoderFactory()); |
-} |
- |
rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory( |
rtc::Thread* network_thread, |
rtc::Thread* worker_thread, |
@@ -116,21 +110,6 @@ CreatePeerConnectionFactoryWithAudioMixer( |
return PeerConnectionFactoryProxy::Create(signaling_thread, pc_factory); |
} |
-rtc::scoped_refptr<PeerConnectionFactoryInterface> |
-CreatePeerConnectionFactoryWithAudioMixer( |
- rtc::Thread* network_thread, |
- rtc::Thread* worker_thread, |
- rtc::Thread* signaling_thread, |
- AudioDeviceModule* default_adm, |
- cricket::WebRtcVideoEncoderFactory* encoder_factory, |
- cricket::WebRtcVideoDecoderFactory* decoder_factory, |
- rtc::scoped_refptr<AudioMixer> audio_mixer) { |
- return CreatePeerConnectionFactoryWithAudioMixer( |
- network_thread, worker_thread, signaling_thread, default_adm, |
- CreateBuiltinAudioEncoderFactory(), CreateBuiltinAudioDecoderFactory(), |
- encoder_factory, decoder_factory, audio_mixer); |
-} |
- |
PeerConnectionFactory::PeerConnectionFactory( |
rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory, |
rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory) |