| Index: talk/app/webrtc/videosource.h
|
| diff --git a/talk/app/webrtc/videosource.h b/talk/app/webrtc/videosource.h
|
| index 98c1e083a3e4cfed262c4616497316f80686105e..eaaec41962ed7d7ecf2f296262d11b79ffd891c8 100644
|
| --- a/talk/app/webrtc/videosource.h
|
| +++ b/talk/app/webrtc/videosource.h
|
| @@ -38,6 +38,7 @@
|
| #include "talk/media/base/videocommon.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/base/sigslot.h"
|
| +#include "webrtc/media/base/videosinkinterface.h"
|
|
|
| // VideoSource implements VideoSourceInterface. It owns a
|
| // cricket::VideoCapturer and make sure the camera is started at a resolution
|
| @@ -84,8 +85,8 @@ class VideoSource : public Notifier<VideoSourceInterface>,
|
|
|
| // |output| will be served video frames as long as the underlying capturer
|
| // is running video frames.
|
| - virtual void AddSink(cricket::VideoRenderer* output);
|
| - virtual void RemoveSink(cricket::VideoRenderer* output);
|
| + virtual void AddSink(rtc::VideoSinkInterface<cricket::VideoFrame>* output);
|
| + virtual void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* output);
|
|
|
| protected:
|
| VideoSource(cricket::ChannelManager* channel_manager,
|
| @@ -103,7 +104,7 @@ class VideoSource : public Notifier<VideoSourceInterface>,
|
| rtc::scoped_ptr<cricket::VideoCapturer> video_capturer_;
|
| rtc::scoped_ptr<cricket::VideoRenderer> frame_input_;
|
|
|
| - std::list<cricket::VideoRenderer*> sinks_;
|
| + std::list<rtc::VideoSinkInterface<cricket::VideoFrame>*> sinks_;
|
|
|
| cricket::VideoFormat format_;
|
| cricket::VideoOptions options_;
|
|
|