Replace VideoCaptureDataCallback by VideoSinkInterface.

webrtc/modules/video_capture/objc/device_info.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.
  */
 
@@ skipping 12 matching lines @@
 
 using namespace webrtc;
 using namespace videocapturemodule;
 
 static NSArray* camera_presets = @[
   AVCaptureSessionPreset352x288, AVCaptureSessionPreset640x480,
   AVCaptureSessionPreset1280x720
 ];
 
 #define IOS_UNSUPPORTED()                                                 \
-  WEBRTC_TRACE(kTraceError, kTraceVideoCapture, _id,                      \
+  WEBRTC_TRACE(kTraceError, kTraceVideoCapture, 0,                      \
                "%s is not supported on the iOS platform.", __FUNCTION__); \
   return -1;
 
-VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo(
-    const int32_t device_id) {
-  return new DeviceInfoIos(device_id);
+VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo() {
+  return new DeviceInfoIos();
 }
 
-DeviceInfoIos::DeviceInfoIos(const int32_t device_id)
-    : DeviceInfoImpl(device_id) {
+DeviceInfoIos::DeviceInfoIos() {
   this->Init();
 }
 
 DeviceInfoIos::~DeviceInfoIos() {}
 
 int32_t DeviceInfoIos::Init() {
   // Fill in all device capabilities.
 
   int deviceCount = [DeviceInfoIosObjC captureDeviceCount];
 
@@ skipping 109 matching lines @@
   std::map<std::string, std::vector<VideoCaptureCapability>>::iterator it =
       _capabilitiesMap.find(deviceName);
   VideoCaptureCapabilities deviceCapabilities;
   if (it != _capabilitiesMap.end()) {
     _captureCapabilities = it->second;
     return 0;
   }
 
   return -1;
 }