Make cricket::VideoCapturer implement VideoSourceInterface

talk/media/base/videocapturer.h

 /*
  * libjingle
  * Copyright 2010 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 23 matching lines @@
 #include <string>
 #include <vector>
 
 #include "talk/media/base/mediachannel.h"
 #include "talk/media/base/videoadapter.h"
 #include "talk/media/base/videocommon.h"
 #include "talk/media/base/videoframefactory.h"
 #include "talk/media/devices/devicemanager.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/media/base/videosourceinterface.h"
 #include "webrtc/base/messagehandler.h"
 #include "webrtc/base/rollingaccumulator.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/timing.h"
 
 
 namespace cricket {
 
@@ skipping 66 matching lines @@
 //   GetCaptureFormat() optionally
 //   Stop()
 //
 // Assumption:
 //   The Start() and Stop() methods are called by a single thread (E.g., the
 //   media engine thread). Hence, the VideoCapture subclasses dont need to be
 //   thread safe.
 //
 class VideoCapturer
     : public sigslot::has_slots<>,
-      public rtc::MessageHandler {
+      public rtc::MessageHandler,
+      public rtc::VideoSourceBase<cricket::VideoFrame> {
  public:
   // All signals are marshalled to |thread| or the creating thread if
   // none is provided.
   VideoCapturer();
   explicit VideoCapturer(rtc::Thread* thread);
   virtual ~VideoCapturer() {}
 
   // Gets the id of the underlying device, which is available after the capturer
   // is initialized. Can be used to determine if two capturers reference the
   // same device.
@@ skipping 109 matching lines @@
   // Signal all capture state changes that are not a direct result of calling
   // Start().
   sigslot::signal2<VideoCapturer*, CaptureState> SignalStateChange;
   // Frame callbacks are multithreaded to allow disconnect and connect to be
   // called concurrently. It also ensures that it is safe to call disconnect
   // at any time which is needed since the signal may be called from an
   // unmarshalled thread owned by the VideoCapturer.
   // Signal the captured frame to downstream.
   sigslot::signal2<VideoCapturer*, const CapturedFrame*,
                    sigslot::multi_threaded_local> SignalFrameCaptured;
+
   // Signal the captured and possibly adapted frame to downstream consumers
   // such as the encoder.
   sigslot::signal2<VideoCapturer*, const VideoFrame*,
                    sigslot::multi_threaded_local> SignalVideoFrame;
 
   // If true, run video adaptation. By default, video adaptation is enabled
   // and users must call video_adapter()->OnOutputFormatRequest()
   // to receive frames.
   bool enable_video_adapter() const { return enable_video_adapter_; }
   void set_enable_video_adapter(bool enable_video_adapter) {
@@ skipping 106 matching lines @@
 
   // Whether capturer should apply rotation to the frame before signaling it.
   bool apply_rotation_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_VIDEOCAPTURER_H_