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, 110 insertions, 0 deletions

diff --git a/webrtc/modules/video_render/windows/i_video_render_win.h b/webrtc/modules/video_render/windows/i_video_render_win.h
new file mode 100644
index 0000000000..56731e3770
--- /dev/null
+++ b/webrtc/modules/video_render/windows/i_video_render_win.h
@@ -0,0 +1,110 @@
+/*
+ *  Copyright (c) 2011 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_WINDOWS_I_VIDEO_RENDER_WIN_H_
+#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_I_VIDEO_RENDER_WIN_H_
+
+#include "webrtc/modules/video_render/include/video_render.h"
+
+namespace webrtc {
+
+// Class definitions
+class IVideoRenderWin
+{
+public:
+    /**************************************************************************
+     *
+     *   Constructor/destructor
+     *
+     ***************************************************************************/
+    virtual ~IVideoRenderWin()
+    {
+    };
+
+    virtual int32_t Init() = 0;
+
+    /**************************************************************************
+     *
+     *   Incoming Streams
+     *
+     ***************************************************************************/
+
+    virtual VideoRenderCallback
+            * CreateChannel(const uint32_t streamId,
+                            const uint32_t zOrder,
+                            const float left,
+                            const float top,
+                            const float right,
+                            const float bottom) = 0;
+
+    virtual int32_t DeleteChannel(const uint32_t streamId) = 0;
+
+    virtual int32_t GetStreamSettings(const uint32_t channel,
+                                      const uint16_t streamId,
+                                      uint32_t& zOrder,
+                                      float& left, float& top,
+                                      float& right, float& bottom) = 0;
+
+    /**************************************************************************
+     *
+     *   Start/Stop
+     *
+     ***************************************************************************/
+
+    virtual int32_t StartRender() = 0;
+
+    virtual int32_t StopRender() = 0;
+
+    /**************************************************************************
+     *
+     *   Properties
+     *
+     ***************************************************************************/
+
+    virtual bool IsFullScreen() = 0;
+
+    virtual int32_t SetCropping(const uint32_t channel,
+                                const uint16_t streamId,
+                                const float left, const float top,
+                                const float right, const float bottom) = 0;
+
+    virtual int32_t ConfigureRenderer(const uint32_t channel,
+                                      const uint16_t streamId,
+                                      const unsigned int zOrder,
+                                      const float left,
+                                      const float top,
+                                      const float right,
+                                      const float bottom) = 0;
+
+    virtual int32_t SetTransparentBackground(const bool enable) = 0;
+
+    virtual int32_t SetText(const uint8_t textId,
+                            const uint8_t* text,
+                            const int32_t textLength,
+                            const uint32_t colorText,
+                            const uint32_t colorBg,
+                            const float left, const float top,
+                            const float rigth, const float bottom) = 0;
+
+    virtual int32_t SetBitmap(const void* bitMap,
+                              const uint8_t pictureId,
+                              const void* colorKey,
+                              const float left, const float top,
+                              const float right, const float bottom) = 0;
+
+    virtual int32_t ChangeWindow(void* window) = 0;
+
+    virtual int32_t GetGraphicsMemory(uint64_t& totalMemory,
+                                      uint64_t& availableMemory) = 0;
+
+};
+
+}  // namespace webrtc
+#endif  // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_I_VIDEO_RENDER_WIN_H_