| 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 |
| 11 #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_ | 11 #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_ |
| 12 #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_ | 12 #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_ |
| 13 | 13 |
| 14 #include <sys/shm.h> | 14 #include <sys/shm.h> |
| 15 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" | 15 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" |
| 16 #include "webrtc/modules/video_render/video_render_defines.h" | 16 #include "webrtc/modules/video_render/video_render_defines.h" |
| 17 | 17 |
| 18 #include <X11/Xlib.h> | 18 #include <X11/Xlib.h> |
| 19 #include <X11/Xutil.h> | 19 #include <X11/Xutil.h> |
| 20 #include <X11/extensions/XShm.h> | 20 #include <X11/extensions/XShm.h> |
| 21 | 21 |
| 22 namespace webrtc { | 22 namespace webrtc { |
| 23 class CriticalSectionWrapper; | 23 class CriticalSectionWrapper; |
| 24 | 24 |
| 25 #define DEFAULT_RENDER_FRAME_WIDTH 352 | 25 #define DEFAULT_RENDER_FRAME_WIDTH 352 |
| 26 #define DEFAULT_RENDER_FRAME_HEIGHT 288 | 26 #define DEFAULT_RENDER_FRAME_HEIGHT 288 |
| 27 | 27 |
| 28 | 28 |
| 29 class VideoX11Channel: public VideoRenderCallback | 29 class VideoX11Channel: public rtc::VideoSinkInterface<VideoFrame> |
| 30 { | 30 { |
| 31 public: | 31 public: |
| 32 VideoX11Channel(int32_t id); | 32 VideoX11Channel(int32_t id); |
| 33 | 33 |
| 34 virtual ~VideoX11Channel(); | 34 virtual ~VideoX11Channel(); |
| 35 | 35 |
| 36 virtual int32_t RenderFrame(const uint32_t streamId, | 36 void OnFrame(const VideoFrame& videoFrame) override; |
| 37 const VideoFrame& videoFrame); | |
| 38 | 37 |
| 39 int32_t FrameSizeChange(int32_t width, int32_t height, | 38 int32_t FrameSizeChange(int32_t width, int32_t height, |
| 40 int32_t numberOfStreams); | 39 int32_t numberOfStreams); |
| 41 int32_t DeliverFrame(const VideoFrame& videoFrame); | 40 int32_t DeliverFrame(const VideoFrame& videoFrame); |
| 42 int32_t GetFrameSize(int32_t& width, int32_t& height); | 41 int32_t GetFrameSize(int32_t& width, int32_t& height); |
| 43 int32_t Init(Window window, float left, float top, float right, | 42 int32_t Init(Window window, float left, float top, float right, |
| 44 float bottom); | 43 float bottom); |
| 45 int32_t ChangeWindow(Window window); | 44 int32_t ChangeWindow(Window window); |
| 46 int32_t | 45 int32_t |
| 47 GetStreamProperties(uint32_t& zOrder, float& left, | 46 GetStreamProperties(uint32_t& zOrder, float& left, |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 float _bottom; | 86 float _bottom; |
| 88 | 87 |
| 89 int32_t _Id; | 88 int32_t _Id; |
| 90 | 89 |
| 91 }; | 90 }; |
| 92 | 91 |
| 93 | 92 |
| 94 } // namespace webrtc | 93 } // namespace webrtc |
| 95 | 94 |
| 96 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_ | 95 #endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_ |
| OLD | NEW |