Replace VideoCaptureDataCallback by VideoSinkInterface.

webrtc/modules/video_capture/objc/video_capture.mm

 /*
  *  Copyright (c) 2013 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.
  */
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/video_capture/objc/device_info_objc.h"
 #include "webrtc/modules/video_capture/objc/rtc_video_capture_objc.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 using namespace webrtc;
 using namespace videocapturemodule;
 
 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create(
-    const int32_t capture_id,
     const char* deviceUniqueIdUTF8) {
-  return VideoCaptureIos::Create(capture_id, deviceUniqueIdUTF8);
+  return VideoCaptureIos::Create(deviceUniqueIdUTF8);
 }
 
-VideoCaptureIos::VideoCaptureIos(const int32_t capture_id)
-    : VideoCaptureImpl(capture_id), is_capturing_(false), id_(capture_id) {
+VideoCaptureIos::VideoCaptureIos()
+    : is_capturing_(false) {
   capability_.width = kDefaultWidth;
   capability_.height = kDefaultHeight;
   capability_.maxFPS = kDefaultFrameRate;
   capture_device_ = nil;
 }
 
 VideoCaptureIos::~VideoCaptureIos() {
   if (is_capturing_) {
     [capture_device_ stopCapture];
     capture_device_ = nil;
   }
 }
 
 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureIos::Create(
-    const int32_t capture_id,
     const char* deviceUniqueIdUTF8) {
   if (!deviceUniqueIdUTF8[0]) {
     return NULL;
   }
 
   rtc::scoped_refptr<VideoCaptureIos> capture_module(
-      new rtc::RefCountedObject<VideoCaptureIos>(capture_id));
+      new rtc::RefCountedObject<VideoCaptureIos>());
 
   const int32_t name_length = strlen(deviceUniqueIdUTF8);
   if (name_length > kVideoCaptureUniqueNameLength)
     return nullptr;
 
   capture_module->_deviceUniqueId = new char[name_length + 1];
   strncpy(capture_module->_deviceUniqueId, deviceUniqueIdUTF8, name_length + 1);
   capture_module->_deviceUniqueId[name_length] = '\0';
 
   capture_module->capture_device_ =
-      [[RTCVideoCaptureIosObjC alloc] initWithOwner:capture_module
-                                          captureId:capture_module->id_];
+      [[RTCVideoCaptureIosObjC alloc] initWithOwner:capture_module];
   if (!capture_module->capture_device_) {
     return nullptr;
   }
 
   if (![capture_module->capture_device_
           setCaptureDeviceByUniqueId:
               [[NSString alloc] initWithCString:deviceUniqueIdUTF8
                                        encoding:NSUTF8StringEncoding]]) {
     return nullptr;
   }
@@ skipping 24 matching lines @@
 
 bool VideoCaptureIos::CaptureStarted() {
   return is_capturing_;
 }
 
 int32_t VideoCaptureIos::CaptureSettings(VideoCaptureCapability& settings) {
   settings = capability_;
   settings.rawType = kVideoNV12;
   return 0;
 }