| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2011 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 | 54 |
| 55 /************************************************************************** | 55 /************************************************************************** |
| 56 * | 56 * |
| 57 * Incoming Streams | 57 * Incoming Streams |
| 58 * | 58 * |
| 59 ***************************************************************************
/ | 59 ***************************************************************************
/ |
| 60 | 60 |
| 61 /* | 61 /* |
| 62 * Add incoming render stream | 62 * Add incoming render stream |
| 63 */ | 63 */ |
| 64 virtual VideoRenderCallback | 64 virtual rtc::VideoSinkInterface<VideoFrame> |
| 65 * AddIncomingRenderStream(const uint32_t streamId, | 65 * AddIncomingRenderStream(const uint32_t streamId, |
| 66 const uint32_t zOrder, | 66 const uint32_t zOrder, |
| 67 const float left, const float top, | 67 const float left, const float top, |
| 68 const float right, const float bottom); | 68 const float right, const float bottom); |
| 69 /* | 69 /* |
| 70 * Delete incoming render stream | 70 * Delete incoming render stream |
| 71 */ | 71 */ |
| 72 virtual int32_t | 72 virtual int32_t |
| 73 DeleteIncomingRenderStream(const uint32_t streamId); | 73 DeleteIncomingRenderStream(const uint32_t streamId); |
| 74 | 74 |
| 75 /* | 75 /* |
| 76 * Add incoming render callback, used for external rendering | 76 * Add incoming render callback, used for external rendering |
| 77 */ | 77 */ |
| 78 virtual int32_t | 78 virtual int32_t |
| 79 AddExternalRenderCallback(const uint32_t streamId, | 79 AddExternalRenderCallback( |
| 80 VideoRenderCallback* renderObject); | 80 const uint32_t streamId, |
| 81 rtc::VideoSinkInterface<VideoFrame>* renderObject); |
| 81 | 82 |
| 82 /* | 83 /* |
| 83 * Get the porperties for an incoming render stream | 84 * Get the porperties for an incoming render stream |
| 84 */ | 85 */ |
| 85 virtual int32_t | 86 virtual int32_t |
| 86 GetIncomingRenderStreamProperties(const uint32_t streamId, | 87 GetIncomingRenderStreamProperties(const uint32_t streamId, |
| 87 uint32_t& zOrder, | 88 uint32_t& zOrder, |
| 88 float& left, float& top, | 89 float& left, float& top, |
| 89 float& right, float& bottom) const
; | 90 float& right, float& bottom) const
; |
| 90 /* | 91 /* |
| 91 * Incoming frame rate for the specified stream. | 92 * Incoming frame rate for the specified stream. |
| 92 */ | 93 */ |
| 93 virtual uint32_t GetIncomingFrameRate(const uint32_t streamId); | 94 virtual uint32_t GetIncomingFrameRate(const uint32_t streamId); |
| 94 | 95 |
| 95 /* | 96 /* |
| 96 * Returns the number of incoming streams added to this render module | 97 * Returns the number of incoming streams added to this render module |
| 97 */ | 98 */ |
| 98 virtual uint32_t GetNumIncomingRenderStreams() const; | 99 virtual uint32_t GetNumIncomingRenderStreams() const; |
| 99 | 100 |
| 100 /* | 101 /* |
| 101 * Returns true if this render module has the streamId added, false otherw
ise. | 102 * Returns true if this render module has the streamId added, false otherw
ise. |
| 102 */ | 103 */ |
| 103 virtual bool HasIncomingRenderStream(const uint32_t streamId) const; | 104 virtual bool HasIncomingRenderStream(const uint32_t streamId) const; |
| 104 | 105 |
| 105 /* | 106 /* |
| 106 * | 107 * |
| 107 */ | 108 */ |
| 108 virtual int32_t | 109 virtual int32_t |
| 109 RegisterRawFrameCallback(const uint32_t streamId, | 110 RegisterRawFrameCallback( |
| 110 VideoRenderCallback* callbackObj); | 111 const uint32_t streamId, |
| 112 rtc::VideoSinkInterface<VideoFrame>* callbackObj); |
| 111 | 113 |
| 112 virtual int32_t SetExpectedRenderDelay(uint32_t stream_id, | 114 virtual int32_t SetExpectedRenderDelay(uint32_t stream_id, |
| 113 int32_t delay_ms); | 115 int32_t delay_ms); |
| 114 | 116 |
| 115 /************************************************************************** | 117 /************************************************************************** |
| 116 * | 118 * |
| 117 * Start/Stop | 119 * Start/Stop |
| 118 * | 120 * |
| 119 ***************************************************************************
/ | 121 ***************************************************************************
/ |
| 120 | 122 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 bool _fullScreen; | 208 bool _fullScreen; |
| 207 | 209 |
| 208 IVideoRender* _ptrRenderer; | 210 IVideoRender* _ptrRenderer; |
| 209 typedef std::map<uint32_t, IncomingVideoStream*> IncomingVideoStreamMap; | 211 typedef std::map<uint32_t, IncomingVideoStream*> IncomingVideoStreamMap; |
| 210 IncomingVideoStreamMap _streamRenderMap; | 212 IncomingVideoStreamMap _streamRenderMap; |
| 211 }; | 213 }; |
| 212 | 214 |
| 213 } // namespace webrtc | 215 } // namespace webrtc |
| 214 | 216 |
| 215 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_VIDEO_RENDER_IMPL_H_ | 217 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_VIDEO_RENDER_IMPL_H_ |
| OLD | NEW |