Merge RTCConfiguration with RTCMediaConstraints in Java/Obj-C wrappers.

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

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 189 matching lines @@
                     didRemoveIceCandidates:ice_candidates];
 }
 
 }  // namespace webrtc
 
 
 @implementation RTCPeerConnection {
   NSMutableArray<RTCMediaStream *> *_localStreams;
   std::unique_ptr<webrtc::PeerConnectionDelegateAdapter> _observer;
   rtc::scoped_refptr<webrtc::PeerConnectionInterface> _peerConnection;
+  std::unique_ptr<webrtc::MediaConstraints> _nativeConstraints;

[tkchin_webrtc, 2017/01/09 21:56:36]

Is this safe? Does peerconnection take ownership of this at all?

[Taylor Brandstetter, 2017/01/09 22:03:45]

Yes, it's safe, and n,o nothing else takes ownership. Notice that now the
constraints aren't even passed into the PeerConnection or PeerConnectionFactory,
they're only passed into CopyConstraintsIntoRtcConfiguration.

[tkchin_webrtc, 2017/01/09 22:35:30]

Ah, so it is. Thanks.

   BOOL _hasStartedRtcEventLog;
 }
 
 @synthesize delegate = _delegate;
 
 - (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
                   configuration:(RTCConfiguration *)configuration
                     constraints:(RTCMediaConstraints *)constraints
                        delegate:(id<RTCPeerConnectionDelegate>)delegate {
   NSParameterAssert(factory);
   std::unique_ptr<webrtc::PeerConnectionInterface::RTCConfiguration> config(
       [configuration createNativeConfiguration]);
   if (!config) {
     return nil;
   }
   if (self = [super init]) {
     _observer.reset(new webrtc::PeerConnectionDelegateAdapter(self));
-    std::unique_ptr<webrtc::MediaConstraints> nativeConstraints =
-        constraints.nativeConstraints;
+    _nativeConstraints = constraints.nativeConstraints;
+    CopyConstraintsIntoRtcConfiguration(_nativeConstraints.get(),
+                                        config.get());
     _peerConnection =
         factory.nativeFactory->CreatePeerConnection(*config,
-                                                    nativeConstraints.get(),
                                                     nullptr,
                                                     nullptr,
                                                     _observer.get());
     if (!_peerConnection) {
       return nil;
     }
     _localStreams = [[NSMutableArray alloc] init];
     _delegate = delegate;
   }
   return self;
@@ skipping 33 matching lines @@
   return [[self class] iceGatheringStateForNativeState:
       _peerConnection->ice_gathering_state()];
 }
 
 - (BOOL)setConfiguration:(RTCConfiguration *)configuration {
   std::unique_ptr<webrtc::PeerConnectionInterface::RTCConfiguration> config(
       [configuration createNativeConfiguration]);
   if (!config) {
     return NO;
   }
+  CopyConstraintsIntoRtcConfiguration(_nativeConstraints.get(),
+                                      config.get());
   return _peerConnection->SetConfiguration(*config);
 }
 
 - (void)close {
   _peerConnection->Close();
 }
 
 - (void)addIceCandidate:(RTCIceCandidate *)candidate {
   std::unique_ptr<const webrtc::IceCandidateInterface> iceCandidate(
       candidate.nativeCandidate);
@@ skipping 288 matching lines @@
     case RTCStatsOutputLevelDebug:
       return webrtc::PeerConnectionInterface::kStatsOutputLevelDebug;
   }
 }
 
 - (rtc::scoped_refptr<webrtc::PeerConnectionInterface>)nativePeerConnection {
   return _peerConnection;
 }
 
 @end