Index: webrtc/media/base/videocapturer.h |
diff --git a/webrtc/media/base/videocapturer.h b/webrtc/media/base/videocapturer.h |
index bf3bc64838003cb00182a5c10a5fa27489c81339..21799d24efd1013e0b69fc9ad4a71e302823627b 100644 |
--- a/webrtc/media/base/videocapturer.h |
+++ b/webrtc/media/base/videocapturer.h |
@@ -29,6 +29,9 @@ |
#include "webrtc/media/base/videobroadcaster.h" |
#include "webrtc/media/base/videocommon.h" |
+namespace webrtc { |
+class VideoFrame; |
perkj_webrtc
2016/10/25 10:53:36
dito- prefer include if possible.
|
+} |
namespace cricket { |
@@ -69,7 +72,7 @@ enum CaptureState { |
// thread safe. |
// |
class VideoCapturer : public sigslot::has_slots<>, |
- public rtc::VideoSourceInterface<cricket::VideoFrame> { |
+ public rtc::VideoSourceInterface<webrtc::VideoFrame> { |
public: |
VideoCapturer(); |
@@ -181,9 +184,9 @@ class VideoCapturer : public sigslot::has_slots<>, |
bool GetInputSize(int* width, int* height); |
// Implements VideoSourceInterface |
- void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink, |
+ void AddOrUpdateSink(rtc::VideoSinkInterface<webrtc::VideoFrame>* sink, |
const rtc::VideoSinkWants& wants) override; |
- void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override; |
+ void RemoveSink(rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) override; |
protected: |
// OnSinkWantsChanged can be overridden to change the default behavior |
@@ -222,7 +225,9 @@ class VideoCapturer : public sigslot::has_slots<>, |
// 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 VideoFrame& frame, int orig_width, int orig_height); |
+ void OnFrame(const webrtc::VideoFrame& frame, |
+ int orig_width, |
+ int orig_height); |
VideoAdapter* video_adapter() { return &video_adapter_; } |