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

Unified Diff: talk/media/webrtc/webrtcvideoengine2.cc

Issue 1668493002: Replace uses of cricket::VideoRenderer by rtc::VideoSinkInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.h ('k') | talk/media/webrtc/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/webrtc/webrtcvideoengine2.cc
diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc
index 3ba77a7657b19017382e77345b498747ae25fae5..8444376e1b22badbf90b843a21920506437a585e 100644
--- a/talk/media/webrtc/webrtcvideoengine2.cc
+++ b/talk/media/webrtc/webrtcvideoengine2.cc
@@ -466,7 +466,7 @@ void* WebRtcVideoChannel2::WebRtcVideoSendStream::ConfigureVideoEncoderSettings(
}
DefaultUnsignalledSsrcHandler::DefaultUnsignalledSsrcHandler()
- : default_recv_ssrc_(0), default_renderer_(NULL) {}
+ : default_recv_ssrc_(0), default_sink_(NULL) {}
UnsignalledSsrcHandler::Action DefaultUnsignalledSsrcHandler::OnUnsignalledSsrc(
WebRtcVideoChannel2* channel,
@@ -483,21 +483,22 @@ UnsignalledSsrcHandler::Action DefaultUnsignalledSsrcHandler::OnUnsignalledSsrc(
LOG(LS_WARNING) << "Could not create default receive stream.";
}
- channel->SetRenderer(ssrc, default_renderer_);
+ channel->SetSink(ssrc, default_sink_);
default_recv_ssrc_ = ssrc;
return kDeliverPacket;
}
-VideoRenderer* DefaultUnsignalledSsrcHandler::GetDefaultRenderer() const {
- return default_renderer_;
+rtc::VideoSinkInterface<VideoFrame>*
+DefaultUnsignalledSsrcHandler::GetDefaultSink() const {
+ return default_sink_;
}
-void DefaultUnsignalledSsrcHandler::SetDefaultRenderer(
+void DefaultUnsignalledSsrcHandler::SetDefaultSink(
VideoMediaChannel* channel,
- VideoRenderer* renderer) {
- default_renderer_ = renderer;
+ rtc::VideoSinkInterface<VideoFrame>* sink) {
+ default_sink_ = sink;
if (default_recv_ssrc_ != 0) {
- channel->SetRenderer(default_recv_ssrc_, default_renderer_);
+ channel->SetSink(default_recv_ssrc_, default_sink_);
}
}
@@ -1241,11 +1242,11 @@ bool WebRtcVideoChannel2::RemoveRecvStream(uint32_t ssrc) {
return true;
}
-bool WebRtcVideoChannel2::SetRenderer(uint32_t ssrc, VideoRenderer* renderer) {
- LOG(LS_INFO) << "SetRenderer: ssrc:" << ssrc << " "
- << (renderer ? "(ptr)" : "NULL");
+bool WebRtcVideoChannel2::SetSink(uint32_t ssrc,
+ rtc::VideoSinkInterface<VideoFrame>* sink) {
+ LOG(LS_INFO) << "SetSink: ssrc:" << ssrc << " " << (sink ? "(ptr)" : "NULL");
if (ssrc == 0) {
- default_unsignalled_ssrc_handler_.SetDefaultRenderer(this, renderer);
+ default_unsignalled_ssrc_handler_.SetDefaultSink(this, sink);
return true;
}
@@ -1256,7 +1257,7 @@ bool WebRtcVideoChannel2::SetRenderer(uint32_t ssrc, VideoRenderer* renderer) {
return false;
}
- it->second->SetSink(renderer);
+ it->second->SetSink(sink);
return true;
}
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.h ('k') | talk/media/webrtc/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698