Replace VideoCaptureDataCallback by VideoSinkInterface.

webrtc/modules/video_capture/objc/rtc_video_capture_objc.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 15 matching lines @@
 using namespace webrtc::videocapturemodule;
 
 @interface RTCVideoCaptureIosObjC (hidden)
 - (int)changeCaptureInputWithName:(NSString*)captureDeviceName;
 @end
 
 @implementation RTCVideoCaptureIosObjC {
   webrtc::videocapturemodule::VideoCaptureIos* _owner;
   webrtc::VideoCaptureCapability _capability;
   AVCaptureSession* _captureSession;
-  int _captureId;
   BOOL _orientationHasChanged;
   AVCaptureConnection* _connection;
   BOOL _captureChanging;  // Guarded by _captureChangingCondition.
   NSCondition* _captureChangingCondition;
 }
 
 @synthesize frameRotation = _framRotation;
 
-- (id)initWithOwner:(VideoCaptureIos*)owner captureId:(int)captureId {
+- (id)initWithOwner:(VideoCaptureIos*)owner {
   if (self == [super init]) {
     _owner = owner;
-    _captureId = captureId;
     _captureSession = [[AVCaptureSession alloc] init];
 #if defined(WEBRTC_IOS)
     _captureSession.usesApplicationAudioSession = NO;
 #endif
     _captureChanging = NO;
     _captureChangingCondition = [[NSCondition alloc] init];
 
     if (!_captureSession || !_captureChangingCondition) {
       return nil;
     }
 
     // create and configure a new output (using callbacks)
     AVCaptureVideoDataOutput* captureOutput =
         [[AVCaptureVideoDataOutput alloc] init];
     NSString* key = (NSString*)kCVPixelBufferPixelFormatTypeKey;
 
     NSNumber* val = [NSNumber
         numberWithUnsignedInt:kCVPixelFormatType_420YpCbCr8BiPlanarFullRange];
     NSDictionary* videoSettings =
         [NSDictionary dictionaryWithObject:val forKey:key];
     captureOutput.videoSettings = videoSettings;
 
     // add new output
     if ([_captureSession canAddOutput:captureOutput]) {
       [_captureSession addOutput:captureOutput];
     } else {
-      WEBRTC_TRACE(kTraceError, kTraceVideoCapture, _captureId,
+      WEBRTC_TRACE(kTraceError, kTraceVideoCapture, 0,
                    "%s:%s:%d Could not add output to AVCaptureSession ",
                    __FILE__, __FUNCTION__, __LINE__);
     }
 
 #ifdef WEBRTC_IOS
     [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
 
     NSNotificationCenter* notify = [NSNotificationCenter defaultCenter];
     [notify addObserver:self
                selector:@selector(onVideoError:)
@@ skipping 152 matching lines @@
         _connection.videoOrientation = AVCaptureVideoOrientationPortrait;
       }
       break;
   }
 #endif
 }
 
 - (void)onVideoError:(NSNotification*)notification {
   NSLog(@"onVideoError: %@", notification);
   // TODO(sjlee): make the specific error handling with this notification.
-  WEBRTC_TRACE(kTraceError, kTraceVideoCapture, _captureId,
+  WEBRTC_TRACE(kTraceError, kTraceVideoCapture, 0,
                "%s:%s:%d [AVCaptureSession startRunning] error.", __FILE__,
                __FUNCTION__, __LINE__);
 }
 
 - (BOOL)stopCapture {
 #ifdef WEBRTC_IOS
   [[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
 #endif
   _orientationHasChanged = NO;
   [self waitForCaptureChangeToFinish];
@@ skipping 43 matching lines @@
 
   // now create capture session input out of AVCaptureDevice
   NSError* deviceError = nil;
   AVCaptureDeviceInput* newCaptureInput =
       [AVCaptureDeviceInput deviceInputWithDevice:captureDevice
                                             error:&deviceError];
 
   if (!newCaptureInput) {
     const char* errorMessage = [[deviceError localizedDescription] UTF8String];
 
-    WEBRTC_TRACE(kTraceError, kTraceVideoCapture, _captureId,
+    WEBRTC_TRACE(kTraceError, kTraceVideoCapture, 0,
                  "%s:%s:%d deviceInputWithDevice error:%s", __FILE__,
                  __FUNCTION__, __LINE__, errorMessage);
 
     return NO;
   }
 
   // try to add our new capture device to the capture session
   [_captureSession beginConfiguration];
 
   BOOL addedCaptureInput = NO;
@@ skipping 53 matching lines @@
 }
 
 - (void)waitForCaptureChangeToFinish {
   [_captureChangingCondition lock];
   while (_captureChanging) {
     [_captureChangingCondition wait];
   }
   [_captureChangingCondition unlock];
 }
 @end