| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 * | 84 * |
| 85 * streamID - id of the stream to add | 85 * streamID - id of the stream to add |
| 86 * zOrder - relative render order for the streams, 0 = on top | 86 * zOrder - relative render order for the streams, 0 = on top |
| 87 * left - position of the stream in the window, [0.0f, 1.0f] | 87 * left - position of the stream in the window, [0.0f, 1.0f] |
| 88 * top - position of the stream in the window, [0.0f, 1.0f] | 88 * top - position of the stream in the window, [0.0f, 1.0f] |
| 89 * right - position of the stream in the window, [0.0f, 1.0f] | 89 * right - position of the stream in the window, [0.0f, 1.0f] |
| 90 * bottom - position of the stream in the window, [0.0f, 1.0f] | 90 * bottom - position of the stream in the window, [0.0f, 1.0f] |
| 91 * | 91 * |
| 92 * Return - callback class to use for delivering new frames to render
. | 92 * Return - callback class to use for delivering new frames to render
. |
| 93 */ | 93 */ |
| 94 virtual VideoRenderCallback | 94 virtual rtc::VideoSinkInterface<VideoFrame> |
| 95 * AddIncomingRenderStream(const uint32_t streamId, | 95 * AddIncomingRenderStream(const uint32_t streamId, |
| 96 const uint32_t zOrder, | 96 const uint32_t zOrder, |
| 97 const float left, const float top, | 97 const float left, const float top, |
| 98 const float right, const float bottom) = 0
; | 98 const float right, const float bottom) = 0
; |
| 99 /* | 99 /* |
| 100 * Delete incoming render stream | 100 * Delete incoming render stream |
| 101 * | 101 * |
| 102 * streamID - id of the stream to add | 102 * streamID - id of the stream to add |
| 103 */ | 103 */ |
| 104 virtual int32_t | 104 virtual int32_t |
| 105 DeleteIncomingRenderStream(const uint32_t streamId) = 0; | 105 DeleteIncomingRenderStream(const uint32_t streamId) = 0; |
| 106 | 106 |
| 107 /* | 107 /* |
| 108 * Add incoming render callback, used for external rendering | 108 * Add incoming render callback, used for external rendering |
| 109 * | 109 * |
| 110 * streamID - id of the stream the callback is used for | 110 * streamID - id of the stream the callback is used for |
| 111 * renderObject - the VideoRenderCallback to use for this stream, NULL to
remove | 111 * renderObject - the rtc::VideoSinkInterface<VideoFrame> to use |
| 112 * for this stream, NULL to remove |
| 112 * | 113 * |
| 113 * Return - callback class to use for delivering new frames to render
. | 114 * Return - callback class to use for delivering new frames to render
. |
| 114 */ | 115 */ |
| 115 virtual int32_t | 116 virtual int32_t |
| 116 AddExternalRenderCallback(const uint32_t streamId, | 117 AddExternalRenderCallback( |
| 117 VideoRenderCallback* renderObject) = 0; | 118 const uint32_t streamId, |
| 119 rtc::VideoSinkInterface<VideoFrame>* renderObject) = 0; |
| 118 | 120 |
| 119 /* | 121 /* |
| 120 * Get the porperties for an incoming render stream | 122 * Get the porperties for an incoming render stream |
| 121 * | 123 * |
| 122 * streamID - [in] id of the stream to get properties for | 124 * streamID - [in] id of the stream to get properties for |
| 123 * zOrder - [out] relative render order for the streams, 0 = on top | 125 * zOrder - [out] relative render order for the streams, 0 = on top |
| 124 * left - [out] position of the stream in the window, [0.0f, 1.0f] | 126 * left - [out] position of the stream in the window, [0.0f, 1.0f] |
| 125 * top - [out] position of the stream in the window, [0.0f, 1.0f] | 127 * top - [out] position of the stream in the window, [0.0f, 1.0f] |
| 126 * right - [out] position of the stream in the window, [0.0f, 1.0f] | 128 * right - [out] position of the stream in the window, [0.0f, 1.0f] |
| 127 * bottom - [out] position of the stream in the window, [0.0f, 1.0f] | 129 * bottom - [out] position of the stream in the window, [0.0f, 1.0f] |
| (...skipping 18 matching lines...) Expand all Loading... |
| 146 * Returns true if this render module has the streamId added, false otherw
ise. | 148 * Returns true if this render module has the streamId added, false otherw
ise. |
| 147 */ | 149 */ |
| 148 virtual bool | 150 virtual bool |
| 149 HasIncomingRenderStream(const uint32_t streamId) const = 0; | 151 HasIncomingRenderStream(const uint32_t streamId) const = 0; |
| 150 | 152 |
| 151 /* | 153 /* |
| 152 * Registers a callback to get raw images in the same time as sent | 154 * Registers a callback to get raw images in the same time as sent |
| 153 * to the renderer. To be used for external rendering. | 155 * to the renderer. To be used for external rendering. |
| 154 */ | 156 */ |
| 155 virtual int32_t | 157 virtual int32_t |
| 156 RegisterRawFrameCallback(const uint32_t streamId, | 158 RegisterRawFrameCallback( |
| 157 VideoRenderCallback* callbackObj) = 0; | 159 const uint32_t streamId, |
| 160 rtc::VideoSinkInterface<VideoFrame>* callbackObj) = 0; |
| 158 | 161 |
| 159 /************************************************************************** | 162 /************************************************************************** |
| 160 * | 163 * |
| 161 * Start/Stop | 164 * Start/Stop |
| 162 * | 165 * |
| 163 ***************************************************************************
/ | 166 ***************************************************************************
/ |
| 164 | 167 |
| 165 /* | 168 /* |
| 166 * Starts rendering the specified stream | 169 * Starts rendering the specified stream |
| 167 */ | 170 */ |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 | 262 |
| 260 /* | 263 /* |
| 261 * Set a timout image. The image is rendered if no videoframe has been deliv
ered | 264 * Set a timout image. The image is rendered if no videoframe has been deliv
ered |
| 262 */ | 265 */ |
| 263 virtual int32_t SetTimeoutImage(const uint32_t streamId, | 266 virtual int32_t SetTimeoutImage(const uint32_t streamId, |
| 264 const VideoFrame& videoFrame, | 267 const VideoFrame& videoFrame, |
| 265 const uint32_t timeout) = 0; | 268 const uint32_t timeout) = 0; |
| 266 }; | 269 }; |
| 267 } // namespace webrtc | 270 } // namespace webrtc |
| 268 #endif // WEBRTC_MODULES_VIDEO_RENDER_VIDEO_RENDER_H_ | 271 #endif // WEBRTC_MODULES_VIDEO_RENDER_VIDEO_RENDER_H_ |
| OLD | NEW |