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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/sdk/BUILD.gn

Issue 2890733003: Reland of Split iOS sdk in to separate targets (Closed)
Patch Set: 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
« no previous file with comments | « webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h ('k') | webrtc/sdk/objc/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/sdk/BUILD.gn
diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn
index fa44c48fb3ebcc9df38048a1a981cb85a9ca54ea..b1dc8a0f37950385f2419d2dc21be20581ee386e 100644
--- a/webrtc/sdk/BUILD.gn
+++ b/webrtc/sdk/BUILD.gn
@@ -11,44 +11,50 @@
import("//build/config/ios/rules.gni")
}
+declare_args() {
+ # Determine whether or not to include metal rendering
+ rtc_use_metal_rendering = is_mac || (is_ios && current_cpu == "arm64")
+}
+
group("sdk") {
if (is_ios) {
public_deps = [
- ":rtc_sdk_framework_objc",
+ ":objc_framework",
]
}
}
if (is_ios || is_mac) {
- config("rtc_sdk_common_objc_config") {
+ config("objc_common_config") {
include_dirs = [
"objc/Framework/Classes",
+ "objc/Framework/Classes/Audio",
+ "objc/Framework/Classes/Common",
+ "objc/Framework/Classes/Metal",
+ "objc/Framework/Classes/PeerConnection",
+ "objc/Framework/Classes/UI",
+ "objc/Framework/Classes/Video",
+ "objc/Framework/Classes/VideoToolbox",
"objc/Framework/Headers",
]
}
- rtc_static_library("rtc_sdk_common_objc") {
+ rtc_static_library("objc_common") {
sources = [
- "objc/Framework/Classes/NSString+StdString.h",
- "objc/Framework/Classes/NSString+StdString.mm",
- "objc/Framework/Classes/RTCDispatcher.m",
- "objc/Framework/Classes/RTCFieldTrials.mm",
- "objc/Framework/Classes/RTCLogging.mm",
- "objc/Framework/Classes/RTCMetrics.mm",
- "objc/Framework/Classes/RTCMetricsSampleInfo+Private.h",
- "objc/Framework/Classes/RTCMetricsSampleInfo.mm",
- "objc/Framework/Classes/RTCSSLAdapter.mm",
- "objc/Framework/Classes/RTCTracing.mm",
- "objc/Framework/Classes/helpers.h",
- "objc/Framework/Classes/helpers.mm",
+ "objc/Framework/Classes/Common/NSString+StdString.h",
+ "objc/Framework/Classes/Common/NSString+StdString.mm",
+ "objc/Framework/Classes/Common/RTCDispatcher+Private.h",
+ "objc/Framework/Classes/Common/RTCDispatcher.m",
+ "objc/Framework/Classes/Common/RTCFieldTrials.mm",
+ "objc/Framework/Classes/Common/RTCLogging.mm",
+ "objc/Framework/Classes/Common/RTCUIApplication.h",
+ "objc/Framework/Classes/Common/RTCUIApplication.mm",
+ "objc/Framework/Classes/Common/helpers.h",
+ "objc/Framework/Classes/Common/helpers.mm",
"objc/Framework/Headers/WebRTC/RTCDispatcher.h",
"objc/Framework/Headers/WebRTC/RTCFieldTrials.h",
"objc/Framework/Headers/WebRTC/RTCLogging.h",
"objc/Framework/Headers/WebRTC/RTCMacros.h",
- "objc/Framework/Headers/WebRTC/RTCMetrics.h",
- "objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h",
- "objc/Framework/Headers/WebRTC/RTCSSLAdapter.h",
- "objc/Framework/Headers/WebRTC/RTCTracing.h",
]
deps = [
@@ -56,132 +62,201 @@
]
configs += [ "..:common_objc" ]
- public_configs = [ ":rtc_sdk_common_objc_config" ]
+ public_configs = [ ":objc_common_config" ]
if (is_ios) {
sources += [
- "objc/Framework/Classes/RTCCameraPreviewView.m",
- "objc/Framework/Classes/RTCUIApplication.h",
- "objc/Framework/Classes/RTCUIApplication.mm",
- "objc/Framework/Classes/UIDevice+RTCDevice.mm",
+ "objc/Framework/Classes/Common/UIDevice+RTCDevice.mm",
+ "objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h",
+ ]
+ }
+
+ if (!build_with_chromium) {
+ sources += [
+ "objc/Framework/Classes/Common/RTCFileLogger.mm",
+ "objc/Framework/Headers/WebRTC/RTCFileLogger.h",
+ ]
+ }
+ }
+
+ rtc_static_library("objc_video") {
+ sources = [
+ "objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.h",
+ "objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.mm",
+ "objc/Framework/Classes/Video/RTCI420Shader.mm",
+ "objc/Framework/Classes/Video/RTCI420TextureCache.h",
+ "objc/Framework/Classes/Video/RTCI420TextureCache.mm",
+ "objc/Framework/Classes/Video/RTCOpenGLDefines.h",
+ "objc/Framework/Classes/Video/RTCShader+Private.h",
+ "objc/Framework/Classes/Video/RTCShader.h",
+ "objc/Framework/Classes/Video/RTCShader.mm",
+ "objc/Framework/Classes/Video/avfoundationformatmapper.h",
+ "objc/Framework/Classes/Video/avfoundationformatmapper.mm",
+ "objc/Framework/Classes/Video/avfoundationvideocapturer.h",
+ "objc/Framework/Classes/Video/avfoundationvideocapturer.mm",
+ "objc/Framework/Classes/Video/objcvideotracksource.h",
+ "objc/Framework/Classes/Video/objcvideotracksource.mm",
+ ]
+ libs = []
+ if (is_ios) {
+ sources += [
+ "objc/Framework/Classes/Video/RTCNV12TextureCache.h",
+ "objc/Framework/Classes/Video/RTCNV12TextureCache.m",
+ "objc/Framework/Classes/Video/RTCNativeNV12Shader.mm",
+ ]
+ libs += [
+ "GLKit.framework",
+ "OpenGLES.framework",
+ "QuartzCore.framework",
+ ]
+ } else if (is_mac) {
+ sources += []
+
+ libs += [
+ "CoreMedia.framework",
+ "CoreVideo.framework",
+ "OpenGL.framework",
+ ]
+ }
+
+ deps = [
+ ":objc_common",
+ ":objc_corevideoframebuffer",
+ ":objc_videotoolbox",
+ "//webrtc/api:libjingle_peerconnection_api",
+ "//webrtc/base:rtc_base",
+ "//webrtc/common_video",
+ "//webrtc/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_ui") {
+ if (is_ios) {
+ sources = [
+ "objc/Framework/Classes/UI/RTCCameraPreviewView.m",
+ "objc/Framework/Classes/UI/RTCEAGLVideoView.m",
"objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h",
- "objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h",
- ]
- }
-
- if (is_mac || (is_ios && current_cpu == "arm64")) {
- sources += [
+ "objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h",
+ ]
+ }
+ if (is_mac) {
+ sources = [
+ "objc/Framework/Classes/UI/RTCNSGLVideoView.m",
+ "objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h",
+ ]
+ }
+ configs += [ "..:common_objc" ]
+ deps = [
+ ":objc_common",
+ ]
+ }
+
+ if (rtc_use_metal_rendering) {
+ rtc_static_library("objc_metal") {
+ sources = [
"objc/Framework/Classes/Metal/RTCMTLI420Renderer.h",
"objc/Framework/Classes/Metal/RTCMTLI420Renderer.mm",
"objc/Framework/Classes/Metal/RTCMTLRenderer+Private.h",
"objc/Framework/Classes/Metal/RTCMTLRenderer.h",
"objc/Framework/Classes/Metal/RTCMTLRenderer.mm",
]
- deps += [ "../api:video_frame_api" ]
-
if (is_ios) {
sources += [
"objc/Framework/Classes/Metal/RTCMTLNV12Renderer.h",
"objc/Framework/Classes/Metal/RTCMTLNV12Renderer.mm",
"objc/Framework/Classes/Metal/RTCMTLVideoView.m",
+ "objc/Framework/Headers/WebRTC/RTCMTLVideoView.h",
]
}
if (is_mac) {
- sources += [ "objc/Framework/Classes/Metal/RTCMTLNSVideoView.m" ]
- }
- }
-
- libs = [ "AVFoundation.framework" ]
- if (is_mac || (is_ios && current_cpu == "arm64")) {
- libs += [
+ sources += [
+ "objc/Framework/Classes/Metal/RTCMTLNSVideoView.m",
+ "objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h",
+ ]
+ }
+ libs = [
"CoreVideo.framework",
"Metal.framework",
"MetalKit.framework",
]
- }
- if (!build_with_chromium) {
- sources += [
- "objc/Framework/Classes/RTCFileLogger.mm",
- "objc/Framework/Headers/WebRTC/RTCFileLogger.h",
- ]
- }
- }
-
- rtc_static_library("rtc_sdk_peerconnection_objc") {
+ deps = [
+ ":objc_video",
+ "//webrtc/api:video_frame_api",
+ "//webrtc/base:rtc_base_approved",
+ ]
+ configs += [ "..:common_objc" ]
+ public_configs = [ ":objc_common_config" ]
+ }
+ }
+
+ rtc_static_library("objc_peerconnection") {
sources = [
- "objc/Framework/Classes/Metal/RTCMTLNV12Renderer.h",
- "objc/Framework/Classes/RTCAVFoundationVideoCapturerInternal.h",
- "objc/Framework/Classes/RTCAVFoundationVideoCapturerInternal.mm",
- "objc/Framework/Classes/RTCAVFoundationVideoSource+Private.h",
- "objc/Framework/Classes/RTCAVFoundationVideoSource.mm",
- "objc/Framework/Classes/RTCAudioSource+Private.h",
- "objc/Framework/Classes/RTCAudioSource.mm",
- "objc/Framework/Classes/RTCAudioTrack+Private.h",
- "objc/Framework/Classes/RTCAudioTrack.mm",
- "objc/Framework/Classes/RTCCameraVideoCapturer.m",
- "objc/Framework/Classes/RTCConfiguration+Private.h",
- "objc/Framework/Classes/RTCConfiguration.mm",
- "objc/Framework/Classes/RTCDataChannel+Private.h",
- "objc/Framework/Classes/RTCDataChannel.mm",
- "objc/Framework/Classes/RTCDataChannelConfiguration+Private.h",
- "objc/Framework/Classes/RTCDataChannelConfiguration.mm",
- "objc/Framework/Classes/RTCI420Shader.mm",
- "objc/Framework/Classes/RTCI420TextureCache.h",
- "objc/Framework/Classes/RTCI420TextureCache.mm",
- "objc/Framework/Classes/RTCIceCandidate+Private.h",
- "objc/Framework/Classes/RTCIceCandidate.mm",
- "objc/Framework/Classes/RTCIceServer+Private.h",
- "objc/Framework/Classes/RTCIceServer.mm",
- "objc/Framework/Classes/RTCLegacyStatsReport+Private.h",
- "objc/Framework/Classes/RTCLegacyStatsReport.mm",
- "objc/Framework/Classes/RTCMediaConstraints+Private.h",
- "objc/Framework/Classes/RTCMediaConstraints.mm",
- "objc/Framework/Classes/RTCMediaSource+Private.h",
- "objc/Framework/Classes/RTCMediaSource.mm",
- "objc/Framework/Classes/RTCMediaStream+Private.h",
- "objc/Framework/Classes/RTCMediaStream.mm",
- "objc/Framework/Classes/RTCMediaStreamTrack+Private.h",
- "objc/Framework/Classes/RTCMediaStreamTrack.mm",
- "objc/Framework/Classes/RTCOpenGLDefines.h",
- "objc/Framework/Classes/RTCPeerConnection+DataChannel.mm",
- "objc/Framework/Classes/RTCPeerConnection+Private.h",
- "objc/Framework/Classes/RTCPeerConnection+Stats.mm",
- "objc/Framework/Classes/RTCPeerConnection.mm",
- "objc/Framework/Classes/RTCPeerConnectionFactory+Private.h",
- "objc/Framework/Classes/RTCPeerConnectionFactory.mm",
- "objc/Framework/Classes/RTCRtpCodecParameters+Private.h",
- "objc/Framework/Classes/RTCRtpCodecParameters.mm",
- "objc/Framework/Classes/RTCRtpEncodingParameters+Private.h",
- "objc/Framework/Classes/RTCRtpEncodingParameters.mm",
- "objc/Framework/Classes/RTCRtpParameters+Private.h",
- "objc/Framework/Classes/RTCRtpParameters.mm",
- "objc/Framework/Classes/RTCRtpReceiver+Private.h",
- "objc/Framework/Classes/RTCRtpReceiver.mm",
- "objc/Framework/Classes/RTCRtpSender+Private.h",
- "objc/Framework/Classes/RTCRtpSender.mm",
- "objc/Framework/Classes/RTCSessionDescription+Private.h",
- "objc/Framework/Classes/RTCSessionDescription.mm",
- "objc/Framework/Classes/RTCShader+Private.h",
- "objc/Framework/Classes/RTCShader.h",
- "objc/Framework/Classes/RTCShader.mm",
- "objc/Framework/Classes/RTCVideoCapturer.m",
- "objc/Framework/Classes/RTCVideoFrame+Private.h",
- "objc/Framework/Classes/RTCVideoFrame.mm",
- "objc/Framework/Classes/RTCVideoRendererAdapter+Private.h",
- "objc/Framework/Classes/RTCVideoRendererAdapter.h",
- "objc/Framework/Classes/RTCVideoRendererAdapter.mm",
- "objc/Framework/Classes/RTCVideoSource+Private.h",
- "objc/Framework/Classes/RTCVideoSource.mm",
- "objc/Framework/Classes/RTCVideoTrack+Private.h",
- "objc/Framework/Classes/RTCVideoTrack.mm",
- "objc/Framework/Classes/avfoundationformatmapper.h",
- "objc/Framework/Classes/avfoundationformatmapper.mm",
- "objc/Framework/Classes/avfoundationvideocapturer.h",
- "objc/Framework/Classes/avfoundationvideocapturer.mm",
- "objc/Framework/Classes/objcvideotracksource.h",
- "objc/Framework/Classes/objcvideotracksource.mm",
- "objc/Framework/Classes/videotoolboxvideocodecfactory.cc",
- "objc/Framework/Classes/videotoolboxvideocodecfactory.h",
+ "objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource.mm",
+ "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",
+ "objc/Framework/Classes/PeerConnection/RTCDataChannel.mm",
+ "objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration.mm",
+ "objc/Framework/Classes/PeerConnection/RTCIceCandidate+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCIceCandidate.mm",
+ "objc/Framework/Classes/PeerConnection/RTCIceServer+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCIceServer.mm",
+ "objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm",
+ "objc/Framework/Classes/PeerConnection/RTCMediaConstraints+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCMediaConstraints.mm",
+ "objc/Framework/Classes/PeerConnection/RTCMediaSource+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCMediaSource.mm",
+ "objc/Framework/Classes/PeerConnection/RTCMediaStream+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCMediaStream.mm",
+ "objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack.mm",
+ "objc/Framework/Classes/PeerConnection/RTCMetrics.mm",
+ "objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo.mm",
+ "objc/Framework/Classes/PeerConnection/RTCPeerConnection+DataChannel.mm",
+ "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",
+ "objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters.mm",
+ "objc/Framework/Classes/PeerConnection/RTCRtpParameters+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCRtpParameters.mm",
+ "objc/Framework/Classes/PeerConnection/RTCRtpReceiver+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCRtpReceiver.mm",
+ "objc/Framework/Classes/PeerConnection/RTCRtpSender+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCRtpSender.mm",
+ "objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm",
+ "objc/Framework/Classes/PeerConnection/RTCSessionDescription+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm",
+ "objc/Framework/Classes/PeerConnection/RTCTracing.mm",
+ "objc/Framework/Classes/PeerConnection/RTCVideoCapturer.m",
+ "objc/Framework/Classes/PeerConnection/RTCVideoFrame+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm",
+ "objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.h",
+ "objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.mm",
+ "objc/Framework/Classes/PeerConnection/RTCVideoSource+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCVideoSource.mm",
+ "objc/Framework/Classes/PeerConnection/RTCVideoTrack+Private.h",
+ "objc/Framework/Classes/PeerConnection/RTCVideoTrack.mm",
"objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h",
"objc/Framework/Headers/WebRTC/RTCAudioSource.h",
"objc/Framework/Headers/WebRTC/RTCAudioTrack.h",
@@ -196,6 +271,8 @@
"objc/Framework/Headers/WebRTC/RTCMediaSource.h",
"objc/Framework/Headers/WebRTC/RTCMediaStream.h",
"objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h",
+ "objc/Framework/Headers/WebRTC/RTCMetrics.h",
+ "objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h",
"objc/Framework/Headers/WebRTC/RTCPeerConnection.h",
"objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h",
"objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h",
@@ -203,7 +280,9 @@
"objc/Framework/Headers/WebRTC/RTCRtpParameters.h",
"objc/Framework/Headers/WebRTC/RTCRtpReceiver.h",
"objc/Framework/Headers/WebRTC/RTCRtpSender.h",
+ "objc/Framework/Headers/WebRTC/RTCSSLAdapter.h",
"objc/Framework/Headers/WebRTC/RTCSessionDescription.h",
+ "objc/Framework/Headers/WebRTC/RTCTracing.h",
"objc/Framework/Headers/WebRTC/RTCVideoCapturer.h",
"objc/Framework/Headers/WebRTC/RTCVideoFrame.h",
"objc/Framework/Headers/WebRTC/RTCVideoRenderer.h",
@@ -211,64 +290,35 @@
"objc/Framework/Headers/WebRTC/RTCVideoTrack.h",
]
- deps = [
- ":rtc_sdk_corevideoframebuffer",
- ":webrtc_h264_video_toolbox",
- "../api:video_frame_api",
- "../base:rtc_base",
- "../base:rtc_base_approved",
- "../common_video",
- "../media:rtc_media",
- "../media:rtc_media_base",
- "../system_wrappers",
- ]
+ libs = [ "AVFoundation.framework" ]
if (is_ios) {
- sources += [
- "objc/Framework/Classes/RTCEAGLVideoView.m",
- "objc/Framework/Classes/RTCNV12TextureCache.h",
- "objc/Framework/Classes/RTCNV12TextureCache.m",
- "objc/Framework/Classes/RTCNativeNV12Shader.mm",
- "objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h",
- ]
- libs = [
- "CoreGraphics.framework",
- "GLKit.framework",
- "OpenGLES.framework",
- "QuartzCore.framework",
- ]
- }
-
- if (is_mac) {
- sources += [
- "objc/Framework/Classes/RTCNSGLVideoView.m",
- "objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h",
- "objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h",
- ]
- libs = [
- "CoreVideo.framework",
- "CoreMedia.framework",
- "OpenGL.framework",
- "Metal.framework",
- "MetalKit.framework",
- ]
+ libs += [ "CoreGraphics.framework" ]
}
configs += [ "..:common_objc" ]
- public_configs = [ ":rtc_sdk_common_objc_config" ]
+ 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" ]
}
- libs += [ "AVFoundation.framework" ]
-
- deps += [
- ":rtc_sdk_common_objc",
+ deps = [
+ ":objc_common",
+ ":objc_corevideoframebuffer",
+ ":objc_ui",
+ ":objc_video",
"../pc:libjingle_peerconnection",
- ]
+ "//webrtc/api:video_frame_api",
+ "//webrtc/base:rtc_base",
+ "//webrtc/media:rtc_media_base",
+ ]
+
+ if (rtc_use_metal_rendering) {
+ deps += [ ":objc_metal" ]
+ }
if (rtc_build_libyuv) {
deps += [ "$rtc_libyuv_dir" ]
@@ -279,7 +329,7 @@
}
if (rtc_include_tests) {
- rtc_source_set("rtc_sdk_peerconnection_objc_unittests") {
+ rtc_source_set("objc_sdk_unittests") {
testonly = true
# Skip restricting visibility on mobile platforms since the tests on those
@@ -299,15 +349,6 @@
"objc/Framework/UnitTests/RTCSessionDescriptionTest.mm",
"objc/Framework/UnitTests/avformatmappertests.mm",
]
- if (is_ios) {
- sources += [ "objc/Framework/UnitTests/RTCMTLVideoViewTests.mm" ]
- if (current_cpu != "arm64") {
- sources += [ "objc/Framework/Classes/Metal/RTCMTLVideoView.m" ]
- }
- }
-
- # TODO(tkchin): Cleanup this warning.
- cflags = [ "-Wno-objc-property-no-attribute" ]
# |-ObjC| flag needed to make sure category method implementations
# are included:
@@ -316,12 +357,24 @@
defines = [ "GTEST_RELATIVE_PATH" ]
deps = [
- ":rtc_sdk_peerconnection_objc",
+ ":objc_peerconnection",
+ "..//system_wrappers:system_wrappers_default",
"../base:rtc_base_tests_utils",
"//third_party/ocmock",
"//webrtc/system_wrappers:system_wrappers_default",
]
+ # RTCMTLVideoView not supported on 32-bit arm
+ if (is_ios && current_cpu != "arm") {
+ sources += [ "objc/Framework/UnitTests/RTCMTLVideoViewTests.mm" ]
+ if (current_cpu != "arm64") {
+ # Only include this file on simulator, as it's already
+ # included in device builds.
+ sources += [ "objc/Framework/Classes/Metal/RTCMTLVideoView.m" ]
+ libs = [ "CoreVideo.framework" ]
+ }
+ }
+
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" ]
@@ -330,16 +383,12 @@
}
if (is_ios) {
- ios_framework_bundle("rtc_sdk_framework_objc") {
+ ios_framework_bundle("objc_framework") {
info_plist = "objc/Framework/Info.plist"
output_name = "WebRTC"
common_objc_headers = [
"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/RTCCameraPreviewView.h",
"objc/Framework/Headers/WebRTC/RTCConfiguration.h",
"objc/Framework/Headers/WebRTC/RTCDataChannel.h",
"objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h",
@@ -357,7 +406,6 @@
"objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h",
"objc/Framework/Headers/WebRTC/RTCMetrics.h",
"objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h",
- "objc/Framework/Headers/WebRTC/RTCMTLVideoView.h",
"objc/Framework/Headers/WebRTC/RTCPeerConnection.h",
"objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h",
"objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h",
@@ -392,23 +440,22 @@
]
deps = [
- ":rtc_sdk_peerconnection_objc",
+ ":objc_peerconnection",
+ "../base:rtc_base_approved",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
]
libs = [
"AVFoundation.framework",
- "AudioToolbox.framework",
"CoreGraphics.framework",
"CoreMedia.framework",
"GLKit.framework",
- "VideoToolbox.framework",
]
configs += [ "..:common_objc" ]
- public_configs = [ ":rtc_sdk_common_objc_config" ]
+ public_configs = [ ":objc_common_config" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163)
@@ -420,16 +467,16 @@
rtc_static_library("rtc_sdk_objc") {
complete_static_lib = true
deps = [
- ":rtc_sdk_peerconnection_objc",
+ ":objc_peerconnection",
"//webrtc/system_wrappers:field_trial_default",
"//webrtc/system_wrappers:metrics_default",
]
}
- rtc_static_library("rtc_sdk_corevideoframebuffer") {
+ rtc_static_library("objc_corevideoframebuffer") {
sources = [
- "objc/Framework/Classes/corevideo_frame_buffer.cc",
- "objc/Framework/Classes/corevideo_frame_buffer.h",
+ "objc/Framework/Classes/Video/corevideo_frame_buffer.cc",
+ "objc/Framework/Classes/Video/corevideo_frame_buffer.h",
]
deps = [
@@ -437,32 +484,39 @@
"../common_video",
]
+ 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" ]
+ }
+
libs = [ "CoreVideo.framework" ]
}
- rtc_static_library("webrtc_h264_video_toolbox") {
+ rtc_static_library("objc_videotoolbox") {
sources = [
- "objc/Framework/Classes/h264_video_toolbox_decoder.cc",
- "objc/Framework/Classes/h264_video_toolbox_decoder.h",
- "objc/Framework/Classes/h264_video_toolbox_encoder.h",
- "objc/Framework/Classes/h264_video_toolbox_encoder.mm",
- "objc/Framework/Classes/h264_video_toolbox_nalu.cc",
- "objc/Framework/Classes/h264_video_toolbox_nalu.h",
+ "objc/Framework/Classes/VideoToolbox/decoder.cc",
+ "objc/Framework/Classes/VideoToolbox/decoder.h",
+ "objc/Framework/Classes/VideoToolbox/encoder.h",
+ "objc/Framework/Classes/VideoToolbox/encoder.mm",
+ "objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc",
+ "objc/Framework/Classes/VideoToolbox/nalu_rewriter.h",
+ "objc/Framework/Classes/VideoToolbox/videocodecfactory.cc",
+ "objc/Framework/Classes/VideoToolbox/videocodecfactory.h",
]
configs += [ "//webrtc:common_objc" ]
deps = [
- ":rtc_sdk_common_objc",
- ":rtc_sdk_corevideoframebuffer",
- "../api:video_frame_api",
+ ":objc_common",
+ ":objc_corevideoframebuffer",
"../base:rtc_base_approved",
- "../common_video",
- "../media:rtc_media_base",
- "../modules:module_api",
- "../modules/video_coding:video_coding_utility",
- "../modules/video_coding:webrtc_h264",
- "../system_wrappers",
+ "//webrtc/common_video",
+ "//webrtc/media:rtc_media",
+ "//webrtc/media:rtc_media_base",
+ "//webrtc/modules:module_api",
+ "//webrtc/modules/video_coding:video_coding_utility",
+ "//webrtc/modules/video_coding:webrtc_h264",
+ "//webrtc/system_wrappers",
]
libs = [
« no previous file with comments | « webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h ('k') | webrtc/sdk/objc/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698