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

Obj-C SDK Cleanup

Browse Source 
This CL separates the files under sdk/objc into logical directories, replacing
the previous file layout under Framework/.

A long term goal is to have some system set up to generate the files under
sdk/objc/api (the PeerConnection API wrappers) from the C++ code. In the shorter
term the goal is to abstract out shared concepts from these classes in order to
make them as uniform as possible.

The separation into base/, components/, and helpers/ are to differentiate between
the base layer's common protocols, various utilities and the actual platform
specific components.

The old directory layout that resembled a framework's internal layout is not
necessary, since it is generated by the framework target when building it.

Bug: webrtc:9627
Change-Id: Ib084fd83f050ae980649ca99e841f4fb0580bd8f
Reviewed-on: https://webrtc-review.googlesource.com/94142
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24493}
This commit is contained in:
Anders Carlsson
2018-08-30 09:30:29 +02:00
committed by Commit Bot
parent 9ea5765f78
commit 7bca8ca4e2
470 changed files with 7255 additions and 5258 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 <WebRTC/RTCPeerConnection.h>
#import "ARDRoomServerClient.h"
#import "ARDSignalingChannel.h"

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

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

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

@ -10,22 +10,23 @@
#import "ARDAppClient+Internal.h"
#import "WebRTC/RTCAudioTrack.h"
#import "WebRTC/RTCCameraVideoCapturer.h"
#import "WebRTC/RTCConfiguration.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/RTCVideoCodecFactory.h"
#import "WebRTC/RTCVideoSource.h"
#import "WebRTC/RTCVideoTrack.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 "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 <WebRTC/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.
*/
#include <WebRTC/RTCCameraVideoCapturer.h>
#import <WebRTC/RTCCameraVideoCapturer.h>
@class ARDSettingsModel;

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

@ -10,8 +10,9 @@
#import "ARDCaptureController.h"
#import <WebRTC/RTCLogging.h>
#import "ARDSettingsModel.h"
#import "WebRTC/RTCLogging.h"
const Float64 kFramerateLimit = 30.0;

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

@ -10,7 +10,8 @@
#import "ARDExternalSampleCapturer.h"
#import "WebRTC/RTCVideoFrameBuffer.h"
#import <WebRTC/RTCCVPixelBuffer.h>
#import <WebRTC/RTCVideoFrameBuffer.h>
@implementation ARDExternalSampleCapturer

1
examples/objc/AppRTCMobile/ARDSettingsModel+Private.h
View File

@ -9,6 +9,7 @@
*/
#import <Foundation/Foundation.h>
#import "ARDSettingsModel.h"
@class ARDSettingsStore;

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

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

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

@ -10,9 +10,10 @@
#import "ARDSettingsModel+Private.h"
#import "ARDSettingsStore.h"
#import "WebRTC/RTCCameraVideoCapturer.h"
#import "WebRTC/RTCMediaConstraints.h"
#import "WebRTC/RTCVideoCodecFactory.h"
#import <WebRTC/RTCCameraVideoCapturer.h>
#import <WebRTC/RTCDefaultVideoEncoderFactory.h>
#import <WebRTC/RTCMediaConstraints.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 <WebRTC/RTCIceCandidate.h>
#import <WebRTC/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 <WebRTC/RTCLogging.h>
#import "ARDUtilities.h"
#import "RTCIceCandidate+JSON.h"

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

@ -10,7 +10,7 @@
#import "ARDStatsBuilder.h"
#import "WebRTC/RTCLegacyStatsReport.h"
#import <WebRTC/RTCLegacyStatsReport.h>
#import "ARDBitrateTracker.h"
#import "ARDUtilities.h"

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

@ -10,7 +10,7 @@
#import "ARDWebSocketChannel.h"
#import "WebRTC/RTCLogging.h"
#import <WebRTC/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 <WebRTC/RTCIceCandidate.h>
@interface RTCIceCandidate (JSON)

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

@ -10,7 +10,7 @@
#import "RTCIceCandidate+JSON.h"
#import "WebRTC/RTCLogging.h"
#import <WebRTC/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 <WebRTC/RTCIceServer.h>
@interface RTCIceServer (JSON)

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

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#import "WebRTC/RTCMediaConstraints.h"
#import <WebRTC/RTCMediaConstraints.h>
@interface RTCMediaConstraints (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 <WebRTC/RTCSessionDescription.h>
@interface RTCSessionDescription (JSON)

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

@ -12,7 +12,7 @@
#import <mach/mach.h>
#import "WebRTC/RTCLogging.h"
#import <WebRTC/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 <WebRTC/RTCFieldTrials.h>
#import <WebRTC/RTCLogging.h>
#import <WebRTC/RTCSSLAdapter.h>
#import <WebRTC/RTCTracing.h>
#import "ARDMainViewController.h"

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

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

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

@ -12,11 +12,10 @@
#import <AVFoundation/AVFoundation.h>
#import "WebRTC/RTCAudioSession.h"
#import "WebRTC/RTCAudioSessionConfiguration.h"
#import "WebRTC/RTCDispatcher.h"
#import "WebRTC/RTCLogging.h"
#import <WebRTC/RTCAudioSession.h>
#import <WebRTC/RTCAudioSessionConfiguration.h>
#import <WebRTC/RTCDispatcher.h>
#import <WebRTC/RTCLogging.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 <WebRTC/RTCLegacyStatsReport.h>
#import "ARDStatsBuilder.h"

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

@ -10,17 +10,17 @@
#import "ARDVideoCallViewController.h"
#import "WebRTC/RTCAudioSession.h"
#import "WebRTC/RTCCameraVideoCapturer.h"
#import <WebRTC/RTCAudioSession.h>
#import <WebRTC/RTCCameraVideoCapturer.h>
#import <WebRTC/RTCDispatcher.h>
#import <WebRTC/RTCLogging.h>
#import <WebRTC/RTCMediaConstraints.h>
#import "ARDAppClient.h"
#import "ARDCaptureController.h"
#import "ARDFileCaptureController.h"
#import "ARDSettingsModel.h"
#import "ARDVideoCallView.h"
#import "WebRTC/RTCDispatcher.h"
#import "WebRTC/RTCLogging.h"
#import "WebRTC/RTCMediaConstraints.h"
@interface ARDVideoCallViewController () <ARDAppClientDelegate,
ARDVideoCallViewDelegate,

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/RTCVideoCodec.h"
#import <WebRTC/RTCVideoCodecInfo.h>
@interface RTCVideoCodecInfo (HumanReadable)

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

@ -9,7 +9,8 @@
*/
#import "RTCVideoCodecInfo+HumanReadable.h"
#import "WebRTC/RTCVideoCodecH264.h"
#import <WebRTC/RTCH264ProfileLevelId.h>
@implementation 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 <WebRTC/RTCLogging.h>
#import "ARDAppClient.h"

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

@ -10,7 +10,7 @@
#import "APPRTCAppDelegate.h"
#import "APPRTCViewController.h"
#import "WebRTC/RTCSSLAdapter.h"
#import <WebRTC/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 <WebRTC/RTCMTLNSVideoView.h>
#import <WebRTC/RTCNSGLVideoView.h>
#import <WebRTC/RTCVideoTrack.h>
#import "ARDAppClient.h"
#import "ARDCaptureController.h"

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

@ -15,8 +15,8 @@
#include "rtc_base/ssladapter.h"
#import "WebRTC/RTCMediaConstraints.h"
#import "WebRTC/RTCPeerConnectionFactory.h"
#import <WebRTC/RTCMediaConstraints.h>
#import <WebRTC/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 <WebRTC/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 <WebRTC/RTCMediaConstraints.h>
#import "ARDSettingsModel+Private.h"
#import "ARDSettingsStore.h"