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

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

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

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

@ -9,8 +9,9 @@
*/
#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) {
// Disconnected from servers.

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

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

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

@ -10,7 +10,7 @@
#import "ARDAppEngineClient.h"
#import <WebRTC/RTCLogging.h>
#import "sdk/objc/base/RTCLogging.h"
#import "ARDJoinResponse.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.
*/
#import <WebRTC/RTCCameraVideoCapturer.h>
#import "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
@class ARDSettingsModel;

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

@ -10,7 +10,7 @@
#import "ARDCaptureController.h"
#import <WebRTC/RTCLogging.h>
#import "sdk/objc/base/RTCLogging.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.
*/
#import <WebRTC/RTCVideoCapturer.h>
#import "sdk/objc/base/RTCVideoCapturer.h"
@protocol ARDExternalSampleDelegate <NSObject>
- (void)didCaptureSampleBuffer:(CMSampleBufferRef)sampleBuffer;

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

@ -10,8 +10,14 @@
#import "ARDExternalSampleCapturer.h"
#import <WebRTC/RTCCVPixelBuffer.h>
#import <WebRTC/RTCVideoFrameBuffer.h>
#import "sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -10,7 +10,8 @@
#import "ARDWebSocketChannel.h"
#import <WebRTC/RTCLogging.h>
#import "sdk/objc/base/RTCLogging.h"
#import "SRWebSocket.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.
*/
#import <WebRTC/RTCIceCandidate.h>
#import "sdk/objc/api/peerconnection/RTCIceCandidate.h"
@interface RTC_OBJC_TYPE (RTCIceCandidate)
(JSON)

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

@ -10,7 +10,7 @@
#import "RTCIceCandidate+JSON.h"
#import <WebRTC/RTCLogging.h>
#import "sdk/objc/base/RTCLogging.h"
static NSString const *kRTCICECandidateTypeKey = @"type";
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.
*/
#import <WebRTC/RTCIceServer.h>
#import "sdk/objc/api/peerconnection/RTCIceServer.h"
@interface RTC_OBJC_TYPE (RTCIceServer)
(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.
*/
#import <WebRTC/RTCSessionDescription.h>
#import "sdk/objc/api/peerconnection/RTCSessionDescription.h"
@interface RTC_OBJC_TYPE (RTCSessionDescription)
(JSON)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -10,11 +10,11 @@
#import "ARDVideoCallViewController.h"
#import <WebRTC/RTCAudioSession.h>
#import <WebRTC/RTCCameraVideoCapturer.h>
#import <WebRTC/RTCDispatcher.h>
#import <WebRTC/RTCLogging.h>
#import <WebRTC/RTCMediaConstraints.h>
#import "sdk/objc/api/peerconnection/RTCMediaConstraints.h"
#import "sdk/objc/base/RTCLogging.h"
#import "sdk/objc/components/audio/RTCAudioSession.h"
#import "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
#import "sdk/objc/helpers/RTCDispatcher.h"
#import "ARDAppClient.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.
*/
#import <WebRTC/RTCVideoCodecInfo.h>
#import "sdk/objc/base/RTCVideoCodecInfo.h"
@interface RTC_OBJC_TYPE (RTCVideoCodecInfo)
(HumanReadable)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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