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

Side by Side Diff: webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm

Issue 2000163002: Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase with master after CL 2001103002 landed Created 4 years, 7 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/examples/peerconnection/client/conductor.cc ('k') | no next file » | 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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 std::unique_ptr<webrtc::PeerConnectionInterface::RTCConfiguration> config( 219 std::unique_ptr<webrtc::PeerConnectionInterface::RTCConfiguration> config(
220 [configuration createNativeConfiguration]); 220 [configuration createNativeConfiguration]);
221 if (!config) { 221 if (!config) {
222 return nil; 222 return nil;
223 } 223 }
224 if (self = [super init]) { 224 if (self = [super init]) {
225 _observer.reset(new webrtc::PeerConnectionDelegateAdapter(self)); 225 _observer.reset(new webrtc::PeerConnectionDelegateAdapter(self));
226 std::unique_ptr<webrtc::MediaConstraints> nativeConstraints = 226 std::unique_ptr<webrtc::MediaConstraints> nativeConstraints =
227 constraints.nativeConstraints; 227 constraints.nativeConstraints;
228 _peerConnection = 228 _peerConnection =
229 factory.nativeFactory->CreatePeerConnection(*config, 229 factory.nativeFactory->CreatePeerConnection(
230 nativeConstraints.get(), 230 *config,
231 nullptr, 231 nativeConstraints.get(),
232 nullptr, 232 nullptr,
233 _observer.get()); 233 std::unique_ptr<rtc::RTCCertificateGeneratorInterface>(),
234 _observer.get());
234 _localStreams = [[NSMutableArray alloc] init]; 235 _localStreams = [[NSMutableArray alloc] init];
235 _delegate = delegate; 236 _delegate = delegate;
236 } 237 }
237 return self; 238 return self;
238 } 239 }
239 240
240 - (NSArray *)localStreams { 241 - (NSArray *)localStreams {
241 return [_localStreams copy]; 242 return [_localStreams copy];
242 } 243 }
243 244
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 case RTCStatsOutputLevelDebug: 555 case RTCStatsOutputLevelDebug:
555 return webrtc::PeerConnectionInterface::kStatsOutputLevelDebug; 556 return webrtc::PeerConnectionInterface::kStatsOutputLevelDebug;
556 } 557 }
557 } 558 }
558 559
559 - (rtc::scoped_refptr<webrtc::PeerConnectionInterface>)nativePeerConnection { 560 - (rtc::scoped_refptr<webrtc::PeerConnectionInterface>)nativePeerConnection {
560 return _peerConnection; 561 return _peerConnection;
561 } 562 }
562 563
563 @end 564 @end
OLDNEW
« no previous file with comments | « webrtc/examples/peerconnection/client/conductor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698