Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(452)

Unified Diff: webrtc/modules/video_render/linux/video_x11_channel.h

Issue 1923613003: Revert of Delete video_render module. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_render/linux/video_x11_channel.h
diff --git a/webrtc/modules/video_render/linux/video_x11_channel.h b/webrtc/modules/video_render/linux/video_x11_channel.h
new file mode 100644
index 0000000000000000000000000000000000000000..6eb402e12eeab77fe07c4bec70f346033af1587c
--- /dev/null
+++ b/webrtc/modules/video_render/linux/video_x11_channel.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_
+#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_
+
+#include <sys/shm.h>
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/modules/video_render/video_render_defines.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XShm.h>
+
+namespace webrtc {
+class CriticalSectionWrapper;
+
+#define DEFAULT_RENDER_FRAME_WIDTH 352
+#define DEFAULT_RENDER_FRAME_HEIGHT 288
+
+
+class VideoX11Channel: public VideoRenderCallback
+{
+public:
+ VideoX11Channel(int32_t id);
+
+ virtual ~VideoX11Channel();
+
+ virtual int32_t RenderFrame(const uint32_t streamId,
+ const VideoFrame& videoFrame);
+
+ int32_t FrameSizeChange(int32_t width, int32_t height,
+ int32_t numberOfStreams);
+ int32_t DeliverFrame(const VideoFrame& videoFrame);
+ int32_t GetFrameSize(int32_t& width, int32_t& height);
+ int32_t Init(Window window, float left, float top, float right,
+ float bottom);
+ int32_t ChangeWindow(Window window);
+ int32_t
+ GetStreamProperties(uint32_t& zOrder, float& left,
+ float& top, float& right, float& bottom) const;
+ int32_t ReleaseWindow();
+
+ bool IsPrepared()
+ {
+ return _prepared;
+ }
+
+private:
+
+ int32_t
+ CreateLocalRenderer(int32_t width, int32_t height);
+ int32_t RemoveRenderer();
+
+ //FIXME a better place for this method? the GetWidthHeight no longer
+ // supported by common_video.
+ int GetWidthHeight(VideoType type, int bufferSize, int& width,
+ int& height);
+
+ CriticalSectionWrapper& _crit;
+
+ Display* _display;
+ XShmSegmentInfo _shminfo;
+ XImage* _image;
+ Window _window;
+ GC _gc;
+ int32_t _width; // incoming frame width
+ int32_t _height; // incoming frame height
+ int32_t _outWidth; // render frame width
+ int32_t _outHeight; // render frame height
+ int32_t _xPos; // position within window
+ int32_t _yPos;
+ bool _prepared; // true if ready to use
+ int32_t _dispCount;
+
+ unsigned char* _buffer;
+ float _top;
+ float _left;
+ float _right;
+ float _bottom;
+
+ int32_t _Id;
+
+};
+
+
+} // namespace webrtc
+
+#endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_
« no previous file with comments | « webrtc/modules/video_render/linux/video_render_linux_impl.cc ('k') | webrtc/modules/video_render/linux/video_x11_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698