Chromium Code Reviews| 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 |
| 11 #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNAL_I MPL_H_ | 11 #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNAL_I MPL_H_ |
| 12 #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNAL_I MPL_H_ | 12 #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNAL_I MPL_H_ |
| 13 | 13 |
| 14 #include "webrtc/modules/include/module_common_types.h" | 14 #include "webrtc/modules/include/module_common_types.h" |
| 15 #include "webrtc/modules/video_render/i_video_render.h" | 15 #include "webrtc/modules/video_render/i_video_render.h" |
| 16 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" | 16 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
| 17 | 17 |
| 18 namespace webrtc { | 18 namespace webrtc { |
| 19 | 19 |
| 20 // Class definitions | 20 // Class definitions |
| 21 class VideoRenderExternalImpl: IVideoRender, public VideoRenderCallback | 21 class VideoRenderExternalImpl: IVideoRender, |
| 22 public rtc::VideoSinkInterface<VideoFrame> | |
| 22 { | 23 { |
| 23 public: | 24 public: |
| 24 /* | 25 /* |
| 25 * Constructor/destructor | 26 * Constructor/destructor |
| 26 */ | 27 */ |
| 27 | 28 |
| 28 VideoRenderExternalImpl(const int32_t id, | 29 VideoRenderExternalImpl(const int32_t id, |
| 29 const VideoRenderType videoRenderType, | 30 const VideoRenderType videoRenderType, |
| 30 void* window, const bool fullscreen); | 31 void* window, const bool fullscreen); |
| 31 | 32 |
| 32 virtual ~VideoRenderExternalImpl(); | 33 virtual ~VideoRenderExternalImpl(); |
| 33 | 34 |
| 34 virtual int32_t Init(); | 35 virtual int32_t Init(); |
| 35 | 36 |
| 36 virtual int32_t ChangeWindow(void* window); | 37 virtual int32_t ChangeWindow(void* window); |
| 37 | 38 |
| 38 /************************************************************************** | 39 /************************************************************************** |
| 39 * | 40 * |
| 40 * Incoming Streams | 41 * Incoming Streams |
| 41 * | 42 * |
| 42 *************************************************************************** / | 43 *************************************************************************** / |
| 43 | 44 |
| 44 virtual VideoRenderCallback | 45 virtual rtc::VideoSinkInterface<VideoFrame> |
| 45 * AddIncomingRenderStream(const uint32_t streamId, | 46 * AddIncomingRenderStream(const uint32_t streamId, |
| 46 const uint32_t zOrder, | 47 const uint32_t zOrder, |
| 47 const float left, const float top, | 48 const float left, const float top, |
| 48 const float right, const float bottom); | 49 const float right, const float bottom); |
| 49 | 50 |
| 50 virtual int32_t | 51 virtual int32_t |
| 51 DeleteIncomingRenderStream(const uint32_t streamId); | 52 DeleteIncomingRenderStream(const uint32_t streamId); |
| 52 | 53 |
| 53 virtual int32_t | 54 virtual int32_t |
| 54 GetIncomingRenderStreamProperties(const uint32_t streamId, | 55 GetIncomingRenderStreamProperties(const uint32_t streamId, |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 106 const uint32_t backgroundColorRef, | 107 const uint32_t backgroundColorRef, |
| 107 const float left, const float top, | 108 const float left, const float top, |
| 108 const float right, const float bottom); | 109 const float right, const float bottom); |
| 109 | 110 |
| 110 virtual int32_t SetBitmap(const void* bitMap, | 111 virtual int32_t SetBitmap(const void* bitMap, |
| 111 const uint8_t pictureId, | 112 const uint8_t pictureId, |
| 112 const void* colorKey, const float left, | 113 const void* colorKey, const float left, |
| 113 const float top, const float right, | 114 const float top, const float right, |
| 114 const float bottom); | 115 const float bottom); |
| 115 | 116 |
| 116 // VideoRenderCallback | 117 // rtc::VideoSinkInterface<VideoFrame> |
|
mflodman
2016/05/02 07:06:54
Add 'Implements'.
| |
| 117 virtual int32_t RenderFrame(const uint32_t streamId, | 118 void OnFrame(const VideoFrame& videoFrame) override; |
| 118 const VideoFrame& videoFrame); | |
| 119 | 119 |
| 120 private: | 120 private: |
| 121 CriticalSectionWrapper& _critSect; | 121 CriticalSectionWrapper& _critSect; |
| 122 bool _fullscreen; | 122 bool _fullscreen; |
| 123 }; | 123 }; |
| 124 | 124 |
| 125 } // namespace webrtc | 125 } // namespace webrtc |
| 126 | 126 |
| 127 | 127 |
| 128 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNA L_IMPL_H_ | 128 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNA L_IMPL_H_ |
| OLD | NEW |