| 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 27 matching lines...) Expand all Loading... |
| 38 | 38 |
| 39 virtual int32_t Init(); | 39 virtual int32_t Init(); |
| 40 | 40 |
| 41 virtual int32_t ChangeWindow(void* window); | 41 virtual int32_t ChangeWindow(void* window); |
| 42 | 42 |
| 43 /************************************************************************** | 43 /************************************************************************** |
| 44 * | 44 * |
| 45 * Incoming Streams | 45 * Incoming Streams |
| 46 * | 46 * |
| 47 ***************************************************************************
/ | 47 ***************************************************************************
/ |
| 48 virtual VideoRenderCallback* AddIncomingRenderStream(const uint32_t streamId
, | 48 virtual rtc::VideoSinkInterface<VideoFrame>* |
| 49 const uint32_t zOrder, | 49 AddIncomingRenderStream(const uint32_t streamId, |
| 50 const float left, | 50 const uint32_t zOrder, |
| 51 const float top, | 51 const float left, |
| 52 const float right, | 52 const float top, |
| 53 const float bottom); | 53 const float right, |
| 54 const float bottom); |
| 54 | 55 |
| 55 virtual int32_t DeleteIncomingRenderStream(const uint32_t streamId); | 56 virtual int32_t DeleteIncomingRenderStream(const uint32_t streamId); |
| 56 | 57 |
| 57 virtual int32_t GetIncomingRenderStreamProperties(const uint32_t streamId, | 58 virtual int32_t GetIncomingRenderStreamProperties(const uint32_t streamId, |
| 58 uint32_t& zOrder, | 59 uint32_t& zOrder, |
| 59 float& left, | 60 float& left, |
| 60 float& top, | 61 float& top, |
| 61 float& right, | 62 float& right, |
| 62 float& bottom) const; | 63 float& bottom) const; |
| 63 | 64 |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 void* _ptrWindow; | 138 void* _ptrWindow; |
| 138 VideoRenderAGL* _ptrCarbonRender; | 139 VideoRenderAGL* _ptrCarbonRender; |
| 139 | 140 |
| 140 }; | 141 }; |
| 141 | 142 |
| 142 | 143 |
| 143 } // namespace webrtc | 144 } // namespace webrtc |
| 144 | 145 |
| 145 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_MAC_CARBON_I
MPL_H_ | 146 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_MAC_CARBON_I
MPL_H_ |
| 146 #endif // CARBON_RENDERING | 147 #endif // CARBON_RENDERING |
| OLD | NEW |