Replace VideoCaptureDataCallback by VideoSinkInterface.

webrtc/media/engine/webrtcvideocapturer.h

 /*
  *  Copyright (c) 2004 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 13 matching lines @@
 #include "webrtc/modules/video_capture/video_capture.h"
 
 namespace cricket {
 
 // Factory to allow injection of a VCM impl into WebRtcVideoCapturer.
 // DeviceInfos do not have a Release() and therefore need an explicit Destroy().
 class WebRtcVcmFactoryInterface {
  public:
   virtual ~WebRtcVcmFactoryInterface() {}
   virtual rtc::scoped_refptr<webrtc::VideoCaptureModule> Create(
-      int id,
       const char* device) = 0;
-  virtual webrtc::VideoCaptureModule::DeviceInfo* CreateDeviceInfo(int id) = 0;
+  virtual webrtc::VideoCaptureModule::DeviceInfo* CreateDeviceInfo() = 0;
   virtual void DestroyDeviceInfo(
       webrtc::VideoCaptureModule::DeviceInfo* info) = 0;
 };
 
 // WebRTC-based implementation of VideoCapturer.
 class WebRtcVideoCapturer : public VideoCapturer,
-                            public webrtc::VideoCaptureDataCallback {
+                            public rtc::VideoSinkInterface<webrtc::VideoFrame> {
  public:
   WebRtcVideoCapturer();
   explicit WebRtcVideoCapturer(WebRtcVcmFactoryInterface* factory);
   virtual ~WebRtcVideoCapturer();
 
   bool Init(const Device& device);
   bool Init(const rtc::scoped_refptr<webrtc::VideoCaptureModule>& module);
 
   // Override virtual methods of the parent class VideoCapturer.
   bool GetBestCaptureFormat(const VideoFormat& desired,
                             VideoFormat* best_format) override;
   CaptureState Start(const VideoFormat& capture_format) override;
   void Stop() override;
   bool IsRunning() override;
   bool IsScreencast() const override { return false; }
 
  protected:
   void OnSinkWantsChanged(const rtc::VideoSinkWants& wants) override;
   // Override virtual methods of the parent class VideoCapturer.
   bool GetPreferredFourccs(std::vector<uint32_t>* fourccs) override;
 
  private:
   // Callback when a frame is captured by camera.
-  void OnIncomingCapturedFrame(const int32_t id,
-                               const webrtc::VideoFrame& frame) override;
-  void OnCaptureDelayChanged(const int32_t id,
-                             const int32_t delay) override;
+  void OnFrame(const webrtc::VideoFrame& frame) override;
 
   // Used to signal captured frames on the same thread as invoked Start().
   // With WebRTC's current VideoCapturer implementations, this will mean a
   // thread hop, but in other implementations (e.g. Chrome) it will be called
   // directly from OnIncomingCapturedFrame.
   // TODO(tommi): Remove this workaround when we've updated the WebRTC capturers
   // to follow the same contract.
   void SignalFrameCapturedOnStartThread(const webrtc::VideoFrame& frame);
 
   std::unique_ptr<WebRtcVcmFactoryInterface> factory_;
   rtc::scoped_refptr<webrtc::VideoCaptureModule> module_;
   int captured_frames_;
   std::vector<uint8_t> capture_buffer_;
   rtc::Thread* start_thread_;  // Set in Start(), unset in Stop();
 
   std::unique_ptr<rtc::AsyncInvoker> async_invoker_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_