Update API for Objective-C RTCPeerConnectionFactory.
BUG= R=jiayl@webrtc.org, tkchin@webrtc.org Review URL: https://codereview.webrtc.org/1558473002 . Patch from Jon Hjelle <hjon@andyet.net>. Cr-Commit-Position: refs/heads/master@{#11326}
This commit is contained in:
@ -35,6 +35,9 @@ if (is_ios) {
|
|||||||
#"objc/RTCMediaStreamTrack+Private.h",
|
#"objc/RTCMediaStreamTrack+Private.h",
|
||||||
#"objc/RTCMediaStreamTrack.h",
|
#"objc/RTCMediaStreamTrack.h",
|
||||||
#"objc/RTCMediaStreamTrack.mm",
|
#"objc/RTCMediaStreamTrack.mm",
|
||||||
|
#"objc/RTCPeerConnectionFactory+Private.h",
|
||||||
|
#"objc/RTCPeerConnectionFactory.h",
|
||||||
|
#"objc/RTCPeerConnectionFactory.mm",
|
||||||
#"objc/RTCVideoSource+Private.h",
|
#"objc/RTCVideoSource+Private.h",
|
||||||
#"objc/RTCVideoSource.h",
|
#"objc/RTCVideoSource.h",
|
||||||
#"objc/RTCVideoSource.mm",
|
#"objc/RTCVideoSource.mm",
|
||||||
|
@ -33,6 +33,9 @@
|
|||||||
'objc/RTCMediaStreamTrack.mm',
|
'objc/RTCMediaStreamTrack.mm',
|
||||||
'objc/RTCOpenGLVideoRenderer.h',
|
'objc/RTCOpenGLVideoRenderer.h',
|
||||||
'objc/RTCOpenGLVideoRenderer.mm',
|
'objc/RTCOpenGLVideoRenderer.mm',
|
||||||
|
'objc/RTCPeerConnectionFactory+Private.h',
|
||||||
|
'objc/RTCPeerConnectionFactory.h',
|
||||||
|
'objc/RTCPeerConnectionFactory.mm',
|
||||||
'objc/RTCSessionDescription+Private.h',
|
'objc/RTCSessionDescription+Private.h',
|
||||||
'objc/RTCSessionDescription.h',
|
'objc/RTCSessionDescription.h',
|
||||||
'objc/RTCSessionDescription.mm',
|
'objc/RTCSessionDescription.mm',
|
||||||
|
30
webrtc/api/objc/RTCPeerConnectionFactory+Private.h
Normal file
30
webrtc/api/objc/RTCPeerConnectionFactory+Private.h
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
/*
|
||||||
|
* 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 "RTCPeerConnectionFactory.h"
|
||||||
|
|
||||||
|
#include "talk/app/webrtc/peerconnectionfactory.h"
|
||||||
|
#include "webrtc/base/scoped_ref_ptr.h"
|
||||||
|
|
||||||
|
NS_ASSUME_NONNULL_BEGIN
|
||||||
|
|
||||||
|
@interface RTCPeerConnectionFactory ()
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PeerConnectionFactoryInterface created and held by this
|
||||||
|
* RTCPeerConnectionFactory object. This is needed to pass to the underlying
|
||||||
|
* C++ APIs.
|
||||||
|
*/
|
||||||
|
@property(nonatomic, readonly)
|
||||||
|
rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> nativeFactory;
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
||||||
|
NS_ASSUME_NONNULL_END
|
18
webrtc/api/objc/RTCPeerConnectionFactory.h
Normal file
18
webrtc/api/objc/RTCPeerConnectionFactory.h
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
/*
|
||||||
|
* 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 <Foundation/Foundation.h>
|
||||||
|
|
||||||
|
NS_ASSUME_NONNULL_BEGIN
|
||||||
|
|
||||||
|
@interface RTCPeerConnectionFactory : NSObject
|
||||||
|
@end
|
||||||
|
|
||||||
|
NS_ASSUME_NONNULL_END
|
38
webrtc/api/objc/RTCPeerConnectionFactory.mm
Normal file
38
webrtc/api/objc/RTCPeerConnectionFactory.mm
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
* 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 "RTCPeerConnectionFactory.h"
|
||||||
|
|
||||||
|
#import "webrtc/api/objc/RTCPeerConnectionFactory+Private.h"
|
||||||
|
|
||||||
|
@implementation RTCPeerConnectionFactory {
|
||||||
|
rtc::scoped_ptr<rtc::Thread> _signalingThread;
|
||||||
|
rtc::scoped_ptr<rtc::Thread> _workerThread;
|
||||||
|
}
|
||||||
|
|
||||||
|
@synthesize nativeFactory = _nativeFactory;
|
||||||
|
|
||||||
|
- (instancetype)init {
|
||||||
|
if ((self = [super init])) {
|
||||||
|
_signalingThread.reset(new rtc::Thread());
|
||||||
|
BOOL result = _signalingThread->Start();
|
||||||
|
NSAssert(result, @"Failed to start signaling thread.");
|
||||||
|
_workerThread.reset(new rtc::Thread());
|
||||||
|
result = _workerThread->Start();
|
||||||
|
NSAssert(result, @"Failed to start worker thread.");
|
||||||
|
|
||||||
|
_nativeFactory = webrtc::CreatePeerConnectionFactory(
|
||||||
|
_workerThread.get(), _signalingThread.get(), nullptr, nullptr, nullptr);
|
||||||
|
NSAssert(_nativeFactory, @"Failed to initialize PeerConnectionFactory!");
|
||||||
|
}
|
||||||
|
return self;
|
||||||
|
}
|
||||||
|
|
||||||
|
@end
|
@ -635,6 +635,8 @@ if (is_ios) {
|
|||||||
"objc/RTCDispatcher.m",
|
"objc/RTCDispatcher.m",
|
||||||
"objc/RTCLogging.h",
|
"objc/RTCLogging.h",
|
||||||
"objc/RTCLogging.mm",
|
"objc/RTCLogging.mm",
|
||||||
|
"objc/RTCSSLAdapter.h",
|
||||||
|
"objc/RTCSSLAdapter.mm",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -39,6 +39,8 @@
|
|||||||
'objc/RTCDispatcher.m',
|
'objc/RTCDispatcher.m',
|
||||||
'objc/RTCLogging.h',
|
'objc/RTCLogging.h',
|
||||||
'objc/RTCLogging.mm',
|
'objc/RTCLogging.mm',
|
||||||
|
'objc/RTCSSLAdapter.h',
|
||||||
|
'objc/RTCSSLAdapter.mm',
|
||||||
],
|
],
|
||||||
'conditions': [
|
'conditions': [
|
||||||
['OS=="ios"', {
|
['OS=="ios"', {
|
||||||
|
18
webrtc/base/objc/RTCSSLAdapter.h
Normal file
18
webrtc/base/objc/RTCSSLAdapter.h
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
/*
|
||||||
|
* 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 <Foundation/Foundation.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize and clean up the SSL library. Failure is fatal. These call the
|
||||||
|
* corresponding functions in webrtc/base/ssladapter.h.
|
||||||
|
*/
|
||||||
|
BOOL RTCInitializeSSL();
|
||||||
|
BOOL RTCCleanupSSL();
|
26
webrtc/base/objc/RTCSSLAdapter.mm
Normal file
26
webrtc/base/objc/RTCSSLAdapter.mm
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
/*
|
||||||
|
* 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 "RTCSSLAdapter.h"
|
||||||
|
|
||||||
|
#include "webrtc/base/checks.h"
|
||||||
|
#include "webrtc/base/ssladapter.h"
|
||||||
|
|
||||||
|
BOOL RTCInitializeSSL() {
|
||||||
|
BOOL initialized = rtc::InitializeSSL();
|
||||||
|
RTC_DCHECK(initialized);
|
||||||
|
return initialized;
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOL RTCCleanupSSL() {
|
||||||
|
BOOL cleanedUp = rtc::CleanupSSL();
|
||||||
|
RTC_DCHECK(cleanedUp);
|
||||||
|
return cleanedUp;
|
||||||
|
}
|
Reference in New Issue
Block a user