commit 2ded9b19d1cb2ad4cf4d69c34094fbddc3809888
author nisse <nisse@webrtc.org> Fri Apr 08 02:23:55 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Apr 08 09:24:01 2016 +0000
tree e2b1bd1e7301c20a1e80ad0f560e41408e604409
parent e0d4637bea1c5914de73036006c2e4a34e297791

Replace SetCapturer and SetCaptureDevice by SetSource.
Drop return value.

BUG=webrtc:5426

Review URL: https://codereview.webrtc.org/1766653002

Cr-Commit-Position: refs/heads/master@{#12291}

webrtc/api/objc/RTCAVFoundationVideoSource.mm

diff --git a/webrtc/api/objc/RTCAVFoundationVideoSource.mm b/webrtc/api/objc/RTCAVFoundationVideoSource.mm
index 1005c7d..94774f7 100644
--- a/webrtc/api/objc/RTCAVFoundationVideoSource.mm
+++ b/webrtc/api/objc/RTCAVFoundationVideoSource.mm
@@ -14,16 +14,21 @@
 #import "webrtc/api/objc/RTCPeerConnectionFactory+Private.h"
 #import "webrtc/api/objc/RTCVideoSource+Private.h"
 
-@implementation RTCAVFoundationVideoSource
+@implementation RTCAVFoundationVideoSource {
+  webrtc::AVFoundationVideoCapturer *_capturer;
+}
 
 - (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
                     constraints:(RTCMediaConstraints *)constraints {
   NSParameterAssert(factory);
-  rtc::scoped_ptr<webrtc::AVFoundationVideoCapturer> capturer;
-  capturer.reset(new webrtc::AVFoundationVideoCapturer());
+  // 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 = new webrtc::AVFoundationVideoCapturer();
   rtc::scoped_refptr<webrtc::VideoTrackSourceInterface> source =
       factory.nativeFactory->CreateVideoSource(
-          capturer.release(), constraints.nativeConstraints.get());
+          _capturer, constraints.nativeConstraints.get());
+
   return [super initWithNativeVideoSource:source];
 }
 
@@ -44,12 +49,7 @@
 }
 
 - (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 _capturer;
 }
 
 @end