Support building WebRTC without audio and video for IOS.
Reorganized the targets in webrtc/sdk/BUILD.gn so that the applications which use
WebRTC DataChannel only can depend on the "peerconnection_factory_no_media"
instead of "rtc_sdk_objc" to reduce the binary size.
Provided a no-media implementation of RTCPeerConnectionFactory using the macro
"HAVE_NO_MEDIA".
BUG=webrtc:7613
Review-Url: https://codereview.webrtc.org/2944643002
Cr-Original-Commit-Position: refs/heads/master@{#18819}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: a4c113afe1378f00b791971b0ce28f4a06f312ac
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index a9fcfb6..798ebcc 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -102,19 +102,50 @@
]
if (is_clang) {
- # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+ # Suppress warnings from the Chromium Clang plugin
+ # (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
+
+ # Keep videotracksource related code in a separate target so that we can
+ # build PeerConnectionFactory without audio/video support when that's called
+ # for.
+ rtc_static_library("objc_videotracksource") {
+ sources = [
+ "objc/Framework/Classes/Video/RTCCVPixelBuffer.mm",
+ "objc/Framework/Classes/Video/RTCI420Buffer+Private.h",
+ "objc/Framework/Classes/Video/RTCI420Buffer.mm",
+ "objc/Framework/Classes/Video/objc_frame_buffer.h",
+ "objc/Framework/Classes/Video/objc_frame_buffer.mm",
+ "objc/Framework/Classes/Video/objcvideotracksource.h",
+ "objc/Framework/Classes/Video/objcvideotracksource.mm",
+ "objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h",
+ ]
+
+ deps = [
+ ":objc_common",
+ "../api:libjingle_peerconnection_api",
+ "../api:video_frame_api",
+ "../base:rtc_base",
+ "../common_video",
+ "../media:rtc_media_base",
+ ]
+
+ configs += [ "..:common_objc" ]
+ 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_static_library("objc_video") {
sources = [
"objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.h",
"objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.mm",
- "objc/Framework/Classes/Video/RTCCVPixelBuffer.mm",
"objc/Framework/Classes/Video/RTCDefaultShader.h",
"objc/Framework/Classes/Video/RTCDefaultShader.mm",
- "objc/Framework/Classes/Video/RTCI420Buffer+Private.h",
- "objc/Framework/Classes/Video/RTCI420Buffer.mm",
"objc/Framework/Classes/Video/RTCI420TextureCache.h",
"objc/Framework/Classes/Video/RTCI420TextureCache.mm",
"objc/Framework/Classes/Video/RTCOpenGLDefines.h",
@@ -124,11 +155,6 @@
"objc/Framework/Classes/Video/avfoundationformatmapper.mm",
"objc/Framework/Classes/Video/avfoundationvideocapturer.h",
"objc/Framework/Classes/Video/avfoundationvideocapturer.mm",
- "objc/Framework/Classes/Video/objc_frame_buffer.h",
- "objc/Framework/Classes/Video/objc_frame_buffer.mm",
- "objc/Framework/Classes/Video/objcvideotracksource.h",
- "objc/Framework/Classes/Video/objcvideotracksource.mm",
- "objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h",
]
libs = []
if (is_ios) {
@@ -153,6 +179,7 @@
deps = [
":objc_common",
+ ":objc_videotracksource",
"../api:libjingle_peerconnection_api",
"../base:rtc_base",
"../common_video",
@@ -161,7 +188,8 @@
configs += [ "..:common_objc" ]
if (!build_with_chromium && is_clang) {
- # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+ # Suppress warnings from the Chromium Clang plugin
+ # (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
@@ -230,11 +258,119 @@
sources = [
"objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource+Private.h",
"objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource.mm",
+ "objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m",
+ "objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h",
+ ]
+ if (is_ios) {
+ sources += [
+ "objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.h",
+ "objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.m",
+ ]
+ }
+ libs = [ "AVFoundation.framework" ]
+
+ if (is_ios) {
+ libs += [ "CoreGraphics.framework" ]
+ }
+
+ configs += [ "..:common_objc" ]
+
+ public_configs = [ ":objc_common_config" ]
+
+ 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" ]
+ }
+
+ deps = [
+ ":objc_common",
+ ":objc_corevideoframebuffer",
+ ":objc_peerconnectionfactory",
+ ":objc_video",
+ "../api:video_frame_api",
+ "../base:rtc_base",
+ "../media:rtc_media_base",
+ "../pc:libjingle_peerconnection",
+ ]
+
+ if (rtc_use_metal_rendering) {
+ deps += [ ":objc_metal" ]
+ }
+
+ if (rtc_build_libyuv) {
+ deps += [ "$rtc_libyuv_dir" ]
+ public_deps = [
+ "$rtc_libyuv_dir",
+ ]
+ }
+ }
+
+ rtc_static_library("objc_peerconnectionfactory") {
+ sources = [
+ "objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm",
+ ]
+
+ public_configs = [ ":objc_common_config" ]
+
+ 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" ]
+ }
+
+ deps = [
+ ":objc_common",
+ ":objc_corevideoframebuffer",
+ ":objc_peerconnectionfactory_base",
+ ":objc_video",
+ ":objc_videotoolbox",
+ "../api:video_frame_api",
+ "../base:rtc_base",
+ "../media:rtc_media_base",
+ "../pc:create_pc_factory",
+ "../pc:peerconnection",
+ ]
+ }
+
+ # Build the PeerConnectionFactory without audio/video support.
+ # This target depends on the objc_peeerconnectionfactory_base which still
+ # includes some audio/video related objects such as RTCAudioSource because
+ # these objects are just thin wrappers of native C++ interfaces required
+ # when implementing webrtc::PeerConnectionFactoryInterface and
+ # webrtc::PeerConnectionInterface.
+ # The applications which only use WebRTC DataChannel can depend on this
+ # target instead of rtc_sdk_objc.
+ rtc_static_library("objc_peerconnectionfactory_no_media") {
+ defines = [ "HAVE_NO_MEDIA" ]
+
+ sources = [
+ "objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm",
+ ]
+
+ public_configs = [ ":objc_common_config" ]
+
+ 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" ]
+ }
+
+ deps = [
+ ":objc_peerconnectionfactory_base",
+ "../api:libjingle_peerconnection_api",
+ "../base:rtc_base",
+ ]
+ }
+
+ rtc_static_library("objc_peerconnectionfactory_base") {
+ sources = [
"objc/Framework/Classes/PeerConnection/RTCAudioSource+Private.h",
"objc/Framework/Classes/PeerConnection/RTCAudioSource.mm",
"objc/Framework/Classes/PeerConnection/RTCAudioTrack+Private.h",
"objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm",
- "objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m",
"objc/Framework/Classes/PeerConnection/RTCConfiguration+Private.h",
"objc/Framework/Classes/PeerConnection/RTCConfiguration.mm",
"objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h",
@@ -262,8 +398,6 @@
"objc/Framework/Classes/PeerConnection/RTCPeerConnection+Private.h",
"objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm",
"objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm",
- "objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h",
- "objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm",
"objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters+Private.h",
"objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm",
"objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters+Private.h",
@@ -290,7 +424,6 @@
"objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h",
"objc/Framework/Headers/WebRTC/RTCAudioSource.h",
"objc/Framework/Headers/WebRTC/RTCAudioTrack.h",
- "objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h",
"objc/Framework/Headers/WebRTC/RTCConfiguration.h",
"objc/Framework/Headers/WebRTC/RTCDataChannel.h",
"objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h",
@@ -321,49 +454,27 @@
"objc/Framework/Headers/WebRTC/RTCVideoTrack.h",
"objc/Framework/Headers/WebRTC/RTCVideoViewShading.h",
]
- if (is_ios) {
- sources += [
- "objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.h",
- "objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.m",
- ]
- }
- libs = [ "AVFoundation.framework" ]
-
- if (is_ios) {
- libs += [ "CoreGraphics.framework" ]
- }
configs += [ "..:common_objc" ]
public_configs = [ ":objc_common_config" ]
if (!build_with_chromium && is_clang) {
- # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+ # Suppress warnings from the Chromium Clang plugin
+ # (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
":objc_common",
":objc_corevideoframebuffer",
- ":objc_video",
- ":objc_videotoolbox",
+ ":objc_videotracksource",
"../api:video_frame_api",
"../base:rtc_base",
"../common_video",
"../media:rtc_media_base",
- "../pc:libjingle_peerconnection",
+ "../pc:peerconnection",
]
-
- if (rtc_use_metal_rendering) {
- deps += [ ":objc_metal" ]
- }
-
- if (rtc_build_libyuv) {
- deps += [ "$rtc_libyuv_dir" ]
- public_deps = [
- "$rtc_libyuv_dir",
- ]
- }
}
if (rtc_include_tests) {
@@ -423,7 +534,8 @@
}
}
if (!build_with_chromium && is_clang) {
- # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+ # Suppress warnings from the Chromium Clang plugin
+ # (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
@@ -518,7 +630,8 @@
public_configs = [ ":objc_common_config" ]
if (!build_with_chromium && is_clang) {
- # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163)
+ # Suppress warnings from the Chromium Clang plugin
+ # (bugs.webrtc.org/163).
configs -= [ "//build/config/clang:find_bad_constructs" ]
}
}
@@ -546,7 +659,8 @@
]
if (!build_with_chromium && is_clang) {
- # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+ # Suppress warnings from the Chromium Clang plugin
+ # (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
@@ -571,6 +685,7 @@
deps = [
":objc_common",
":objc_video",
+ ":objc_videotracksource",
"../base:rtc_base_approved",
"../common_video",
"../media:rtc_media",
@@ -589,7 +704,8 @@
]
if (!build_with_chromium && is_clang) {
- # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+ # Suppress warnings from the Chromium Clang plugin
+ # (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm
index a883587..7accdbb 100644
--- a/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm
+++ b/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm
@@ -24,6 +24,12 @@
#include "Video/objcvideotracksource.h"
#include "VideoToolbox/videocodecfactory.h"
#include "webrtc/api/videosourceproxy.h"
+// Adding the nogncheck to disable the including header check.
+// The no-media version PeerConnectionFactory doesn't depend on media related
+// C++ target.
+// TODO(zhihuang): Remove nogncheck once MediaEngineInterface is moved to C++
+// API layer.
+#include "webrtc/media/engine/webrtcmediaengine.h" // nogncheck
@implementation RTCPeerConnectionFactory {
std::unique_ptr<rtc::Thread> _networkThread;
@@ -47,7 +53,21 @@
_signalingThread = rtc::Thread::Create();
result = _signalingThread->Start();
NSAssert(result, @"Failed to start signaling thread.");
-
+#ifdef HAVE_NO_MEDIA
+ _nativeFactory = webrtc::CreateModularPeerConnectionFactory(
+ _networkThread.get(),
+ _workerThread.get(),
+ _signalingThread.get(),
+ nullptr, // default_adm
+ nullptr, // audio_encoder_factory
+ nullptr, // audio_decoder_factory
+ nullptr, // video_encoder_factory
+ nullptr, // video_decoder_factory
+ nullptr, // audio_mixer
+ std::unique_ptr<cricket::MediaEngineInterface>(),
+ std::unique_ptr<webrtc::CallFactoryInterface>(),
+ std::unique_ptr<webrtc::RtcEventLogFactoryInterface>());
+#else
const auto encoder_factory = new webrtc::VideoToolboxVideoEncoderFactory();
const auto decoder_factory = new webrtc::VideoToolboxVideoDecoderFactory();
@@ -56,6 +76,7 @@
_nativeFactory = webrtc::CreatePeerConnectionFactory(
_networkThread.get(), _workerThread.get(), _signalingThread.get(),
nullptr, encoder_factory, decoder_factory);
+#endif
NSAssert(_nativeFactory, @"Failed to initialize PeerConnectionFactory!");
}
return self;
@@ -85,8 +106,11 @@
- (RTCAVFoundationVideoSource *)avFoundationVideoSourceWithConstraints:
(nullable RTCMediaConstraints *)constraints {
- return [[RTCAVFoundationVideoSource alloc] initWithFactory:self
- constraints:constraints];
+#ifdef HAVE_NO_MEDIA
+ return nil;
+#else
+ return [[RTCAVFoundationVideoSource alloc] initWithFactory:self constraints:constraints];
+#endif
}
- (RTCVideoSource *)videoSource {
