Replace SetCapturer and SetCaptureDevice by SetSource.

webrtc/api/objc/RTCAVFoundationVideoSource.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.
  */
 
 #import "RTCAVFoundationVideoSource+Private.h"
 
 #import "webrtc/api/objc/RTCMediaConstraints+Private.h"
 #import "webrtc/api/objc/RTCPeerConnectionFactory+Private.h"
 #import "webrtc/api/objc/RTCVideoSource+Private.h"
 
 @implementation RTCAVFoundationVideoSource

[tkchin_webrtc, 2016/04/05 16:10:27]

ditto

 
 - (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
                     constraints:(RTCMediaConstraints *)constraints {
   NSParameterAssert(factory);
-  rtc::scoped_ptr<webrtc::AVFoundationVideoCapturer> capturer;
-  capturer.reset(new webrtc::AVFoundationVideoCapturer());
+  webrtc::AVFoundationVideoCapturer *capturer =
+      new webrtc::AVFoundationVideoCapturer();
   rtc::scoped_refptr<webrtc::VideoTrackSourceInterface> source =
       factory.nativeFactory->CreateVideoSource(
-          capturer.release(), constraints.nativeConstraints.get());
+          capturer, constraints.nativeConstraints.get());
+  // We pass ownership of the capturer to the source, but since we own
+  // the source, it should be ok to keep a raw pointer to the
+  // capturer.
+  _capturer = static_cast<void*>(capturer);
   return [super initWithNativeVideoSource:source];
 }
 
 - (BOOL)canUseBackCamera {
   return self.capturer->CanUseBackCamera();
 }
 
 - (BOOL)useBackCamera {
   return self.capturer->GetUseBackCamera();
 }
 
 - (void)setUseBackCamera:(BOOL)useBackCamera {
   self.capturer->SetUseBackCamera(useBackCamera);
 }
 
 - (AVCaptureSession *)captureSession {
   return self.capturer->GetCaptureSession();
 }
 
 - (webrtc::AVFoundationVideoCapturer *)capturer {
-  cricket::VideoCapturer *capturer = self.nativeVideoSource->GetVideoCapturer();
-  // This should be safe because no one should have changed the underlying video
-  // source.
-  webrtc::AVFoundationVideoCapturer *foundationCapturer =
-      static_cast<webrtc::AVFoundationVideoCapturer *>(capturer);
-  return foundationCapturer;
+  return static_cast<webrtc::AVFoundationVideoCapturer *>(_capturer);
 }
 
 @end