Move webrtc::CreatePeerConnectionFactory definition next to decl.
This CL moves webrtc::CreatePeerConnectionFactory definitions out of
pc:create_pc_factory and merges it with its declaration in the api/
directory.
In order to avoid circular dependencies a new build target is created:
* api:create_peerconnection_factory
Bug: webrtc:9862
Change-Id: Ie215c94460cba026f5bf7d11c9a5aa03792064af
Reviewed-on: https://webrtc-review.googlesource.com/c/111186
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25744}diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 4be6052..61df92f 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -218,42 +218,6 @@
]
}
-# This target implements CreatePeerConnectionFactory methods that will create a
-# PeerConnection will full functionality (audio, video and data). Applications
-# that wish to reduce their binary size by ommitting functionality they don't
-# need should use CreateModularCreatePeerConnectionFactory instead, using the
-# "peerconnection" build target and other targets specific to their
-# requrements. See comment in peerconnectionfactoryinterface.h.
-rtc_static_library("create_pc_factory") {
- sources = [
- "createpeerconnectionfactory.cc",
- ]
-
- deps = [
- "../api:callfactory_api",
- "../api:libjingle_peerconnection_api",
- "../api/audio:audio_mixer_api",
- "../api/audio_codecs:audio_codecs_api",
- "../api/video_codecs:video_codecs_api",
- "../call",
- "../call:call_interfaces",
- "../logging:rtc_event_log_api",
- "../logging:rtc_event_log_impl_base",
- "../media:rtc_audio_video",
- "../media:rtc_media_base",
- "../modules/audio_device:audio_device",
- "../modules/audio_processing:api",
- "../modules/audio_processing:audio_processing",
- "../rtc_base:rtc_base",
- "../rtc_base:rtc_base_approved",
- ]
-
- if (!build_with_chromium && is_clang) {
- # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
- suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
- }
-}
-
rtc_source_set("libjingle_peerconnection") {
visibility = [ "*" ]
allow_poison = [
@@ -261,8 +225,8 @@
"software_video_codecs", # TODO(bugs.webrtc.org/7925): Remove.
]
deps = [
- ":create_pc_factory",
":peerconnection",
+ "../api:create_peerconnection_factory",
"../api:libjingle_peerconnection_api",
]
}
@@ -343,6 +307,7 @@
]
deps = [
":pc_test_utils",
+ "../api:create_peerconnection_factory",
"../api:libjingle_peerconnection_api",
"../api:rtc_stats_api",
"../api/audio_codecs:builtin_audio_decoder_factory",
@@ -397,6 +362,7 @@
":peerconnection",
":rtc_pc_base",
"..:webrtc_common",
+ "../api:create_peerconnection_factory",
"../api:libjingle_peerconnection_api",
"../api:libjingle_peerconnection_test_api",
"../api:rtc_stats_api",
@@ -485,6 +451,7 @@
deps = [
":peerconnection",
":rtc_pc_base",
+ "../api:create_peerconnection_factory",
"../api:fake_frame_decryptor",
"../api:fake_frame_encryptor",
"../api:libjingle_peerconnection_api",
diff --git a/pc/createpeerconnectionfactory.cc b/pc/createpeerconnectionfactory.cc
deleted file mode 100644
index b1db690..0000000
--- a/pc/createpeerconnectionfactory.cc
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright 2017 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "api/call/callfactoryinterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/video_codecs/video_decoder_factory.h"
-#include "api/video_codecs/video_encoder_factory.h"
-#include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
-#include "media/engine/webrtcmediaengine.h"
-#include "modules/audio_device/include/audio_device.h"
-#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/bind.h"
-#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/thread.h"
-
-namespace webrtc {
-
-#if defined(USE_BUILTIN_SW_CODECS)
-rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
- rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
- rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory) {
- return CreatePeerConnectionFactoryWithAudioMixer(
- nullptr /*network_thread*/, nullptr /*worker_thread*/,
- nullptr /*signaling_thread*/, nullptr /*default_adm*/,
- audio_encoder_factory, audio_decoder_factory,
- nullptr /*video_encoder_factory*/, nullptr /*video_decoder_factory*/,
- nullptr /*audio_mixer*/);
-}
-
-// Note: all the other CreatePeerConnectionFactory variants just end up calling
-// this, ultimately.
-rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
- rtc::Thread* network_thread,
- rtc::Thread* worker_thread,
- rtc::Thread* signaling_thread,
- AudioDeviceModule* default_adm,
- rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
- rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
- cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
- cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
- rtc::scoped_refptr<AudioMixer> audio_mixer,
- rtc::scoped_refptr<AudioProcessing> audio_processing) {
- rtc::scoped_refptr<AudioProcessing> audio_processing_use = audio_processing;
- if (!audio_processing_use) {
- audio_processing_use = AudioProcessingBuilder().Create();
- }
-
- std::unique_ptr<cricket::MediaEngineInterface> media_engine(
- cricket::WebRtcMediaEngineFactory::Create(
- default_adm, audio_encoder_factory, audio_decoder_factory,
- video_encoder_factory, video_decoder_factory, audio_mixer,
- audio_processing_use));
-
- std::unique_ptr<CallFactoryInterface> call_factory = CreateCallFactory();
-
- std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory =
- CreateRtcEventLogFactory();
-
- return CreateModularPeerConnectionFactory(
- network_thread, worker_thread, signaling_thread, std::move(media_engine),
- std::move(call_factory), std::move(event_log_factory));
-}
-
-rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
- rtc::Thread* network_thread,
- rtc::Thread* worker_thread,
- rtc::Thread* signaling_thread,
- AudioDeviceModule* default_adm,
- rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
- rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
- cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
- cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
- rtc::scoped_refptr<AudioMixer> audio_mixer,
- rtc::scoped_refptr<AudioProcessing> audio_processing,
- std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory,
- std::unique_ptr<NetworkControllerFactoryInterface>
- network_controller_factory) {
- rtc::scoped_refptr<AudioProcessing> audio_processing_use = audio_processing;
- if (!audio_processing_use) {
- audio_processing_use = AudioProcessingBuilder().Create();
- }
-
- std::unique_ptr<cricket::MediaEngineInterface> media_engine(
- cricket::WebRtcMediaEngineFactory::Create(
- default_adm, audio_encoder_factory, audio_decoder_factory,
- video_encoder_factory, video_decoder_factory, audio_mixer,
- audio_processing_use));
-
- std::unique_ptr<CallFactoryInterface> call_factory = CreateCallFactory();
-
- std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory =
- CreateRtcEventLogFactory();
-
- return CreateModularPeerConnectionFactory(
- network_thread, worker_thread, signaling_thread, std::move(media_engine),
- std::move(call_factory), std::move(event_log_factory),
- std::move(fec_controller_factory), std::move(network_controller_factory));
-}
-#endif
-
-rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
- rtc::Thread* network_thread,
- rtc::Thread* worker_thread,
- rtc::Thread* signaling_thread,
- rtc::scoped_refptr<AudioDeviceModule> default_adm,
- rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
- rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
- std::unique_ptr<VideoEncoderFactory> video_encoder_factory,
- std::unique_ptr<VideoDecoderFactory> video_decoder_factory,
- rtc::scoped_refptr<AudioMixer> audio_mixer,
- rtc::scoped_refptr<AudioProcessing> audio_processing) {
- if (!audio_processing)
- audio_processing = AudioProcessingBuilder().Create();
-
- std::unique_ptr<cricket::MediaEngineInterface> media_engine =
- cricket::WebRtcMediaEngineFactory::Create(
- default_adm, audio_encoder_factory, audio_decoder_factory,
- std::move(video_encoder_factory), std::move(video_decoder_factory),
- audio_mixer, audio_processing);
-
- std::unique_ptr<CallFactoryInterface> call_factory = CreateCallFactory();
-
- std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory =
- CreateRtcEventLogFactory();
- PeerConnectionFactoryDependencies dependencies;
- dependencies.network_thread = network_thread;
- dependencies.worker_thread = worker_thread;
- dependencies.signaling_thread = signaling_thread;
- dependencies.media_engine = std::move(media_engine);
- dependencies.call_factory = std::move(call_factory);
- dependencies.event_log_factory = std::move(event_log_factory);
- return CreateModularPeerConnectionFactory(std::move(dependencies));
-}
-
-#if defined(USE_BUILTIN_SW_CODECS)
-rtc::scoped_refptr<PeerConnectionFactoryInterface>
-CreatePeerConnectionFactoryWithAudioMixer(
- rtc::Thread* network_thread,
- rtc::Thread* worker_thread,
- rtc::Thread* signaling_thread,
- AudioDeviceModule* default_adm,
- rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
- rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
- cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
- cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
- rtc::scoped_refptr<AudioMixer> audio_mixer) {
- return CreatePeerConnectionFactory(
- network_thread, worker_thread, signaling_thread, default_adm,
- audio_encoder_factory, audio_decoder_factory, video_encoder_factory,
- video_decoder_factory, audio_mixer, nullptr);
-}
-
-rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
- rtc::Thread* network_thread,
- rtc::Thread* worker_thread,
- rtc::Thread* signaling_thread,
- AudioDeviceModule* default_adm,
- rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
- rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
- cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
- cricket::WebRtcVideoDecoderFactory* video_decoder_factory) {
- return CreatePeerConnectionFactoryWithAudioMixer(
- network_thread, worker_thread, signaling_thread, default_adm,
- audio_encoder_factory, audio_decoder_factory, video_encoder_factory,
- video_decoder_factory, nullptr);
-}
-#endif
-
-} // namespace webrtc
diff --git a/pc/peerconnection_bundle_unittest.cc b/pc/peerconnection_bundle_unittest.cc
index 907669b..6c372b4 100644
--- a/pc/peerconnection_bundle_unittest.cc
+++ b/pc/peerconnection_bundle_unittest.cc
@@ -10,6 +10,7 @@
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/create_peerconnection_factory.h"
#include "api/peerconnectionproxy.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
diff --git a/pc/peerconnection_crypto_unittest.cc b/pc/peerconnection_crypto_unittest.cc
index 369a909..6f7e23b 100644
--- a/pc/peerconnection_crypto_unittest.cc
+++ b/pc/peerconnection_crypto_unittest.cc
@@ -10,6 +10,7 @@
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/create_peerconnection_factory.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
#include "p2p/base/fakeportallocator.h"
diff --git a/pc/peerconnection_ice_unittest.cc b/pc/peerconnection_ice_unittest.cc
index e015abf..928549f 100644
--- a/pc/peerconnection_ice_unittest.cc
+++ b/pc/peerconnection_ice_unittest.cc
@@ -21,6 +21,7 @@
#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/create_peerconnection_factory.h"
#include "api/peerconnectionproxy.h"
#include "api/umametrics.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
diff --git a/pc/peerconnection_rampup_tests.cc b/pc/peerconnection_rampup_tests.cc
index 850212b..74f8018 100644
--- a/pc/peerconnection_rampup_tests.cc
+++ b/pc/peerconnection_rampup_tests.cc
@@ -10,6 +10,7 @@
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/create_peerconnection_factory.h"
#include "api/stats/rtcstats_objects.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
diff --git a/pc/peerconnection_rtp_unittest.cc b/pc/peerconnection_rtp_unittest.cc
index 8128584..7098470 100644
--- a/pc/peerconnection_rtp_unittest.cc
+++ b/pc/peerconnection_rtp_unittest.cc
@@ -14,6 +14,7 @@
#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/create_peerconnection_factory.h"
#include "api/jsep.h"
#include "api/mediastreaminterface.h"
#include "api/peerconnectioninterface.h"
diff --git a/pc/peerconnection_signaling_unittest.cc b/pc/peerconnection_signaling_unittest.cc
index 5fba90d..f57f806 100644
--- a/pc/peerconnection_signaling_unittest.cc
+++ b/pc/peerconnection_signaling_unittest.cc
@@ -15,6 +15,7 @@
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/create_peerconnection_factory.h"
#include "api/peerconnectionproxy.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
diff --git a/pc/peerconnectionfactory_unittest.cc b/pc/peerconnectionfactory_unittest.cc
index 84c828f..2444143 100644
--- a/pc/peerconnectionfactory_unittest.cc
+++ b/pc/peerconnectionfactory_unittest.cc
@@ -15,6 +15,7 @@
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/create_peerconnection_factory.h"
#include "api/mediastreaminterface.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
diff --git a/pc/peerconnectioninterface_unittest.cc b/pc/peerconnectioninterface_unittest.cc
index fe8fd8d..dd5d0d1 100644
--- a/pc/peerconnectioninterface_unittest.cc
+++ b/pc/peerconnectioninterface_unittest.cc
@@ -17,6 +17,7 @@
#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/create_peerconnection_factory.h"
#include "api/jsepsessiondescription.h"
#include "api/mediastreaminterface.h"
#include "api/peerconnectioninterface.h"
diff --git a/pc/test/peerconnectiontestwrapper.cc b/pc/test/peerconnectiontestwrapper.cc
index 9be1596..0010edb 100644
--- a/pc/test/peerconnectiontestwrapper.cc
+++ b/pc/test/peerconnectiontestwrapper.cc
@@ -12,6 +12,7 @@
#include <utility>
#include <vector>
+#include "api/create_peerconnection_factory.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
#include "modules/audio_processing/include/audio_processing.h"
