2016-01-20 13:40:30 -08:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2016-04-27 01:54:20 -07:00
|
|
|
#import "RTCPeerConnectionFactory+Private.h"
|
2016-01-20 13:40:30 -08:00
|
|
|
|
2016-04-27 01:54:20 -07:00
|
|
|
#import "NSString+StdString.h"
|
Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
Reason for revert:
Breaks downstream project.
Original issue's description:
> Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
>
> Reason for revert:
> Take two of fixing downstream issues?
>
> Original issue's description:
> > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> >
> > Reason for revert:
> > Still problems with downstream projects
> >
> > Original issue's description:
> > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > >
> > > Reason for revert:
> > > Fixing downstream breakages
> > >
> > > Original issue's description:
> > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > >
> > > > Reason for revert:
> > > > Breaking downstream projects.
> > > >
> > > > Original issue's description:
> > > > > Split iOS sdk in to separate targets
> > > > >
> > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > future make it easier to compile WebRTC without unneeded components.
> > > > >
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2890733003
> > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893593002
> > Cr-Commit-Position: refs/heads/master@{#18182}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2893843003
> Cr-Commit-Position: refs/heads/master@{#18303}
> Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2911053002
Cr-Commit-Position: refs/heads/master@{#18309}
2017-05-29 09:57:37 -07:00
|
|
|
#import "RTCAVFoundationVideoSource+Private.h"
|
2016-08-30 11:56:05 -07:00
|
|
|
#import "RTCAudioSource+Private.h"
|
2016-04-27 01:54:20 -07:00
|
|
|
#import "RTCAudioTrack+Private.h"
|
2016-08-30 11:56:05 -07:00
|
|
|
#import "RTCMediaConstraints+Private.h"
|
2016-04-27 01:54:20 -07:00
|
|
|
#import "RTCMediaStream+Private.h"
|
|
|
|
|
#import "RTCPeerConnection+Private.h"
|
|
|
|
|
#import "RTCVideoSource+Private.h"
|
|
|
|
|
#import "RTCVideoTrack+Private.h"
|
2016-08-30 12:58:11 -07:00
|
|
|
#import "WebRTC/RTCLogging.h"
|
2016-05-01 14:53:46 -07:00
|
|
|
|
Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
Reason for revert:
Breaks downstream project.
Original issue's description:
> Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
>
> Reason for revert:
> Take two of fixing downstream issues?
>
> Original issue's description:
> > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> >
> > Reason for revert:
> > Still problems with downstream projects
> >
> > Original issue's description:
> > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > >
> > > Reason for revert:
> > > Fixing downstream breakages
> > >
> > > Original issue's description:
> > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > >
> > > > Reason for revert:
> > > > Breaking downstream projects.
> > > >
> > > > Original issue's description:
> > > > > Split iOS sdk in to separate targets
> > > > >
> > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > future make it easier to compile WebRTC without unneeded components.
> > > > >
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2890733003
> > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893593002
> > Cr-Commit-Position: refs/heads/master@{#18182}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2893843003
> Cr-Commit-Position: refs/heads/master@{#18303}
> Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2911053002
Cr-Commit-Position: refs/heads/master@{#18309}
2017-05-29 09:57:37 -07:00
|
|
|
#include "objcvideotracksource.h"
|
|
|
|
|
#include "videotoolboxvideocodecfactory.h"
|
2016-11-09 10:43:26 +01:00
|
|
|
|
2016-01-20 13:40:30 -08:00
|
|
|
@implementation RTCPeerConnectionFactory {
|
2016-05-17 01:52:02 -07:00
|
|
|
std::unique_ptr<rtc::Thread> _networkThread;
|
2016-05-01 14:53:46 -07:00
|
|
|
std::unique_ptr<rtc::Thread> _workerThread;
|
2016-05-17 01:52:02 -07:00
|
|
|
std::unique_ptr<rtc::Thread> _signalingThread;
|
2016-08-30 12:58:11 -07:00
|
|
|
BOOL _hasStartedAecDump;
|
2016-01-20 13:40:30 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@synthesize nativeFactory = _nativeFactory;
|
|
|
|
|
|
|
|
|
|
- (instancetype)init {
|
|
|
|
|
if ((self = [super init])) {
|
2016-05-17 01:52:02 -07:00
|
|
|
_networkThread = rtc::Thread::CreateWithSocketServer();
|
|
|
|
|
BOOL result = _networkThread->Start();
|
|
|
|
|
NSAssert(result, @"Failed to start network thread.");
|
|
|
|
|
|
|
|
|
|
_workerThread = rtc::Thread::Create();
|
2016-01-20 13:40:30 -08:00
|
|
|
result = _workerThread->Start();
|
|
|
|
|
NSAssert(result, @"Failed to start worker thread.");
|
|
|
|
|
|
2016-05-17 01:52:02 -07:00
|
|
|
_signalingThread = rtc::Thread::Create();
|
|
|
|
|
result = _signalingThread->Start();
|
|
|
|
|
NSAssert(result, @"Failed to start signaling thread.");
|
|
|
|
|
|
2016-11-09 10:43:26 +01:00
|
|
|
const auto encoder_factory = new webrtc::VideoToolboxVideoEncoderFactory();
|
|
|
|
|
const auto decoder_factory = new webrtc::VideoToolboxVideoDecoderFactory();
|
|
|
|
|
|
|
|
|
|
// Ownership of encoder/decoder factories is passed on to the
|
|
|
|
|
// peerconnectionfactory, that handles deleting them.
|
2016-01-20 13:40:30 -08:00
|
|
|
_nativeFactory = webrtc::CreatePeerConnectionFactory(
|
2016-05-17 01:52:02 -07:00
|
|
|
_networkThread.get(), _workerThread.get(), _signalingThread.get(),
|
2016-11-09 10:43:26 +01:00
|
|
|
nullptr, encoder_factory, decoder_factory);
|
2016-01-20 13:40:30 -08:00
|
|
|
NSAssert(_nativeFactory, @"Failed to initialize PeerConnectionFactory!");
|
|
|
|
|
}
|
|
|
|
|
return self;
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-30 11:56:05 -07:00
|
|
|
- (RTCAudioSource *)audioSourceWithConstraints:(nullable RTCMediaConstraints *)constraints {
|
|
|
|
|
std::unique_ptr<webrtc::MediaConstraints> nativeConstraints;
|
|
|
|
|
if (constraints) {
|
|
|
|
|
nativeConstraints = constraints.nativeConstraints;
|
|
|
|
|
}
|
|
|
|
|
rtc::scoped_refptr<webrtc::AudioSourceInterface> source =
|
|
|
|
|
_nativeFactory->CreateAudioSource(nativeConstraints.get());
|
|
|
|
|
return [[RTCAudioSource alloc] initWithNativeAudioSource:source];
|
2016-03-23 11:29:27 -07:00
|
|
|
}
|
2016-03-22 10:57:40 -07:00
|
|
|
|
|
|
|
|
- (RTCAudioTrack *)audioTrackWithTrackId:(NSString *)trackId {
|
2016-08-30 11:56:05 -07:00
|
|
|
RTCAudioSource *audioSource = [self audioSourceWithConstraints:nil];
|
|
|
|
|
return [self audioTrackWithSource:audioSource trackId:trackId];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (RTCAudioTrack *)audioTrackWithSource:(RTCAudioSource *)source
|
|
|
|
|
trackId:(NSString *)trackId {
|
2016-03-22 10:57:40 -07:00
|
|
|
return [[RTCAudioTrack alloc] initWithFactory:self
|
2016-08-30 11:56:05 -07:00
|
|
|
source:source
|
2016-03-22 10:57:40 -07:00
|
|
|
trackId:trackId];
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-30 11:56:05 -07:00
|
|
|
- (RTCAVFoundationVideoSource *)avFoundationVideoSourceWithConstraints:
|
|
|
|
|
(nullable RTCMediaConstraints *)constraints {
|
|
|
|
|
return [[RTCAVFoundationVideoSource alloc] initWithFactory:self
|
|
|
|
|
constraints:constraints];
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-28 01:56:41 -07:00
|
|
|
- (RTCVideoSource *)videoSource {
|
2017-04-11 04:50:15 -07:00
|
|
|
rtc::scoped_refptr<webrtc::ObjcVideoTrackSource> objcVideoTrackSource(
|
2017-03-28 01:56:41 -07:00
|
|
|
new rtc::RefCountedObject<webrtc::ObjcVideoTrackSource>());
|
2017-04-11 04:50:15 -07:00
|
|
|
return [[RTCVideoSource alloc] initWithNativeVideoSource:objcVideoTrackSource];
|
2017-03-28 01:56:41 -07:00
|
|
|
}
|
|
|
|
|
|
2016-03-22 10:57:40 -07:00
|
|
|
- (RTCVideoTrack *)videoTrackWithSource:(RTCVideoSource *)source
|
|
|
|
|
trackId:(NSString *)trackId {
|
|
|
|
|
return [[RTCVideoTrack alloc] initWithFactory:self
|
|
|
|
|
source:source
|
|
|
|
|
trackId:trackId];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (RTCMediaStream *)mediaStreamWithStreamId:(NSString *)streamId {
|
|
|
|
|
return [[RTCMediaStream alloc] initWithFactory:self
|
|
|
|
|
streamId:streamId];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (RTCPeerConnection *)peerConnectionWithConfiguration:
|
|
|
|
|
(RTCConfiguration *)configuration
|
|
|
|
|
constraints:
|
|
|
|
|
(RTCMediaConstraints *)constraints
|
|
|
|
|
delegate:
|
|
|
|
|
(nullable id<RTCPeerConnectionDelegate>)delegate {
|
|
|
|
|
return [[RTCPeerConnection alloc] initWithFactory:self
|
|
|
|
|
configuration:configuration
|
|
|
|
|
constraints:constraints
|
|
|
|
|
delegate:delegate];
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-30 12:58:11 -07:00
|
|
|
- (BOOL)startAecDumpWithFilePath:(NSString *)filePath
|
|
|
|
|
maxSizeInBytes:(int64_t)maxSizeInBytes {
|
|
|
|
|
RTC_DCHECK(filePath.length);
|
|
|
|
|
RTC_DCHECK_GT(maxSizeInBytes, 0);
|
|
|
|
|
|
|
|
|
|
if (_hasStartedAecDump) {
|
|
|
|
|
RTCLogError(@"Aec dump already started.");
|
|
|
|
|
return NO;
|
|
|
|
|
}
|
|
|
|
|
int fd = open(filePath.UTF8String, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
|
|
|
|
|
if (fd < 0) {
|
|
|
|
|
RTCLogError(@"Error opening file: %@. Error: %d", filePath, errno);
|
|
|
|
|
return NO;
|
|
|
|
|
}
|
|
|
|
|
_hasStartedAecDump = _nativeFactory->StartAecDump(fd, maxSizeInBytes);
|
|
|
|
|
return _hasStartedAecDump;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (void)stopAecDump {
|
|
|
|
|
_nativeFactory->StopAecDump();
|
|
|
|
|
_hasStartedAecDump = NO;
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-20 13:40:30 -08:00
|
|
|
@end
|