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

Unified Diff: webrtc/modules/video_render/windows/video_render_direct3d9.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/windows/video_render_direct3d9.cc
diff --git a/webrtc/modules/video_render/windows/video_render_direct3d9.cc b/webrtc/modules/video_render/windows/video_render_direct3d9.cc
index b59b944e483405818db95708c5793ac8cdc28ede..c9232ca229d697e2e87ecb6881597cdbf6e4dc99 100644
--- a/webrtc/modules/video_render/windows/video_render_direct3d9.cc
+++ b/webrtc/modules/video_render/windows/video_render_direct3d9.cc
@@ -141,17 +141,16 @@ int D3D9Channel::FrameSizeChange(int width, int height, int numberOfStreams)
return 0;
}
-int32_t D3D9Channel::RenderFrame(const uint32_t streamId,
- const VideoFrame& videoFrame) {
+void D3D9Channel::OnFrame(const VideoFrame& videoFrame) {
CriticalSectionScoped cs(_critSect);
if (_width != videoFrame.width() || _height != videoFrame.height())
{
if (FrameSizeChange(videoFrame.width(), videoFrame.height(), 1) == -1)
{
- return -1;
+ return;
}
}
- return DeliverFrame(videoFrame);
+ DeliverFrame(videoFrame);
}
// Called from video engine when a new frame should be rendered.
@@ -833,12 +832,13 @@ int32_t VideoRenderDirect3D9::DeleteChannel(const uint32_t streamId)
return -1;
}
-VideoRenderCallback* VideoRenderDirect3D9::CreateChannel(const uint32_t channel,
- const uint32_t zOrder,
- const float left,
- const float top,
- const float right,
- const float bottom)
+rtc::VideoSinkInterface<VideoFrame>*
+VideoRenderDirect3D9::CreateChannel(const uint32_t channel,
+ const uint32_t zOrder,
+ const float left,
+ const float top,
+ const float right,
+ const float bottom)
{
CriticalSectionScoped cs(&_refD3DCritsect);

Powered by Google App Engine
This is Rietveld 408576698