Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: remoting/protocol/webrtc_video_renderer_adapter.h

Issue 1809623002: Replace all uses of webrtc::VideoRendererInterface by rtc::VideoSinkInterface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/protocol/webrtc_video_renderer_adapter.h
diff --git a/remoting/protocol/webrtc_video_renderer_adapter.h b/remoting/protocol/webrtc_video_renderer_adapter.h
index e9cbb72f196c9726da8f0751093503f3dbd7ea2b..e36ad593f4e03325b8c58776a380ed0cf5402b5f 100644
--- a/remoting/protocol/webrtc_video_renderer_adapter.h
+++ b/remoting/protocol/webrtc_video_renderer_adapter.h
@@ -8,6 +8,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "third_party/webrtc/api/mediastreaminterface.h"
+#include "third_party/webrtc/media/base/videosinkinterface.h"
namespace base {
class SingleThreadTaskRunner;
@@ -17,12 +18,17 @@ namespace webrtc {
class DesktopFrame;
} // namespace webrtc
+namespace cricket {
+class VideoFrame;
+}
Sergey Ulanov 2016/03/16 19:17:06 add "// namespace cricket" for consistency
+
namespace remoting {
namespace protocol {
class FrameConsumer;
-class WebrtcVideoRendererAdapter : public webrtc::VideoRendererInterface {
+class WebrtcVideoRendererAdapter
+ : public rtc::VideoSinkInterface<cricket::VideoFrame> {
public:
WebrtcVideoRendererAdapter(
scoped_refptr<webrtc::MediaStreamInterface> media_stream,
@@ -31,8 +37,8 @@ class WebrtcVideoRendererAdapter : public webrtc::VideoRendererInterface {
std::string label() const { return media_stream_->label(); }
- // webrtc::VideoRendererInterface implementation.
- void RenderFrame(const cricket::VideoFrame* frame) override;
+ // rtc::VideoSinkInterface implementation.
+ void OnFrame(const cricket::VideoFrame& frame) override;
private:
void DrawFrame(scoped_ptr<webrtc::DesktopFrame> frame);

Powered by Google App Engine
This is Rietveld 408576698