zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch AppRTCMobile #import headers.

Browse Source 
Bug: None
Change-Id: Ia03faae59e4891039fc6c0acdeb51fdfea048c7b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/189547
Reviewed-by: Anders Carlsson <andersc@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32447}
This commit is contained in:
Mirko Bonadei
2020-10-19 16:12:43 +02:00
committed by Commit Bot
parent d273ed0320
commit 19640aa61b
40 changed files with 121 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
examples/BUILD.gn
View File

@ -233,13 +233,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
"objc/AppRTCMobile/common/ARDUtilities.m", "objc/AppRTCMobile/common/ARDUtilities.m",
] ]
public_configs = [ ":apprtc_common_config" ] public_configs = [ ":apprtc_common_config" ]
deps = [ "../sdk:base_objc" ]
if (is_ios) {
# iOS must use WebRTC.framework which is dynamically linked.
deps = [ "../sdk:framework_objc+link" ]
} else {
deps = [ "../sdk:mac_framework_objc+link" ]
}
} }
config("apprtc_signaling_config") { config("apprtc_signaling_config") {
@ -298,17 +292,16 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
deps = [ deps = [
":apprtc_common", ":apprtc_common",
":socketrocket", ":socketrocket",
"../sdk:base_objc",
"../sdk:default_codec_factory_objc",
"../sdk:file_logger_objc",
"../sdk:helpers_objc",
"../sdk:mediaconstraints_objc",
"../sdk:peerconnectionfactory_base_objc",
"../sdk:videocapture_objc",
"../sdk:videoframebuffer_objc",
"../sdk:videosource_objc",
] ]
if (is_ios) {
# iOS must use WebRTC.framework which is dynamically linked.
deps += [
"../sdk:framework_objc+link",
"../sdk:ios_framework_bundle",
]
} else {
deps += [ "../sdk:mac_framework_objc+link" ]
}
frameworks = [ frameworks = [
"CoreMedia.framework", "CoreMedia.framework",
"QuartzCore.framework", "QuartzCore.framework",
@ -347,9 +340,19 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
deps = [ deps = [
":apprtc_common", ":apprtc_common",
":apprtc_signaling", ":apprtc_signaling",
"../sdk:framework_objc+link", "../sdk:audio_session_objc",
"../sdk:ios_framework_bundle", "../sdk:base_objc",
"../sdk:helpers_objc",
"../sdk:mediaconstraints_objc",
"../sdk:peerconnectionfactory_base_objc",
"../sdk:peerconnectionfactory_base_objc",
"../sdk:ui_objc",
"../sdk:videocapture_objc",
"../sdk:videocodec_objc",
] ]
if (rtc_use_metal_rendering) {
deps += [ "../sdk:metal_objc" ]
}
frameworks = [ "AVFoundation.framework" ] frameworks = [ "AVFoundation.framework" ]
} }
@ -539,7 +542,15 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
deps = [ deps = [
":apprtc_common", ":apprtc_common",
":apprtc_signaling", ":apprtc_signaling",
"../sdk:mac_framework_objc+link", "../sdk:base_objc",
"../sdk:helpers_objc",
"../sdk:mediaconstraints_objc",
"../sdk:metal_objc",
"../sdk:peerconnectionfactory_base_objc",
"../sdk:peerconnectionfactory_base_objc",
"../sdk:ui_objc",
"../sdk:videocapture_objc",
"../sdk:videocodec_objc",
] ]
} }
@ -624,8 +635,9 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
":AppRTCMobile_lib", ":AppRTCMobile_lib",
":apprtc_signaling", ":apprtc_signaling",
"../rtc_base", "../rtc_base",
"../sdk:framework_objc+link", "../sdk:mediaconstraints_objc",
"../sdk:ios_framework_bundle", "../sdk:peerconnectionfactory_base_objc",
"../sdk:videocapture_objc",
"//build/config/ios:xctest", "//build/config/ios:xctest",
"//third_party/ocmock", "//third_party/ocmock",
] ]

2
examples/objc/AppRTCMobile/ARDAppClient+Internal.h
View File

@ -10,7 +10,7 @@
#import "ARDAppClient.h" #import "ARDAppClient.h"
#import <WebRTC/RTCPeerConnection.h> #import "sdk/objc/api/peerconnection/RTCPeerConnection.h"
#import "ARDRoomServerClient.h" #import "ARDRoomServerClient.h"
#import "ARDSignalingChannel.h" #import "ARDSignalingChannel.h"

5
examples/objc/AppRTCMobile/ARDAppClient.h
View File

@ -9,8 +9,9 @@
*/ */
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <WebRTC/RTCPeerConnection.h>
#import <WebRTC/RTCVideoTrack.h> #import "sdk/objc/api/peerconnection/RTCPeerConnection.h"
#import "sdk/objc/api/peerconnection/RTCVideoTrack.h"
typedef NS_ENUM(NSInteger, ARDAppClientState) { typedef NS_ENUM(NSInteger, ARDAppClientState) {
// Disconnected from servers. // Disconnected from servers.

34
examples/objc/AppRTCMobile/ARDAppClient.m
View File

@ -10,23 +10,23 @@
#import "ARDAppClient+Internal.h" #import "ARDAppClient+Internal.h"
#import <WebRTC/RTCAudioTrack.h> #import "sdk/objc/api/peerconnection/RTCAudioTrack.h"
#import <WebRTC/RTCCameraVideoCapturer.h> #import "sdk/objc/api/peerconnection/RTCConfiguration.h"
#import <WebRTC/RTCConfiguration.h> #import "sdk/objc/api/peerconnection/RTCFileLogger.h"
#import <WebRTC/RTCDefaultVideoDecoderFactory.h> #import "sdk/objc/api/peerconnection/RTCIceServer.h"
#import <WebRTC/RTCDefaultVideoEncoderFactory.h> #import "sdk/objc/api/peerconnection/RTCMediaConstraints.h"
#import <WebRTC/RTCFileLogger.h> #import "sdk/objc/api/peerconnection/RTCMediaStream.h"
#import <WebRTC/RTCFileVideoCapturer.h> #import "sdk/objc/api/peerconnection/RTCPeerConnectionFactory.h"
#import <WebRTC/RTCIceServer.h> #import "sdk/objc/api/peerconnection/RTCRtpSender.h"
#import <WebRTC/RTCLogging.h> #import "sdk/objc/api/peerconnection/RTCRtpTransceiver.h"
#import <WebRTC/RTCMediaConstraints.h> #import "sdk/objc/api/peerconnection/RTCTracing.h"
#import <WebRTC/RTCMediaStream.h> #import "sdk/objc/api/peerconnection/RTCVideoSource.h"
#import <WebRTC/RTCPeerConnectionFactory.h> #import "sdk/objc/api/peerconnection/RTCVideoTrack.h"
#import <WebRTC/RTCRtpSender.h> #import "sdk/objc/base/RTCLogging.h"
#import <WebRTC/RTCRtpTransceiver.h> #import "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
#import <WebRTC/RTCTracing.h> #import "sdk/objc/components/capturer/RTCFileVideoCapturer.h"
#import <WebRTC/RTCVideoSource.h> #import "sdk/objc/components/video_codec/RTCDefaultVideoDecoderFactory.h"
#import <WebRTC/RTCVideoTrack.h> #import "sdk/objc/components/video_codec/RTCDefaultVideoEncoderFactory.h"
#import "ARDAppEngineClient.h" #import "ARDAppEngineClient.h"
#import "ARDExternalSampleCapturer.h" #import "ARDExternalSampleCapturer.h"

2
examples/objc/AppRTCMobile/ARDAppEngineClient.m
View File

@ -10,7 +10,7 @@
#import "ARDAppEngineClient.h" #import "ARDAppEngineClient.h"
#import <WebRTC/RTCLogging.h> #import "sdk/objc/base/RTCLogging.h"
#import "ARDJoinResponse.h" #import "ARDJoinResponse.h"
#import "ARDMessageResponse.h" #import "ARDMessageResponse.h"

2
examples/objc/AppRTCMobile/ARDCaptureController.h
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#import <WebRTC/RTCCameraVideoCapturer.h> #import "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
@class ARDSettingsModel; @class ARDSettingsModel;

2
examples/objc/AppRTCMobile/ARDCaptureController.m
View File

@ -10,7 +10,7 @@
#import "ARDCaptureController.h" #import "ARDCaptureController.h"
#import <WebRTC/RTCLogging.h> #import "sdk/objc/base/RTCLogging.h"
#import "ARDSettingsModel.h" #import "ARDSettingsModel.h"

2
examples/objc/AppRTCMobile/ARDExternalSampleCapturer.h
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#import <WebRTC/RTCVideoCapturer.h> #import "sdk/objc/base/RTCVideoCapturer.h"
@protocol ARDExternalSampleDelegate <NSObject> @protocol ARDExternalSampleDelegate <NSObject>
- (void)didCaptureSampleBuffer:(CMSampleBufferRef)sampleBuffer; - (void)didCaptureSampleBuffer:(CMSampleBufferRef)sampleBuffer;

10
examples/objc/AppRTCMobile/ARDExternalSampleCapturer.m
View File

@ -10,8 +10,14 @@
#import "ARDExternalSampleCapturer.h" #import "ARDExternalSampleCapturer.h"
#import <WebRTC/RTCCVPixelBuffer.h> #import "sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.h"
#import <WebRTC/RTCVideoFrameBuffer.h> #import "sdk/objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.h"
#import "sdk/objc/base/RTCI420Buffer.h"
#import "sdk/objc/base/RTCMutableI420Buffer.h"
#import "sdk/objc/base/RTCMutableYUVPlanarBuffer.h"
#import "sdk/objc/base/RTCVideoFrameBuffer.h"
#import "sdk/objc/base/RTCYUVPlanarBuffer.h"
#import "sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.h"
@implementation ARDExternalSampleCapturer @implementation ARDExternalSampleCapturer

2
examples/objc/AppRTCMobile/ARDSettingsModel.h
View File

@ -10,7 +10,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <WebRTC/RTCVideoCodecInfo.h> #import "sdk/objc/base/RTCVideoCodecInfo.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

6
examples/objc/AppRTCMobile/ARDSettingsModel.m
View File

@ -11,9 +11,9 @@
#import "ARDSettingsModel+Private.h" #import "ARDSettingsModel+Private.h"
#import "ARDSettingsStore.h" #import "ARDSettingsStore.h"
#import <WebRTC/RTCCameraVideoCapturer.h> #import "sdk/objc/api/peerconnection/RTCMediaConstraints.h"
#import <WebRTC/RTCDefaultVideoEncoderFactory.h> #import "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
#import <WebRTC/RTCMediaConstraints.h> #import "sdk/objc/components/video_codec/RTCDefaultVideoEncoderFactory.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

4
examples/objc/AppRTCMobile/ARDSignalingMessage.h
View File

@ -10,8 +10,8 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <WebRTC/RTCIceCandidate.h> #import "sdk/objc/api/peerconnection/RTCIceCandidate.h"
#import <WebRTC/RTCSessionDescription.h> #import "sdk/objc/api/peerconnection/RTCSessionDescription.h"
typedef enum { typedef enum {
kARDSignalingMessageTypeCandidate, kARDSignalingMessageTypeCandidate,

2
examples/objc/AppRTCMobile/ARDSignalingMessage.m
View File

@ -10,7 +10,7 @@
#import "ARDSignalingMessage.h" #import "ARDSignalingMessage.h"
#import <WebRTC/RTCLogging.h> #import "sdk/objc/base/RTCLogging.h"
#import "ARDUtilities.h" #import "ARDUtilities.h"
#import "RTCIceCandidate+JSON.h" #import "RTCIceCandidate+JSON.h"

2
examples/objc/AppRTCMobile/ARDStatsBuilder.h
View File

@ -10,7 +10,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <WebRTC/RTCMacros.h> #import "sdk/objc/base/RTCMacros.h"
@class RTC_OBJC_TYPE(RTCLegacyStatsReport); @class RTC_OBJC_TYPE(RTCLegacyStatsReport);

4
examples/objc/AppRTCMobile/ARDStatsBuilder.m
View File

@ -10,8 +10,8 @@
#import "ARDStatsBuilder.h" #import "ARDStatsBuilder.h"
#import <WebRTC/RTCLegacyStatsReport.h> #import "sdk/objc/api/peerconnection/RTCLegacyStatsReport.h"
#import <WebRTC/RTCMacros.h> #import "sdk/objc/base/RTCMacros.h"
#import "ARDBitrateTracker.h" #import "ARDBitrateTracker.h"
#import "ARDUtilities.h" #import "ARDUtilities.h"

2
examples/objc/AppRTCMobile/ARDTURNClient.h
View File

@ -10,7 +10,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <WebRTC/RTCMacros.h> #import "sdk/objc/base/RTCMacros.h"
@class RTC_OBJC_TYPE(RTCIceServer); @class RTC_OBJC_TYPE(RTCIceServer);

3
examples/objc/AppRTCMobile/ARDWebSocketChannel.m
View File

@ -10,7 +10,8 @@
#import "ARDWebSocketChannel.h" #import "ARDWebSocketChannel.h"
#import <WebRTC/RTCLogging.h> #import "sdk/objc/base/RTCLogging.h"
#import "SRWebSocket.h" #import "SRWebSocket.h"
#import "ARDSignalingMessage.h" #import "ARDSignalingMessage.h"

2
examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#import <WebRTC/RTCIceCandidate.h> #import "sdk/objc/api/peerconnection/RTCIceCandidate.h"
@interface RTC_OBJC_TYPE (RTCIceCandidate) @interface RTC_OBJC_TYPE (RTCIceCandidate)
(JSON) (JSON)

2
examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m
View File

@ -10,7 +10,7 @@
#import "RTCIceCandidate+JSON.h" #import "RTCIceCandidate+JSON.h"
#import <WebRTC/RTCLogging.h> #import "sdk/objc/base/RTCLogging.h"
static NSString const *kRTCICECandidateTypeKey = @"type"; static NSString const *kRTCICECandidateTypeKey = @"type";
static NSString const *kRTCICECandidateTypeValue = @"candidate"; static NSString const *kRTCICECandidateTypeValue = @"candidate";

2
examples/objc/AppRTCMobile/RTCIceServer+JSON.h
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#import <WebRTC/RTCIceServer.h> #import "sdk/objc/api/peerconnection/RTCIceServer.h"
@interface RTC_OBJC_TYPE (RTCIceServer) @interface RTC_OBJC_TYPE (RTCIceServer)
(JSON) (JSON)

2
examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#import <WebRTC/RTCSessionDescription.h> #import "sdk/objc/api/peerconnection/RTCSessionDescription.h"
@interface RTC_OBJC_TYPE (RTCSessionDescription) @interface RTC_OBJC_TYPE (RTCSessionDescription)
(JSON) (JSON)

2
examples/objc/AppRTCMobile/common/ARDUtilities.m
View File

@ -12,7 +12,7 @@
#import <mach/mach.h> #import <mach/mach.h>
#import <WebRTC/RTCLogging.h> #import "sdk/objc/base/RTCLogging.h"
@implementation NSDictionary (ARDUtilites) @implementation NSDictionary (ARDUtilites)

8
examples/objc/AppRTCMobile/ios/ARDAppDelegate.m
View File

@ -10,10 +10,10 @@
#import "ARDAppDelegate.h" #import "ARDAppDelegate.h"
#import <WebRTC/RTCFieldTrials.h> #import "sdk/objc/api/peerconnection/RTCFieldTrials.h"
#import <WebRTC/RTCLogging.h> #import "sdk/objc/api/peerconnection/RTCSSLAdapter.h"
#import <WebRTC/RTCSSLAdapter.h> #import "sdk/objc/api/peerconnection/RTCTracing.h"
#import <WebRTC/RTCTracing.h> #import "sdk/objc/base/RTCLogging.h"
#import "ARDMainViewController.h" #import "ARDMainViewController.h"

2
examples/objc/AppRTCMobile/ios/ARDFileCaptureController.h
View File

@ -10,7 +10,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <WebRTC/RTCMacros.h> #import "sdk/objc/base/RTCMacros.h"
@class RTC_OBJC_TYPE(RTCFileVideoCapturer); @class RTC_OBJC_TYPE(RTCFileVideoCapturer);

2
examples/objc/AppRTCMobile/ios/ARDFileCaptureController.m
View File

@ -10,7 +10,7 @@
#import "ARDFileCaptureController.h" #import "ARDFileCaptureController.h"
#import <WebRTC/RTCFileVideoCapturer.h> #import "sdk/objc/components/capturer/RTCFileVideoCapturer.h"
@interface ARDFileCaptureController () @interface ARDFileCaptureController ()

8
examples/objc/AppRTCMobile/ios/ARDMainViewController.m
View File

@ -12,10 +12,10 @@
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#import <WebRTC/RTCAudioSession.h> #import "sdk/objc/base/RTCLogging.h"
#import <WebRTC/RTCAudioSessionConfiguration.h> #import "sdk/objc/components/audio/RTCAudioSession.h"
#import <WebRTC/RTCDispatcher.h> #import "sdk/objc/components/audio/RTCAudioSessionConfiguration.h"
#import <WebRTC/RTCLogging.h> #import "sdk/objc/helpers/RTCDispatcher.h"
#import "ARDAppClient.h" #import "ARDAppClient.h"
#import "ARDMainView.h" #import "ARDMainView.h"

2
examples/objc/AppRTCMobile/ios/ARDStatsView.m
View File

@ -10,7 +10,7 @@
#import "ARDStatsView.h" #import "ARDStatsView.h"
#import <WebRTC/RTCLegacyStatsReport.h> #import "sdk/objc/api/peerconnection/RTCLegacyStatsReport.h"
#import "ARDStatsBuilder.h" #import "ARDStatsBuilder.h"

4
examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
View File

@ -10,8 +10,8 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import <WebRTC/RTCCameraPreviewView.h> #import "sdk/objc/base/RTCVideoRenderer.h"
#import <WebRTC/RTCVideoRenderer.h> #import "sdk/objc/helpers/RTCCameraPreviewView.h"
#import "ARDStatsView.h" #import "ARDStatsView.h"

4
examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
View File

@ -12,9 +12,9 @@
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#import <WebRTC/RTCEAGLVideoView.h> #import "sdk/objc/components/renderer/opengl/RTCEAGLVideoView.h"
#if defined(RTC_SUPPORTS_METAL) #if defined(RTC_SUPPORTS_METAL)
#import <WebRTC/RTCMTLVideoView.h> #import "sdk/objc/components/renderer/metal/RTCMTLVideoView.h" // nogncheck
#endif #endif
#import "UIImage+ARDUtilities.h" #import "UIImage+ARDUtilities.h"

10
examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m
View File

@ -10,11 +10,11 @@
#import "ARDVideoCallViewController.h" #import "ARDVideoCallViewController.h"
#import <WebRTC/RTCAudioSession.h> #import "sdk/objc/api/peerconnection/RTCMediaConstraints.h"
#import <WebRTC/RTCCameraVideoCapturer.h> #import "sdk/objc/base/RTCLogging.h"
#import <WebRTC/RTCDispatcher.h> #import "sdk/objc/components/audio/RTCAudioSession.h"
#import <WebRTC/RTCLogging.h> #import "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
#import <WebRTC/RTCMediaConstraints.h> #import "sdk/objc/helpers/RTCDispatcher.h"
#import "ARDAppClient.h" #import "ARDAppClient.h"
#import "ARDCaptureController.h" #import "ARDCaptureController.h"

2
examples/objc/AppRTCMobile/ios/RTCVideoCodecInfo+HumanReadable.h
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#import <WebRTC/RTCVideoCodecInfo.h> #import "sdk/objc/base/RTCVideoCodecInfo.h"
@interface RTC_OBJC_TYPE (RTCVideoCodecInfo) @interface RTC_OBJC_TYPE (RTCVideoCodecInfo)
(HumanReadable) (HumanReadable)

2
examples/objc/AppRTCMobile/ios/RTCVideoCodecInfo+HumanReadable.m
View File

@ -10,7 +10,7 @@
#import "RTCVideoCodecInfo+HumanReadable.h" #import "RTCVideoCodecInfo+HumanReadable.h"
#import <WebRTC/RTCH264ProfileLevelId.h> #import "sdk/objc/components/video_codec/RTCH264ProfileLevelId.h"
@implementation RTC_OBJC_TYPE (RTCVideoCodecInfo) @implementation RTC_OBJC_TYPE (RTCVideoCodecInfo)
(HumanReadable) (HumanReadable)

2
examples/objc/AppRTCMobile/ios/broadcast_extension/ARDBroadcastSampleHandler.h
View File

@ -10,7 +10,7 @@
#import <ReplayKit/ReplayKit.h> #import <ReplayKit/ReplayKit.h>
#import <WebRTC/RTCLogging.h> #import "sdk/objc/base/RTCLogging.h"
#import "ARDAppClient.h" #import "ARDAppClient.h"

4
examples/objc/AppRTCMobile/ios/broadcast_extension/ARDBroadcastSampleHandler.m
View File

@ -15,8 +15,8 @@
#import "ARDExternalSampleCapturer.h" #import "ARDExternalSampleCapturer.h"
#import "ARDSettingsModel.h" #import "ARDSettingsModel.h"
#import <WebRTC/RTCCallbackLogger.h> #import "sdk/objc/api/logging/RTCCallbackLogger.h"
#import <WebRTC/RTCLogging.h> #import "sdk/objc/base/RTCLogging.h"
@implementation ARDBroadcastSampleHandler { @implementation ARDBroadcastSampleHandler {
ARDAppClient *_client; ARDAppClient *_client;

2
examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m
View File

@ -10,7 +10,7 @@
#import "APPRTCAppDelegate.h" #import "APPRTCAppDelegate.h"
#import "APPRTCViewController.h" #import "APPRTCViewController.h"
#import <WebRTC/RTCSSLAdapter.h> #import "sdk/objc/api/peerconnection/RTCSSLAdapter.h"
@interface APPRTCAppDelegate () <NSWindowDelegate> @interface APPRTCAppDelegate () <NSWindowDelegate>
@end @end

6
examples/objc/AppRTCMobile/mac/APPRTCViewController.m
View File

@ -12,9 +12,9 @@
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#import <WebRTC/RTCMTLNSVideoView.h> #import "sdk/objc/api/peerconnection/RTCVideoTrack.h"
#import <WebRTC/RTCNSGLVideoView.h> #import "sdk/objc/components/renderer/metal/RTCMTLNSVideoView.h"
#import <WebRTC/RTCVideoTrack.h> #import "sdk/objc/components/renderer/opengl/RTCNSGLVideoView.h"
#import "ARDAppClient.h" #import "ARDAppClient.h"
#import "ARDCaptureController.h" #import "ARDCaptureController.h"

4
examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
View File

@ -15,8 +15,8 @@
#include "rtc_base/ssl_adapter.h" #include "rtc_base/ssl_adapter.h"
#import <WebRTC/RTCMediaConstraints.h> #import "sdk/objc/api/peerconnection/RTCMediaConstraints.h"
#import <WebRTC/RTCPeerConnectionFactory.h> #import "sdk/objc/api/peerconnection/RTCPeerConnectionFactory.h"
#import "ARDAppClient+Internal.h" #import "ARDAppClient+Internal.h"
#import "ARDJoinResponse+Internal.h" #import "ARDJoinResponse+Internal.h"

2
examples/objc/AppRTCMobile/tests/ARDFileCaptureController_xctest.mm
View File

@ -14,7 +14,7 @@
#import "ARDFileCaptureController.h" #import "ARDFileCaptureController.h"
#import <WebRTC/RTCFileVideoCapturer.h> #import "sdk/objc/components/capturer/RTCFileVideoCapturer.h"
NS_CLASS_AVAILABLE_IOS(10) NS_CLASS_AVAILABLE_IOS(10)
@interface ARDFileCaptureControllerTests : XCTestCase @interface ARDFileCaptureControllerTests : XCTestCase

2
examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm
View File

@ -12,7 +12,7 @@
#import <OCMock/OCMock.h> #import <OCMock/OCMock.h>
#import <XCTest/XCTest.h> #import <XCTest/XCTest.h>
#import <WebRTC/RTCMediaConstraints.h> #import "sdk/objc/api/peerconnection/RTCMediaConstraints.h"
#import "ARDSettingsModel+Private.h" #import "ARDSettingsModel+Private.h"
#import "ARDSettingsStore.h" #import "ARDSettingsStore.h"

9
sdk/BUILD.gn
View File

@ -579,16 +579,13 @@ if (is_ios || is_mac) {
sources = [ sources = [
"objc/components/capturer/RTCCameraVideoCapturer.h", "objc/components/capturer/RTCCameraVideoCapturer.h",
"objc/components/capturer/RTCCameraVideoCapturer.m", "objc/components/capturer/RTCCameraVideoCapturer.m",
"objc/components/capturer/RTCFileVideoCapturer.h",
"objc/components/capturer/RTCFileVideoCapturer.m",
] ]
if (is_ios) {
sources += [
"objc/components/capturer/RTCFileVideoCapturer.h",
"objc/components/capturer/RTCFileVideoCapturer.m",
]
}
frameworks = [ frameworks = [
"AVFoundation.framework", "AVFoundation.framework",
"CoreVideo.framework", "CoreVideo.framework",
"QuartzCore.framework",
] ]
configs += [ "..:common_objc" ] configs += [ "..:common_objc" ]