| Index: talk/media/base/videocapturer.h
|
| diff --git a/talk/media/base/videocapturer.h b/talk/media/base/videocapturer.h
|
| index a13c201b8b308d0008d3448e87141ae2640599bd..37d137add45314deb8907638fd46ec63b6224354 100644
|
| --- a/talk/media/base/videocapturer.h
|
| +++ b/talk/media/base/videocapturer.h
|
| @@ -41,6 +41,7 @@
|
| #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"
|
| @@ -127,7 +128,8 @@ struct CapturedFrame {
|
| //
|
| 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.
|
| @@ -257,6 +259,7 @@ class 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*,
|
|
|