OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 _ptrWindow = window; | 70 _ptrWindow = window; |
71 | 71 |
72 if (_ptrX11Render) | 72 if (_ptrX11Render) |
73 { | 73 { |
74 return _ptrX11Render->ChangeWindow((Window) window); | 74 return _ptrX11Render->ChangeWindow((Window) window); |
75 } | 75 } |
76 | 76 |
77 return -1; | 77 return -1; |
78 } | 78 } |
79 | 79 |
80 VideoRenderCallback* VideoRenderLinuxImpl::AddIncomingRenderStream( | 80 rtc::VideoSinkInterface<VideoFrame>* VideoRenderLinuxImpl::AddIncomingRenderStre
am( |
81 const uin
t32_t streamId, | 81 const uin
t32_t streamId, |
82 const uin
t32_t zOrder, | 82 const uin
t32_t zOrder, |
83 const flo
at left, | 83 const flo
at left, |
84 const flo
at top, | 84 const flo
at top, |
85 const flo
at right, | 85 const flo
at right, |
86 const flo
at bottom) | 86 const flo
at bottom) |
87 { | 87 { |
88 WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id, "%s", | 88 WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id, "%s", |
89 __FUNCTION__); | 89 __FUNCTION__); |
90 CriticalSectionScoped cs(&_renderLinuxCritsect); | 90 CriticalSectionScoped cs(&_renderLinuxCritsect); |
91 | 91 |
92 VideoRenderCallback* renderCallback = NULL; | 92 rtc::VideoSinkInterface<VideoFrame>* renderCallback = NULL; |
93 if (_ptrX11Render) | 93 if (_ptrX11Render) |
94 { | 94 { |
95 VideoX11Channel* renderChannel = | 95 VideoX11Channel* renderChannel = |
96 _ptrX11Render->CreateX11RenderChannel(streamId, zOrder, left, | 96 _ptrX11Render->CreateX11RenderChannel(streamId, zOrder, left, |
97 top, right, bottom); | 97 top, right, bottom); |
98 if (!renderChannel) | 98 if (!renderChannel) |
99 { | 99 { |
100 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, | 100 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, |
101 "Render channel creation failed for stream id: %d", | 101 "Render channel creation failed for stream id: %d", |
102 streamId); | 102 streamId); |
103 return NULL; | 103 return NULL; |
104 } | 104 } |
105 renderCallback = (VideoRenderCallback *) renderChannel; | 105 renderCallback = (rtc::VideoSinkInterface<VideoFrame> *) renderChannel; |
106 } | 106 } |
107 else | 107 else |
108 { | 108 { |
109 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, | 109 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, |
110 "_ptrX11Render is NULL"); | 110 "_ptrX11Render is NULL"); |
111 return NULL; | 111 return NULL; |
112 } | 112 } |
113 return renderCallback; | 113 return renderCallback; |
114 } | 114 } |
115 | 115 |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 const float top, | 252 const float top, |
253 const float right, | 253 const float right, |
254 const float bottom) | 254 const float bottom) |
255 { | 255 { |
256 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, | 256 WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, |
257 "%s - not supported on Linux", __FUNCTION__); | 257 "%s - not supported on Linux", __FUNCTION__); |
258 return -1; | 258 return -1; |
259 } | 259 } |
260 | 260 |
261 } // namespace webrtc | 261 } // namespace webrtc |
OLD | NEW |