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

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

Issue 2020633002: Revert of Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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( 229 factory.nativeFactory->CreatePeerConnection(*config,
230 *config, 230 nativeConstraints.get(),
231 nativeConstraints.get(), 231 nullptr,
232 nullptr, 232 nullptr,
233 std::unique_ptr<rtc::RTCCertificateGeneratorInterface>(), 233 _observer.get());
234 _observer.get());
235 _localStreams = [[NSMutableArray alloc] init]; 234 _localStreams = [[NSMutableArray alloc] init];
236 _delegate = delegate; 235 _delegate = delegate;
237 } 236 }
238 return self; 237 return self;
239 } 238 }
240 239
241 - (NSArray *)localStreams { 240 - (NSArray *)localStreams {
242 return [_localStreams copy]; 241 return [_localStreams copy];
243 } 242 }
244 243
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 case RTCStatsOutputLevelDebug: 554 case RTCStatsOutputLevelDebug:
556 return webrtc::PeerConnectionInterface::kStatsOutputLevelDebug; 555 return webrtc::PeerConnectionInterface::kStatsOutputLevelDebug;
557 } 556 }
558 } 557 }
559 558
560 - (rtc::scoped_refptr<webrtc::PeerConnectionInterface>)nativePeerConnection { 559 - (rtc::scoped_refptr<webrtc::PeerConnectionInterface>)nativePeerConnection {
561 return _peerConnection; 560 return _peerConnection;
562 } 561 }
563 562
564 @end 563 @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