Tweaks for new Objective-C API.

webrtc/api/objc/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 181 matching lines @@
 
 - (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
                   configuration:(RTCConfiguration *)configuration
                     constraints:(RTCMediaConstraints *)constraints
                        delegate:(id<RTCPeerConnectionDelegate>)delegate {
   NSParameterAssert(factory);
   if (self = [super init]) {
     _observer.reset(new webrtc::PeerConnectionDelegateAdapter(self));
     webrtc::PeerConnectionInterface::RTCConfiguration config =
         configuration.nativeConfiguration;
-    webrtc::MediaConstraints *nativeConstraints =
-        constraints.nativeConstraints.get();
+    rtc::scoped_ptr<webrtc::MediaConstraints> nativeConstraints =
+        constraints.nativeConstraints;
     _peerConnection =
         factory.nativeFactory->CreatePeerConnection(config,
-                                                    nativeConstraints,
+                                                    nativeConstraints.get(),

[tkchin_webrtc, 2016/02/20 00:17:31]

get or release?

[hjon_webrtc, 2016/02/22 23:03:06]

If I'm thinking about this correctly (and correctly tracing through C++), I
think it should be get. It looks like C++ is merely finding the mandatory and
optional constraints, but not taking ownership.

[tkchin_webrtc, 2016/02/23 00:22:26]

Ok.

                                                     nullptr,
                                                     nullptr,
                                                     _observer.get());
     _localStreams = [[NSMutableArray alloc] init];
     _delegate = delegate;
   }
   return self;
 }
 
 - (NSArray *)localStreams {
@@ skipping 35 matching lines @@
   _peerConnection->Close();
 }
 
 - (void)addIceCandidate:(RTCIceCandidate *)candidate {
   rtc::scoped_ptr<const webrtc::IceCandidateInterface> iceCandidate(
       candidate.nativeCandidate);
   _peerConnection->AddIceCandidate(iceCandidate.get());
 }
 
 - (void)addStream:(RTCMediaStream *)stream {
-  if (_peerConnection->AddStream(stream.nativeMediaStream)) {
+  if (!_peerConnection->AddStream(stream.nativeMediaStream)) {
     RTCLogError(@"Failed to add stream: %@", stream);
     return;
   }
   [_localStreams addObject:stream];
 }
 
 - (void)removeStream:(RTCMediaStream *)stream {
   _peerConnection->RemoveStream(stream.nativeMediaStream);
   [_localStreams removeObject:stream];
 }
@@ skipping 197 matching lines @@
     case RTCStatsOutputLevelDebug:
       return webrtc::PeerConnectionInterface::kStatsOutputLevelDebug;
   }
 }
 
 - (rtc::scoped_refptr<webrtc::PeerConnectionInterface>)nativePeerConnection {
   return _peerConnection;
 }
 
 @end