From 1253aea08e5f78c455dd5e40a53ed2b6f72a98aa Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 19 Oct 2020 07:05:17 +0000 Subject: [PATCH] Revert "Reland "Remove placeholder Obj-C headers and use angle-bracketed headers."" This reverts commit 37d41eea047799ccca2f09c941870c26ee3ffc0a. Reason for revert: Sorry for the back and forth here. I need to revert again because I need to fix a downstream project. The re-landing should be without changes. Original change's description: > Reland "Remove placeholder Obj-C headers and use angle-bracketed headers." > > This is a reland of 6bfad33fd866e682c871c2ef2172b70b609593d1 > > Original change's description: > > Remove placeholder Obj-C headers and use angle-bracketed headers. > > > > sdk/objc/Framework/Headers are just a placeholder headers > > for backward compatibility and I don't think it is really need this for now. > > Instead, we can generate the framework header in > > ios/mac_framework_bundle_with_umbrella_header. > > Also clang supports the -Wquoted-include-in-framework-header warning, > > and in Xcode 12, it's in Xcode's recommended settings. This warnings > > can be avoided by replacing double-quoted includes with angle-bracketed > > includes when generate framework headers. > > > > No-Presubmit: True > > Bug: webrtc:9627, webrtc:11984 > > Change-Id: I3f6258dfa77a5acee669614005b2747feee35e39 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/185920 > > Commit-Queue: Anders Carlsson > > Reviewed-by: Anders Carlsson > > Cr-Commit-Position: refs/heads/master@{#32343} > > TBR=tommi@webrtc.org, andersc@webrtc.org > > No-Presubmit: True > Bug: webrtc:9627 > Bug: webrtc:11984 > Change-Id: I8f44232f1a70b8ff2ce6a4b4792f0a18472fcec3 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/187280 > Commit-Queue: Mirko Bonadei > Reviewed-by: Mirko Bonadei > Cr-Commit-Position: refs/heads/master@{#32429} TBR=mbonadei@webrtc.org,andersc@webrtc.org,tommi@webrtc.org,daniel.l@hpcnt.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9627 Bug: webrtc:11984 Change-Id: I006d50c94ad2e336c8a56d49d5ce1c768685f696 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/189542 Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#32432} --- sdk/BUILD.gn | 88 +++++++++++++++++++ .../Headers/WebRTC/RTCAudioSession.h | 11 +++ .../WebRTC/RTCAudioSessionConfiguration.h | 11 +++ .../Framework/Headers/WebRTC/RTCAudioSource.h | 11 +++ .../Framework/Headers/WebRTC/RTCAudioTrack.h | 11 +++ .../Headers/WebRTC/RTCCVPixelBuffer.h | 11 +++ .../Headers/WebRTC/RTCCallbackLogger.h | 11 +++ .../Headers/WebRTC/RTCCameraPreviewView.h | 11 +++ .../Headers/WebRTC/RTCCameraVideoCapturer.h | 11 +++ .../Framework/Headers/WebRTC/RTCCertificate.h | 11 +++ .../Headers/WebRTC/RTCConfiguration.h | 11 +++ .../Framework/Headers/WebRTC/RTCDataChannel.h | 11 +++ .../WebRTC/RTCDataChannelConfiguration.h | 11 +++ .../WebRTC/RTCDefaultVideoDecoderFactory.h | 11 +++ .../WebRTC/RTCDefaultVideoEncoderFactory.h | 11 +++ .../Framework/Headers/WebRTC/RTCDispatcher.h | 11 +++ .../Framework/Headers/WebRTC/RTCDtmfSender.h | 11 +++ .../Headers/WebRTC/RTCEAGLVideoView.h | 11 +++ .../Framework/Headers/WebRTC/RTCFieldTrials.h | 11 +++ .../Framework/Headers/WebRTC/RTCFileLogger.h | 11 +++ .../Headers/WebRTC/RTCFileVideoCapturer.h | 11 +++ .../Headers/WebRTC/RTCH264ProfileLevelId.h | 11 +++ .../Headers/WebRTC/RTCIceCandidate.h | 11 +++ .../Framework/Headers/WebRTC/RTCIceServer.h | 11 +++ .../Headers/WebRTC/RTCLegacyStatsReport.h | 11 +++ .../Framework/Headers/WebRTC/RTCLogging.h | 11 +++ .../Headers/WebRTC/RTCMTLNSVideoView.h | 11 +++ .../Headers/WebRTC/RTCMTLVideoView.h | 11 +++ sdk/objc/Framework/Headers/WebRTC/RTCMacros.h | 11 +++ .../Headers/WebRTC/RTCMediaConstraints.h | 11 +++ .../Framework/Headers/WebRTC/RTCMediaSource.h | 11 +++ .../Framework/Headers/WebRTC/RTCMediaStream.h | 11 +++ .../Headers/WebRTC/RTCMediaStreamTrack.h | 11 +++ .../Framework/Headers/WebRTC/RTCMetrics.h | 11 +++ .../Headers/WebRTC/RTCMetricsSampleInfo.h | 11 +++ .../Headers/WebRTC/RTCNSGLVideoView.h | 11 +++ .../Headers/WebRTC/RTCPeerConnection.h | 11 +++ .../Headers/WebRTC/RTCPeerConnectionFactory.h | 11 +++ .../WebRTC/RTCPeerConnectionFactoryOptions.h | 11 +++ .../Headers/WebRTC/RTCRtcpParameters.h | 11 +++ .../Headers/WebRTC/RTCRtpCodecParameters.h | 11 +++ .../Headers/WebRTC/RTCRtpEncodingParameters.h | 11 +++ .../Headers/WebRTC/RTCRtpHeaderExtension.h | 11 +++ .../Headers/WebRTC/RTCRtpParameters.h | 11 +++ .../Framework/Headers/WebRTC/RTCRtpReceiver.h | 11 +++ .../Framework/Headers/WebRTC/RTCRtpSender.h | 11 +++ .../Headers/WebRTC/RTCRtpTransceiver.h | 11 +++ .../Framework/Headers/WebRTC/RTCSSLAdapter.h | 11 +++ .../Headers/WebRTC/RTCSessionDescription.h | 11 +++ .../Framework/Headers/WebRTC/RTCTracing.h | 11 +++ .../Headers/WebRTC/RTCVideoCapturer.h | 11 +++ .../Framework/Headers/WebRTC/RTCVideoCodec.h | 20 +++++ .../Headers/WebRTC/RTCVideoCodecFactory.h | 14 +++ .../Headers/WebRTC/RTCVideoCodecH264.h | 16 ++++ .../Headers/WebRTC/RTCVideoCodecInfo.h | 11 +++ .../Headers/WebRTC/RTCVideoDecoderVP8.h | 11 +++ .../Headers/WebRTC/RTCVideoDecoderVP9.h | 11 +++ .../Headers/WebRTC/RTCVideoEncoderVP8.h | 11 +++ .../Headers/WebRTC/RTCVideoEncoderVP9.h | 11 +++ .../Framework/Headers/WebRTC/RTCVideoFrame.h | 11 +++ .../Headers/WebRTC/RTCVideoFrameBuffer.h | 18 ++++ .../Headers/WebRTC/RTCVideoRenderer.h | 11 +++ .../Framework/Headers/WebRTC/RTCVideoSource.h | 11 +++ .../Framework/Headers/WebRTC/RTCVideoTrack.h | 11 +++ .../Headers/WebRTC/RTCVideoViewShading.h | 11 +++ .../Headers/WebRTC/UIDevice+RTCDevice.h | 11 +++ tools_webrtc/apple/copy_framework_header.py | 47 ---------- .../apple/copy_framework_header_test.py | 35 -------- webrtc.gni | 58 ++---------- 69 files changed, 834 insertions(+), 133 deletions(-) create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCCallbackLogger.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCCertificate.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCDtmfSender.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCLogging.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMacros.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtcpParameters.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCTracing.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h create mode 100644 sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h delete mode 100755 tools_webrtc/apple/copy_framework_header.py delete mode 100644 tools_webrtc/apple/copy_framework_header_test.py diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index f5aafe0aa6..2a80c65049 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -56,6 +56,9 @@ if (is_ios || is_mac) { # This is needed so that framework headers can include base headers # without pathname (so it works from within the framework module). "objc/base", + + # This is here for backward compatiblity reasons. + "objc/Framework/Headers", # TODO(bugs.webrtc.org/9627): Remove this. ] cflags = [ "-Wimplicit-retain-self", @@ -945,6 +948,7 @@ if (is_ios || is_mac) { ":base_objc", ":file_logger_objc", ":helpers_objc", + ":legacy_header_paths", ":mediaconstraints_objc", ":mediasource_objc", ":native_api", @@ -990,6 +994,90 @@ if (is_ios || is_mac) { } } + # TODO(bugs.webrtc.org/9627): Remove this target. + rtc_source_set("legacy_header_paths") { + sources = [ + "objc/Framework/Classes/Common/NSString+StdString.h", + "objc/Framework/Classes/Common/scoped_cftyperef.h", + "objc/Framework/Classes/PeerConnection/RTCConfiguration+Native.h", + "objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h", + "objc/Framework/Classes/Video/RTCDefaultShader.h", + "objc/Framework/Classes/Video/RTCNV12TextureCache.h", + "objc/Framework/Classes/VideoToolbox/nalu_rewriter.h", + "objc/Framework/Headers/WebRTC/RTCAudioSession.h", + "objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h", + "objc/Framework/Headers/WebRTC/RTCAudioSource.h", + "objc/Framework/Headers/WebRTC/RTCAudioTrack.h", + "objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h", + "objc/Framework/Headers/WebRTC/RTCCallbackLogger.h", + "objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h", + "objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h", + "objc/Framework/Headers/WebRTC/RTCCertificate.h", + "objc/Framework/Headers/WebRTC/RTCConfiguration.h", + "objc/Framework/Headers/WebRTC/RTCDataChannel.h", + "objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h", + "objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h", + "objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h", + "objc/Framework/Headers/WebRTC/RTCDispatcher.h", + "objc/Framework/Headers/WebRTC/RTCDtmfSender.h", + "objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h", + "objc/Framework/Headers/WebRTC/RTCFieldTrials.h", + "objc/Framework/Headers/WebRTC/RTCFileLogger.h", + "objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h", + "objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h", + "objc/Framework/Headers/WebRTC/RTCIceCandidate.h", + "objc/Framework/Headers/WebRTC/RTCIceServer.h", + "objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h", + "objc/Framework/Headers/WebRTC/RTCLogging.h", + "objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h", + "objc/Framework/Headers/WebRTC/RTCMTLVideoView.h", + "objc/Framework/Headers/WebRTC/RTCMacros.h", + "objc/Framework/Headers/WebRTC/RTCMediaConstraints.h", + "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/RTCNSGLVideoView.h", + "objc/Framework/Headers/WebRTC/RTCPeerConnection.h", + "objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h", + "objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h", + "objc/Framework/Headers/WebRTC/RTCRtcpParameters.h", + "objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h", + "objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h", + "objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h", + "objc/Framework/Headers/WebRTC/RTCRtpParameters.h", + "objc/Framework/Headers/WebRTC/RTCRtpReceiver.h", + "objc/Framework/Headers/WebRTC/RTCRtpSender.h", + "objc/Framework/Headers/WebRTC/RTCRtpTransceiver.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/RTCVideoCodec.h", + "objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h", + "objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h", + "objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h", + "objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h", + "objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h", + "objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h", + "objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h", + "objc/Framework/Headers/WebRTC/RTCVideoFrame.h", + "objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h", + "objc/Framework/Headers/WebRTC/RTCVideoRenderer.h", + "objc/Framework/Headers/WebRTC/RTCVideoSource.h", + "objc/Framework/Headers/WebRTC/RTCVideoTrack.h", + "objc/Framework/Headers/WebRTC/RTCVideoViewShading.h", + "objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h", + "objc/Framework/Native/api/audio_device_module.h", + "objc/Framework/Native/api/video_decoder_factory.h", + "objc/Framework/Native/api/video_encoder_factory.h", + "objc/Framework/Native/api/video_frame_buffer.h", + "objc/Framework/Native/src/objc_video_decoder_factory.h", + "objc/Framework/Native/src/objc_video_encoder_factory.h", + ] + } + if (rtc_include_tests) { if (is_ios) { rtc_library("sdk_unittests_sources") { diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h new file mode 100644 index 0000000000..64c49977c0 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "components/audio/RTCAudioSession.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h new file mode 100644 index 0000000000..6ee1bc5435 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "components/audio/RTCAudioSessionConfiguration.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h new file mode 100644 index 0000000000..a7dc191319 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCAudioSource.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "api/peerconnection/RTCAudioSource.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h b/sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h new file mode 100644 index 0000000000..88515bb3fe --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCAudioTrack.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCAudioTrack.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h b/sdk/objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h new file mode 100644 index 0000000000..7a4f847be5 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCCVPixelBuffer.h @@ -0,0 +1,11 @@ +/* + * Copyright 2018 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. + */ + +#import "components/video_frame_buffer/RTCCVPixelBuffer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCCallbackLogger.h b/sdk/objc/Framework/Headers/WebRTC/RTCCallbackLogger.h new file mode 100644 index 0000000000..c4585228ed --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCCallbackLogger.h @@ -0,0 +1,11 @@ +/* + * Copyright 2018 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. + */ + +#import "api/logging/RTCCallbackLogger.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h b/sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h new file mode 100644 index 0000000000..388e72fce0 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "helpers/RTCCameraPreviewView.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h b/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h new file mode 100644 index 0000000000..aac6773b6c --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "components/capturer/RTCCameraVideoCapturer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCCertificate.h b/sdk/objc/Framework/Headers/WebRTC/RTCCertificate.h new file mode 100644 index 0000000000..9e3b7dcf1a --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCCertificate.h @@ -0,0 +1,11 @@ +/* + * Copyright 2018 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. + */ + +#import "api/peerconnection/RTCCertificate.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h b/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h new file mode 100644 index 0000000000..fe2f0cdfdb --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCConfiguration.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h b/sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h new file mode 100644 index 0000000000..4f35079471 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCDataChannel.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCDataChannel.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h b/sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h new file mode 100644 index 0000000000..20cb4e1c51 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCDataChannelConfiguration.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h b/sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h new file mode 100644 index 0000000000..dc46f3f67b --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoDecoderFactory.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "components/video_codec/RTCDefaultVideoDecoderFactory.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h b/sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h new file mode 100644 index 0000000000..7588ffb84a --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCDefaultVideoEncoderFactory.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "components/video_codec/RTCDefaultVideoEncoderFactory.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h b/sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h new file mode 100644 index 0000000000..2ae9cd89c8 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCDispatcher.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "helpers/RTCDispatcher.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCDtmfSender.h b/sdk/objc/Framework/Headers/WebRTC/RTCDtmfSender.h new file mode 100644 index 0000000000..20407102c6 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCDtmfSender.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "api/peerconnection/RTCDtmfSender.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h b/sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h new file mode 100644 index 0000000000..ec5b1d7087 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "components/renderer/opengl/RTCEAGLVideoView.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h b/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h new file mode 100644 index 0000000000..386989abf0 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "api/peerconnection/RTCFieldTrials.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h b/sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h new file mode 100644 index 0000000000..ae7d9ef95f --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCFileLogger.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCFileLogger.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h b/sdk/objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h new file mode 100644 index 0000000000..344eca9b00 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "components/capturer/RTCFileVideoCapturer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h b/sdk/objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h new file mode 100644 index 0000000000..57798148a0 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCH264ProfileLevelId.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "components/video_codec/RTCH264ProfileLevelId.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h b/sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h new file mode 100644 index 0000000000..dbeea22000 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCIceCandidate.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCIceCandidate.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h b/sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h new file mode 100644 index 0000000000..967b19c066 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCIceServer.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCIceServer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h b/sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h new file mode 100644 index 0000000000..a727a495fc --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCLegacyStatsReport.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCLogging.h b/sdk/objc/Framework/Headers/WebRTC/RTCLogging.h new file mode 100644 index 0000000000..bb5e25dbde --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCLogging.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "base/RTCLogging.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h b/sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h new file mode 100644 index 0000000000..4368a8a95b --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "components/renderer/metal/RTCMTLNSVideoView.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h b/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h new file mode 100644 index 0000000000..9f43dc5613 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "components/renderer/metal/RTCMTLVideoView.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h b/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h new file mode 100644 index 0000000000..8582a33600 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "base/RTCMacros.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h b/sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h new file mode 100644 index 0000000000..1059725c05 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCMediaConstraints.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCMediaConstraints.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h b/sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h new file mode 100644 index 0000000000..f642524d2a --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCMediaSource.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "api/peerconnection/RTCMediaSource.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h b/sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h new file mode 100644 index 0000000000..9b4d03213c --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCMediaStream.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCMediaStream.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h b/sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h new file mode 100644 index 0000000000..9de0edbfbd --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCMediaStreamTrack.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h b/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h new file mode 100644 index 0000000000..b44289ea34 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCMetrics.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "api/peerconnection/RTCMetrics.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h b/sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h new file mode 100644 index 0000000000..5ee84c1457 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "api/peerconnection/RTCMetricsSampleInfo.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h b/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h new file mode 100644 index 0000000000..3fa89aa30e --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "components/renderer/opengl/RTCNSGLVideoView.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h b/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h new file mode 100644 index 0000000000..df9bc85cdd --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCPeerConnection.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h b/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h new file mode 100644 index 0000000000..ff544a00c8 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCPeerConnectionFactory.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h b/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h new file mode 100644 index 0000000000..c4699c963e --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "api/peerconnection/RTCPeerConnectionFactoryOptions.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtcpParameters.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtcpParameters.h new file mode 100644 index 0000000000..28f4f5fcfc --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCRtcpParameters.h @@ -0,0 +1,11 @@ +/* + * Copyright 2018 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. + */ + +#import "api/peerconnection/RTCRtcpParameters.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h new file mode 100644 index 0000000000..d4b76012f9 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "api/peerconnection/RTCRtpCodecParameters.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h new file mode 100644 index 0000000000..a1510ba98f --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "api/peerconnection/RTCRtpEncodingParameters.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h new file mode 100644 index 0000000000..3bc6b2ba54 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h @@ -0,0 +1,11 @@ +/* + * Copyright 2018 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. + */ + +#import "api/peerconnection/RTCRtpHeaderExtension.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h new file mode 100644 index 0000000000..0e5b7e2178 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCRtpParameters.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "api/peerconnection/RTCRtpParameters.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h new file mode 100644 index 0000000000..ff61f824a0 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCRtpReceiver.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "api/peerconnection/RTCRtpReceiver.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h new file mode 100644 index 0000000000..d5a4e65d09 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCRtpSender.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "api/peerconnection/RTCRtpSender.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h b/sdk/objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h new file mode 100644 index 0000000000..ff07e29fb7 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h @@ -0,0 +1,11 @@ +/* + * Copyright 2018 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. + */ + +#import "api/peerconnection/RTCRtpTransceiver.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h b/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h new file mode 100644 index 0000000000..c721875e70 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "api/peerconnection/RTCSSLAdapter.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h b/sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h new file mode 100644 index 0000000000..b5d55f7729 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCSessionDescription.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCSessionDescription.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h b/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h new file mode 100644 index 0000000000..fd4a6ffecb --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCTracing.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "api/peerconnection/RTCTracing.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h new file mode 100644 index 0000000000..93586fc0d5 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCapturer.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "base/RTCVideoCapturer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h new file mode 100644 index 0000000000..b4511a9985 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h @@ -0,0 +1,20 @@ +/* + * 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. + */ + +#import "api/video_codec/RTCVideoCodecConstants.h" +#import "base/RTCCodecSpecificInfo.h" +#import "base/RTCEncodedImage.h" +#import "base/RTCRtpFragmentationHeader.h" +#import "base/RTCVideoCodecInfo.h" +#import "base/RTCVideoDecoder.h" +#import "base/RTCVideoEncoder.h" +#import "base/RTCVideoEncoderQpThresholds.h" +#import "base/RTCVideoEncoderSettings.h" +#import "components/video_codec/RTCH264ProfileLevelId.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h new file mode 100644 index 0000000000..5e8d353aa1 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h @@ -0,0 +1,14 @@ +/* + * 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. + */ + +#import "base/RTCVideoDecoderFactory.h" +#import "base/RTCVideoEncoderFactory.h" +#import "components/video_codec/RTCDefaultVideoDecoderFactory.h" +#import "components/video_codec/RTCDefaultVideoEncoderFactory.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h new file mode 100644 index 0000000000..d1ff92e27a --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h @@ -0,0 +1,16 @@ +/* + * 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. + */ + +#import "components/video_codec/RTCCodecSpecificInfoH264.h" +#import "components/video_codec/RTCH264ProfileLevelId.h" +#import "components/video_codec/RTCVideoDecoderFactoryH264.h" +#import "components/video_codec/RTCVideoDecoderH264.h" +#import "components/video_codec/RTCVideoEncoderFactoryH264.h" +#import "components/video_codec/RTCVideoEncoderH264.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h new file mode 100644 index 0000000000..10c5fea465 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecInfo.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "base/RTCVideoCodecInfo.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h new file mode 100644 index 0000000000..9c9e840e6d --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "api/video_codec/RTCVideoDecoderVP8.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h new file mode 100644 index 0000000000..1a7c38267b --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "api/video_codec/RTCVideoDecoderVP9.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h new file mode 100644 index 0000000000..65a7850884 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "api/video_codec/RTCVideoEncoderVP8.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h new file mode 100644 index 0000000000..5d01835805 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "api/video_codec/RTCVideoEncoderVP9.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h new file mode 100644 index 0000000000..ec1543d8e3 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "base/RTCVideoFrame.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h new file mode 100644 index 0000000000..8d4be50868 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h @@ -0,0 +1,18 @@ +/* + * 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. + */ + +#import "api/video_frame_buffer/RTCNativeI420Buffer.h" +#import "api/video_frame_buffer/RTCNativeMutableI420Buffer.h" +#import "base/RTCI420Buffer.h" +#import "base/RTCMutableI420Buffer.h" +#import "base/RTCMutableYUVPlanarBuffer.h" +#import "base/RTCVideoFrameBuffer.h" +#import "base/RTCYUVPlanarBuffer.h" +#import "components/video_frame_buffer/RTCCVPixelBuffer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h new file mode 100644 index 0000000000..0e32c02c9a --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoRenderer.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "base/RTCVideoRenderer.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h new file mode 100644 index 0000000000..91e635de6c --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoSource.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCVideoSource.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h new file mode 100644 index 0000000000..b5dd1ddf59 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoTrack.h @@ -0,0 +1,11 @@ +/* + * Copyright 2015 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. + */ + +#import "api/peerconnection/RTCVideoTrack.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h new file mode 100644 index 0000000000..7c6cd7a2e5 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoViewShading.h @@ -0,0 +1,11 @@ +/* + * 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. + */ + +#import "components/renderer/opengl/RTCVideoViewShading.h" diff --git a/sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h b/sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h new file mode 100644 index 0000000000..724dc8dca4 --- /dev/null +++ b/sdk/objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h @@ -0,0 +1,11 @@ +/* + * Copyright 2016 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. + */ + +#import "helpers/UIDevice+RTCDevice.h" diff --git a/tools_webrtc/apple/copy_framework_header.py b/tools_webrtc/apple/copy_framework_header.py deleted file mode 100755 index d194650934..0000000000 --- a/tools_webrtc/apple/copy_framework_header.py +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2020 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. - -import argparse -import re -import sys - - -def replace_double_quote(line): - re_rtc_import = re.compile( - r'(\s*)#import\s+"(\S+/|)(\w+\+|)RTC(\w+)\.h"(.*)', re.DOTALL) - match = re_rtc_import.match(line) - if not match: - return line - - return '%s#import %s' % (match.group(1), match.group(3), - match.group(4), match.group(5)) - - -def process(input_file, output_file): - with open(input_file, 'rb') as fb, open(output_file, 'wb') as fw: - for line in fb.read().decode('UTF-8').splitlines(): - fw.write(replace_double_quote(line).encode('UTF-8')) - fw.write(b"\n") - - -def main(): - parser = argparse.ArgumentParser( - description= - "Copy headers of framework and replace double-quoted includes to" + - " angle-bracketed respectively.") - parser.add_argument('--input', - help='Input header files to copy.', - type=str) - parser.add_argument('--output', help='Output file.', type=str) - parsed_args = parser.parse_args() - return process(parsed_args.input, parsed_args.output) - - -if __name__ == '__main__': - sys.exit(main()) diff --git a/tools_webrtc/apple/copy_framework_header_test.py b/tools_webrtc/apple/copy_framework_header_test.py deleted file mode 100644 index 24bab3eb0b..0000000000 --- a/tools_webrtc/apple/copy_framework_header_test.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2020 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. - -import unittest -from copy_framework_header import replace_double_quote - - -class TestCopyFramework(unittest.TestCase): - def testReplaceDoubleQuote(self): - self.assertEqual(replace_double_quote("""#import "RTCMacros.h\""""), - """#import """) - self.assertEqual(replace_double_quote("""#import "RTCMacros.h\"\n"""), - """#import \n""") - self.assertEqual( - replace_double_quote("""#import "UIDevice+RTCDevice.h\"\n"""), - """#import \n""") - self.assertEqual( - replace_double_quote("#import \"components/video_codec/" + - "RTCVideoDecoderFactoryH264.h\"\n"), - """#import \n""") - self.assertEqual( - replace_double_quote( - """@property(atomic, strong) RTC_OBJC_TYPE(RTCVideoFrame) *\n""" - ), - """@property(atomic, strong) RTC_OBJC_TYPE(RTCVideoFrame) *\n""") - - -if __name__ == '__main__': - unittest.main() diff --git a/webrtc.gni b/webrtc.gni index 4272e441f0..fa3765aa7e 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -891,39 +891,17 @@ if (is_ios) { # projects. See "mac_framework_bundle_with_umbrella_header". template("ios_framework_bundle_with_umbrella_header") { forward_variables_from(invoker, [ "output_name" ]) - this_target_name = target_name umbrella_header_path = - "$target_gen_dir/$output_name.framework/WebRTC/$output_name.h" - - action_foreach("create_bracket_include_headers_$target_name") { - script = "//tools_webrtc/apple/copy_framework_header.py" - sources = invoker.sources - output_name = invoker.output_name - outputs = [ - "$target_gen_dir/$output_name.framework/WebRTC/{{source_file_part}}", - ] - args = [ - "--input", - "{{source}}", - "--output", - rebase_path(target_gen_dir, root_build_dir) + - "/$output_name.framework/WebRTC/{{source_file_part}}", - ] - } + "$target_gen_dir/$output_name.framework/Headers/$output_name.h" ios_framework_bundle(target_name) { - forward_variables_from(invoker, "*", [ "public_headers" ]) - public_headers = get_target_outputs( - ":create_bracket_include_headers_$this_target_name") - deps += [ - ":copy_umbrella_header_$target_name", - ":create_bracket_include_headers_$target_name", - ] + forward_variables_from(invoker, "*", []) + + deps += [ ":copy_umbrella_header_$target_name" ] } action("umbrella_header_$target_name") { - public_headers = get_target_outputs( - ":create_bracket_include_headers_$this_target_name") + forward_variables_from(invoker, [ "public_headers" ]) script = "//tools_webrtc/ios/generate_umbrella_header.py" @@ -933,7 +911,6 @@ if (is_ios) { rebase_path(umbrella_header_path, root_build_dir), "--sources", ] + public_headers - deps = [ ":create_bracket_include_headers_$this_target_name" ] } copy("copy_umbrella_header_$target_name") { @@ -980,34 +957,15 @@ if (is_mac) { ":copy_framework_headers_$this_target_name", ":copy_modulemap_$this_target_name", ":copy_umbrella_header_$this_target_name", - ":create_bracket_include_headers_$this_target_name", ":modulemap_$this_target_name", ":umbrella_header_$this_target_name", ] } - action_foreach("create_bracket_include_headers_$this_target_name") { - script = "//tools_webrtc/apple/copy_framework_header.py" - sources = invoker.sources - output_name = invoker.output_name - outputs = [ - "$target_gen_dir/$output_name.framework/WebRTC/{{source_file_part}}", - ] - args = [ - "--input", - "{{source}}", - "--output", - rebase_path(target_gen_dir, root_build_dir) + - "/$output_name.framework/WebRTC/{{source_file_part}}", - ] - } - bundle_data("copy_framework_headers_$this_target_name") { - sources = get_target_outputs( - ":create_bracket_include_headers_$this_target_name") + forward_variables_from(invoker, [ "sources" ]) outputs = [ "{{bundle_contents_dir}}/Headers/{{source_file_part}}" ] - deps = [ ":create_bracket_include_headers_$this_target_name" ] } action("modulemap_$this_target_name") { @@ -1028,8 +986,7 @@ if (is_mac) { } action("umbrella_header_$this_target_name") { - sources = get_target_outputs( - ":create_bracket_include_headers_$this_target_name") + forward_variables_from(invoker, [ "sources" ]) script = "//tools_webrtc/ios/generate_umbrella_header.py" @@ -1039,7 +996,6 @@ if (is_mac) { rebase_path(umbrella_header_path, root_build_dir), "--sources", ] + sources - deps = [ ":create_bracket_include_headers_$this_target_name" ] } bundle_data("copy_umbrella_header_$this_target_name") {