Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Side by Side Diff: webrtc/api/objc/RTCPeerConnectionFactory.mm

Issue 1825713003: Remove WEBRTC_IOS from RTCPeerConnectionFactory public header. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/api/objc/RTCPeerConnectionFactory.h ('k') | webrtc/base/objc/RTCMacros.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 26 matching lines...) Expand all
37 result = _workerThread->Start(); 37 result = _workerThread->Start();
38 NSAssert(result, @"Failed to start worker thread."); 38 NSAssert(result, @"Failed to start worker thread.");
39 39
40 _nativeFactory = webrtc::CreatePeerConnectionFactory( 40 _nativeFactory = webrtc::CreatePeerConnectionFactory(
41 _workerThread.get(), _signalingThread.get(), nullptr, nullptr, nullptr); 41 _workerThread.get(), _signalingThread.get(), nullptr, nullptr, nullptr);
42 NSAssert(_nativeFactory, @"Failed to initialize PeerConnectionFactory!"); 42 NSAssert(_nativeFactory, @"Failed to initialize PeerConnectionFactory!");
43 } 43 }
44 return self; 44 return self;
45 } 45 }
46 46
47 #if defined(WEBRTC_IOS) 47
48 - (RTCAVFoundationVideoSource *)avFoundationVideoSourceWithConstraints: 48 - (RTCAVFoundationVideoSource *)avFoundationVideoSourceWithConstraints:
49 (nullable RTCMediaConstraints *)constraints { 49 (nullable RTCMediaConstraints *)constraints {
50 #if defined(WEBRTC_IOS)
50 return [[RTCAVFoundationVideoSource alloc] initWithFactory:self 51 return [[RTCAVFoundationVideoSource alloc] initWithFactory:self
51 constraints:constraints]; 52 constraints:constraints];
53 #else
54 return nil;
55 #endif
hjon_webrtc 2016/03/23 15:01:28 Indent :-)
52 } 56 }
53 #endif
54 57
55 - (RTCAudioTrack *)audioTrackWithTrackId:(NSString *)trackId { 58 - (RTCAudioTrack *)audioTrackWithTrackId:(NSString *)trackId {
56 return [[RTCAudioTrack alloc] initWithFactory:self 59 return [[RTCAudioTrack alloc] initWithFactory:self
57 trackId:trackId]; 60 trackId:trackId];
58 } 61 }
59 62
60 - (RTCVideoTrack *)videoTrackWithSource:(RTCVideoSource *)source 63 - (RTCVideoTrack *)videoTrackWithSource:(RTCVideoSource *)source
61 trackId:(NSString *)trackId { 64 trackId:(NSString *)trackId {
62 return [[RTCVideoTrack alloc] initWithFactory:self 65 return [[RTCVideoTrack alloc] initWithFactory:self
63 source:source 66 source:source
(...skipping 11 matching lines...) Expand all
75 (RTCMediaConstraints *)constraints 78 (RTCMediaConstraints *)constraints
76 delegate: 79 delegate:
77 (nullable id<RTCPeerConnectionDelegate>)delegate { 80 (nullable id<RTCPeerConnectionDelegate>)delegate {
78 return [[RTCPeerConnection alloc] initWithFactory:self 81 return [[RTCPeerConnection alloc] initWithFactory:self
79 configuration:configuration 82 configuration:configuration
80 constraints:constraints 83 constraints:constraints
81 delegate:delegate]; 84 delegate:delegate];
82 } 85 }
83 86
84 @end 87 @end
OLDNEW
« no previous file with comments | « webrtc/api/objc/RTCPeerConnectionFactory.h ('k') | webrtc/base/objc/RTCMacros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698