| 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..8c18622654efa5b38ffc66c4e03de61394e82db1 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,7 +832,7 @@ int32_t VideoRenderDirect3D9::DeleteChannel(const uint32_t streamId)
|
| return -1;
|
| }
|
|
|
| -VideoRenderCallback* VideoRenderDirect3D9::CreateChannel(const uint32_t channel,
|
| +rtc::VideoSinkInterface<VideoFrame>* VideoRenderDirect3D9::CreateChannel(const uint32_t channel,
|
| const uint32_t zOrder,
|
| const float left,
|
| const float top,
|
|
|