Replace SetCapturer and SetCaptureDevice by SetSource.

talk/app/webrtc/objc/RTCAVFoundationVideoSource.mm

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 16 matching lines @@
 
 #import "RTCAVFoundationVideoSource+Internal.h"
 
 #import "RTCMediaConstraints+Internal.h"
 #import "RTCMediaSource+Internal.h"
 #import "RTCPeerConnectionFactory+Internal.h"
 #import "RTCVideoSource+Internal.h"
 
 #include <memory>
 
 @implementation RTCAVFoundationVideoSource

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

just add the instance var here to avoid casting etc 

@implementation RTCAVFoundationVideoSource {
  webrtc::AVFoundationVideoCapturer* _capturer;
}

[nisse-webrtc, 2016/04/06 08:11:48]

Thanks, I had no idea you could define instance variables here. I thought
everything had to be in the header, to give the object a known storage size. Are
the objc objects always allocated dynamically, no static or stack allocation?

[tkchin_webrtc, 2016/04/06 19:41:46]

Yes, all objc objects are dynamically allocated.

 
 - (instancetype)initWithFactory:(RTCPeerConnectionFactory*)factory
                     constraints:(RTCMediaConstraints*)constraints {
   NSParameterAssert(factory);
-  std::unique_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.
+  webrtc::AVFoundationVideoCapturer* capturer =
+      new webrtc::AVFoundationVideoCapturer();
   rtc::scoped_refptr<webrtc::VideoTrackSourceInterface> source =
-      factory.nativeFactory->CreateVideoSource(capturer.release(), constraints.constraints);
+      factory.nativeFactory->CreateVideoSource(capturer,
+                                               constraints.constraints);
+  // 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 initWithMediaSource: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.videoSource->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