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

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

Issue 2035473004: RTCPeerConnectionInterface.mm createNativeConfiguration and other clean-up. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase with master after which we have to remove dtlsidentitystore.cc from a BUILD.gn file 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
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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 _iceBackupCandidatePairPingInterval; 103 _iceBackupCandidatePairPingInterval;
104 rtc::KeyType keyType = 104 rtc::KeyType keyType =
105 [[self class] nativeEncryptionKeyTypeForKeyType:_keyType]; 105 [[self class] nativeEncryptionKeyTypeForKeyType:_keyType];
106 // Generate non-default certificate. 106 // Generate non-default certificate.
107 if (keyType != rtc::KT_DEFAULT) { 107 if (keyType != rtc::KT_DEFAULT) {
108 rtc::scoped_refptr<rtc::RTCCertificate> certificate = 108 rtc::scoped_refptr<rtc::RTCCertificate> certificate =
109 rtc::RTCCertificateGenerator::GenerateCertificate( 109 rtc::RTCCertificateGenerator::GenerateCertificate(
110 rtc::KeyParams(keyType), rtc::Optional<uint64_t>()); 110 rtc::KeyParams(keyType), rtc::Optional<uint64_t>());
111 if (!certificate) { 111 if (!certificate) {
112 RTCLogError(@"Failed to generate certificate."); 112 RTCLogError(@"Failed to generate certificate.");
113 return nullptr; 113 return nil;
tkchin_webrtc 2016/06/03 23:36:40 ditto nullptr since webrtc::PeerConnectionInterfac
hbos 2016/06/05 11:08:53 Done.
114 } 114 }
115 nativeConfig->certificates.push_back(certificate); 115 nativeConfig->certificates.push_back(certificate);
116 } 116 }
117 nativeConfig->ice_candidate_pool_size = _iceCandidatePoolSize; 117 nativeConfig->ice_candidate_pool_size = _iceCandidatePoolSize;
118 118
119 return nativeConfig.release(); 119 return nativeConfig.release();
120 } 120 }
121 121
122 + (webrtc::PeerConnectionInterface::IceTransportsType) 122 + (webrtc::PeerConnectionInterface::IceTransportsType)
123 nativeTransportsTypeForTransportPolicy:(RTCIceTransportPolicy)policy { 123 nativeTransportsTypeForTransportPolicy:(RTCIceTransportPolicy)policy {
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 (RTCContinualGatheringPolicy)policy { 288 (RTCContinualGatheringPolicy)policy {
289 switch (policy) { 289 switch (policy) {
290 case RTCContinualGatheringPolicyGatherOnce: 290 case RTCContinualGatheringPolicyGatherOnce:
291 return @"GATHER_ONCE"; 291 return @"GATHER_ONCE";
292 case RTCContinualGatheringPolicyGatherContinually: 292 case RTCContinualGatheringPolicyGatherContinually:
293 return @"GATHER_CONTINUALLY"; 293 return @"GATHER_CONTINUALLY";
294 } 294 }
295 } 295 }
296 296
297 @end 297 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698