commit 4eeb53748a47157077c37f69c4aed79feb931b61
author jtteh <jtteh@webrtc.org> Mon Apr 03 15:06:37 2017 -0700
committer Commit bot <commit-bot@chromium.org> Mon Apr 03 22:06:37 2017 +0000
tree 5c1b72cd5993a4a9528580eafc620ba5ed204f54
parent 9ab17d347850417047165851d4e0a67d44aca30d

[iOS] Added an initialization method to RTCConfiguration that takes a
native configuration.
Added a getConfiguration getter method to RTCPeerConnection to return
the RTCConfiguration.

BUG=webrtc:7431

Review-Url: https://codereview.webrtc.org/2790833002
Cr-Commit-Position: refs/heads/master@{#17517}

webrtc/sdk/objc/Framework/Classes/RTCConfiguration.mm

diff --git a/webrtc/sdk/objc/Framework/Classes/RTCConfiguration.mm b/webrtc/sdk/objc/Framework/Classes/RTCConfiguration.mm
index ae37fc1..54d8eac 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCConfiguration.mm
+++ b/webrtc/sdk/objc/Framework/Classes/RTCConfiguration.mm
@@ -40,38 +40,49 @@
 @synthesize iceCheckMinInterval = _iceCheckMinInterval;
 
 - (instancetype)init {
+  // Copy defaults.
+  webrtc::PeerConnectionInterface::RTCConfiguration config(
+    webrtc::PeerConnectionInterface::RTCConfigurationType::kAggressive);
+  return [self initWithNativeConfiguration:&config];
+}
+
+- (instancetype)initWithNativeConfiguration:
+    (const webrtc::PeerConnectionInterface::RTCConfiguration *)config {
+  NSParameterAssert(config);
   if (self = [super init]) {
-    _iceServers = [NSMutableArray array];
-    // Copy defaults.
-    webrtc::PeerConnectionInterface::RTCConfiguration config(
-        webrtc::PeerConnectionInterface::RTCConfigurationType::kAggressive);
+    NSMutableArray *iceServers = [NSMutableArray array];
+    for (const webrtc::PeerConnectionInterface::IceServer& server : config->servers) {
+      RTCIceServer *iceServer = [[RTCIceServer alloc] initWithNativeServer:server];
+      [iceServers addObject:iceServer];
+    }
+    _iceServers = iceServers;
     _iceTransportPolicy =
-        [[self class] transportPolicyForTransportsType:config.type];
+        [[self class] transportPolicyForTransportsType:config->type];
     _bundlePolicy =
-        [[self class] bundlePolicyForNativePolicy:config.bundle_policy];
+        [[self class] bundlePolicyForNativePolicy:config->bundle_policy];
     _rtcpMuxPolicy =
-        [[self class] rtcpMuxPolicyForNativePolicy:config.rtcp_mux_policy];
+        [[self class] rtcpMuxPolicyForNativePolicy:config->rtcp_mux_policy];
     _tcpCandidatePolicy = [[self class] tcpCandidatePolicyForNativePolicy:
-        config.tcp_candidate_policy];
+        config->tcp_candidate_policy];
     _candidateNetworkPolicy = [[self class]
-        candidateNetworkPolicyForNativePolicy:config.candidate_network_policy];
+        candidateNetworkPolicyForNativePolicy:config->candidate_network_policy];
     webrtc::PeerConnectionInterface::ContinualGatheringPolicy nativePolicy =
-        config.continual_gathering_policy;
+    config->continual_gathering_policy;
     _continualGatheringPolicy =
         [[self class] continualGatheringPolicyForNativePolicy:nativePolicy];
-    _audioJitterBufferMaxPackets = config.audio_jitter_buffer_max_packets;
-    _audioJitterBufferFastAccelerate = config.audio_jitter_buffer_fast_accelerate;
-    _iceConnectionReceivingTimeout = config.ice_connection_receiving_timeout;
+    _audioJitterBufferMaxPackets = config->audio_jitter_buffer_max_packets;
+    _audioJitterBufferFastAccelerate = config->audio_jitter_buffer_fast_accelerate;
+    _iceConnectionReceivingTimeout = config->ice_connection_receiving_timeout;
     _iceBackupCandidatePairPingInterval =
-        config.ice_backup_candidate_pair_ping_interval;
+        config->ice_backup_candidate_pair_ping_interval;
     _keyType = RTCEncryptionKeyTypeECDSA;
-    _iceCandidatePoolSize = config.ice_candidate_pool_size;
-    _shouldPruneTurnPorts = config.prune_turn_ports;
+    _iceCandidatePoolSize = config->ice_candidate_pool_size;
+    _shouldPruneTurnPorts = config->prune_turn_ports;
     _shouldPresumeWritableWhenFullyRelayed =
-        config.presume_writable_when_fully_relayed;
-    if (config.ice_check_min_interval) {
+        config->presume_writable_when_fully_relayed;
+    if (config->ice_check_min_interval) {
       _iceCheckMinInterval =
-          [NSNumber numberWithInt:*config.ice_check_min_interval];
+          [NSNumber numberWithInt:*config->ice_check_min_interval];
     }
   }
   return self;