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

Unified Diff: webrtc/modules/video_render/linux/video_x11_channel.cc

Issue 1813173002: Deletes the class VideoRendererCallback. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Break long lines. Add explicit keyword on IncomingVideoStream constructor. 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: webrtc/modules/video_render/linux/video_x11_channel.cc
diff --git a/webrtc/modules/video_render/linux/video_x11_channel.cc b/webrtc/modules/video_render/linux/video_x11_channel.cc
index 8d86b7c72ad6b3d58f8a68ba9da18f22481c7de2..888e6902e3874d7be998bd64980aa41195bb639e 100644
--- a/webrtc/modules/video_render/linux/video_x11_channel.cc
+++ b/webrtc/modules/video_render/linux/video_x11_channel.cc
@@ -43,16 +43,15 @@ VideoX11Channel::~VideoX11Channel()
delete &_crit;
}
-int32_t VideoX11Channel::RenderFrame(const uint32_t streamId,
- const VideoFrame& videoFrame) {
+void VideoX11Channel::OnFrame(const VideoFrame& videoFrame) {
CriticalSectionScoped cs(&_crit);
if (_width != videoFrame.width() || _height
!= videoFrame.height()) {
if (FrameSizeChange(videoFrame.width(), videoFrame.height(), 1) == -1) {
- return -1;
+ return;
}
}
- return DeliverFrame(videoFrame);
+ DeliverFrame(videoFrame);
}
int32_t VideoX11Channel::FrameSizeChange(int32_t width,
@@ -72,6 +71,7 @@ int32_t VideoX11Channel::FrameSizeChange(int32_t width,
return 0;
}
+// TODO(nisse): Delete return value?
int32_t VideoX11Channel::DeliverFrame(const VideoFrame& videoFrame) {
CriticalSectionScoped cs(&_crit);
if (!_prepared) {

Powered by Google App Engine
This is Rietveld 408576698