| Index: webrtc/media/base/videocapturer.h
|
| diff --git a/webrtc/media/base/videocapturer.h b/webrtc/media/base/videocapturer.h
|
| index 1f1da3a88cc2e2561a04f9b601544b2541fac0a6..909c838fa55c3d9fd93ad171dfc6d5b435a74a02 100644
|
| --- a/webrtc/media/base/videocapturer.h
|
| +++ b/webrtc/media/base/videocapturer.h
|
| @@ -29,9 +29,6 @@
|
| #include "webrtc/media/base/videobroadcaster.h"
|
| #include "webrtc/media/base/videocommon.h"
|
|
|
| -namespace webrtc {
|
| -class VideoFrame;
|
| -}
|
|
|
| namespace cricket {
|
|
|
| @@ -72,7 +69,7 @@
|
| // thread safe.
|
| //
|
| class VideoCapturer : public sigslot::has_slots<>,
|
| - public rtc::VideoSourceInterface<webrtc::VideoFrame> {
|
| + public rtc::VideoSourceInterface<cricket::VideoFrame> {
|
| public:
|
| VideoCapturer();
|
|
|
| @@ -172,9 +169,9 @@
|
| bool GetInputSize(int* width, int* height);
|
|
|
| // Implements VideoSourceInterface
|
| - void AddOrUpdateSink(rtc::VideoSinkInterface<webrtc::VideoFrame>* sink,
|
| + void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
|
| const rtc::VideoSinkWants& wants) override;
|
| - void RemoveSink(rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) override;
|
| + void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
|
|
|
| protected:
|
| // OnSinkWantsChanged can be overridden to change the default behavior
|
| @@ -213,9 +210,7 @@
|
| // VideoFrame. OnFrame can be called directly by an implementation
|
| // that does not use SignalFrameCaptured or OnFrameCaptured. The
|
| // orig_width and orig_height are used only to produce stats.
|
| - void OnFrame(const webrtc::VideoFrame& frame,
|
| - int orig_width,
|
| - int orig_height);
|
| + void OnFrame(const VideoFrame& frame, int orig_width, int orig_height);
|
|
|
| VideoAdapter* video_adapter() { return &video_adapter_; }
|
|
|
|
|