Merge changes I7bbf776e,I1b827825

am: fe8b4a6579

* commit 'fe8b4a657979b49e1701bd92f6d5814a99e0b2be': (7237 commits)
  WIP: Changes after merge commit 'cb3f9bd'
  Make the nonlinear beamformer steerable
  Utilize bitrate above codec max to protect video.
  Enable VP9 internal resize by default.
  Filter overlapping RTP header extensions.
  Make VCMEncodedFrameCallback const.
  MediaCodecVideoEncoder: Add number of quality resolution downscales to Encoded callback.
  Remove redudant encoder rate calls.
  Create isolate files for nonparallel tests.
  Register header extensions in RtpRtcpObserver to avoid log spam.
  Make an enum class out of NetEqDecoder, and hide the neteq_decoders_ table
  ACM: Move NACK functionality inside NetEq
  Fix chromium-style warnings in webrtc/sound/.
  Create a 'webrtc_nonparallel_tests' target.
  Update scalability structure data according to updates in the RTP payload profile.
  audio_coding: rename interface -> include
  Rewrote perform_action_on_all_files to be parallell.
  Update reference indices according to updates in the RTP payload profile.
  Disable P2PTransport...TestFailoverControlledSide on Memcheck
  pass clangcl compile options to ignore warnings in gflags.cc
  ...

1 files changed, 96 insertions, 0 deletions

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 0000000000..8cbd2a27d1
--- /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/include/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_