Index: webrtc/media/base/videosourcebase.h |
diff --git a/webrtc/media/base/videosourcebase.h b/webrtc/media/base/videosourcebase.h |
index 40d2fb3482f2e55b1998c88150360372bee82ef1..5ddef093b46ca51b8a95f848168113f58c36e66c 100644 |
--- a/webrtc/media/base/videosourcebase.h |
+++ b/webrtc/media/base/videosourcebase.h |
@@ -14,28 +14,27 @@ |
#include <vector> |
#include "webrtc/base/thread_checker.h" |
-#include "webrtc/media/base/videoframe.h" |
#include "webrtc/media/base/videosourceinterface.h" |
+#include "webrtc/video_frame.h" |
namespace rtc { |
// VideoSourceBase is not thread safe. |
-class VideoSourceBase : public VideoSourceInterface<cricket::VideoFrame> { |
+class VideoSourceBase : public VideoSourceInterface<webrtc::VideoFrame> { |
public: |
VideoSourceBase(); |
- void AddOrUpdateSink(VideoSinkInterface<cricket::VideoFrame>* sink, |
+ void AddOrUpdateSink(VideoSinkInterface<webrtc::VideoFrame>* sink, |
const VideoSinkWants& wants) override; |
- void RemoveSink(VideoSinkInterface<cricket::VideoFrame>* sink) override; |
+ void RemoveSink(VideoSinkInterface<webrtc::VideoFrame>* sink) override; |
protected: |
struct SinkPair { |
- SinkPair(VideoSinkInterface<cricket::VideoFrame>* sink, |
- VideoSinkWants wants) |
+ SinkPair(VideoSinkInterface<webrtc::VideoFrame>* sink, VideoSinkWants wants) |
: sink(sink), wants(wants) {} |
- VideoSinkInterface<cricket::VideoFrame>* sink; |
+ VideoSinkInterface<webrtc::VideoFrame>* sink; |
VideoSinkWants wants; |
}; |
- SinkPair* FindSinkPair(const VideoSinkInterface<cricket::VideoFrame>* sink); |
+ SinkPair* FindSinkPair(const VideoSinkInterface<webrtc::VideoFrame>* sink); |
const std::vector<SinkPair>& sink_pairs() const { return sinks_; } |
ThreadChecker thread_checker_; |