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

diff --git a/webrtc/test/channel_transport/udp_socket_manager_posix.h b/webrtc/test/channel_transport/udp_socket_manager_posix.h
new file mode 100644
index 0000000000..64156fd20f
--- /dev/null
+++ b/webrtc/test/channel_transport/udp_socket_manager_posix.h
@@ -0,0 +1,91 @@
+/*
+ *  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_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_POSIX_H_
+#define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_POSIX_H_
+
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <list>
+#include <map>
+
+#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/include/thread_wrapper.h"
+#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h"
+#include "webrtc/test/channel_transport/udp_socket_wrapper.h"
+
+namespace webrtc {
+
+class ConditionVariableWrapper;
+
+namespace test {
+
+class UdpSocketPosix;
+class UdpSocketManagerPosixImpl;
+#define MAX_NUMBER_OF_SOCKET_MANAGERS_LINUX 8
+
+class UdpSocketManagerPosix : public UdpSocketManager
+{
+public:
+    UdpSocketManagerPosix();
+    virtual ~UdpSocketManagerPosix();
+
+    bool Init(int32_t id, uint8_t& numOfWorkThreads) override;
+
+    bool Start() override;
+    bool Stop() override;
+
+    bool AddSocket(UdpSocketWrapper* s) override;
+    bool RemoveSocket(UdpSocketWrapper* s) override;
+
+private:
+    int32_t _id;
+    CriticalSectionWrapper* _critSect;
+    uint8_t _numberOfSocketMgr;
+    uint8_t _incSocketMgrNextTime;
+    uint8_t _nextSocketMgrToAssign;
+    UdpSocketManagerPosixImpl* _socketMgr[MAX_NUMBER_OF_SOCKET_MANAGERS_LINUX];
+};
+
+class UdpSocketManagerPosixImpl
+{
+public:
+    UdpSocketManagerPosixImpl();
+    virtual ~UdpSocketManagerPosixImpl();
+
+    virtual bool Start();
+    virtual bool Stop();
+
+    virtual bool AddSocket(UdpSocketWrapper* s);
+    virtual bool RemoveSocket(UdpSocketWrapper* s);
+
+protected:
+    static bool Run(void* obj);
+    bool Process();
+    void UpdateSocketMap();
+
+private:
+    typedef std::list<UdpSocketWrapper*> SocketList;
+    typedef std::list<SOCKET> FdList;
+    rtc::scoped_ptr<ThreadWrapper> _thread;
+    CriticalSectionWrapper* _critSectList;
+
+    fd_set _readFds;
+
+    std::map<SOCKET, UdpSocketPosix*> _socketMap;
+    SocketList _addList;
+    FdList _removeList;
+};
+
+}  // namespace test
+}  // namespace webrtc
+
+#endif  // WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_POSIX_H_