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

diff --git a/talk/media/devices/fakedevicemanager.h b/talk/media/devices/fakedevicemanager.h
new file mode 100644
index 0000000000..a4b2b86e44
--- /dev/null
+++ b/talk/media/devices/fakedevicemanager.h
@@ -0,0 +1,239 @@
+/*
+ * libjingle
+ * Copyright 2008 Google Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ *  3. The name of the author may not be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef TALK_MEDIA_DEVICES_FAKEDEVICEMANAGER_H_
+#define TALK_MEDIA_DEVICES_FAKEDEVICEMANAGER_H_
+
+#include <string>
+#include <vector>
+
+#include "talk/media/base/fakevideocapturer.h"
+#include "talk/media/base/mediacommon.h"
+#include "talk/media/devices/devicemanager.h"
+#include "webrtc/base/scoped_ptr.h"
+#include "webrtc/base/window.h"
+#include "webrtc/base/windowpicker.h"
+
+namespace cricket {
+
+class FakeDeviceManager : public DeviceManagerInterface {
+ public:
+  FakeDeviceManager() {}
+  virtual bool Init() {
+    return true;
+  }
+  virtual void Terminate() {
+  }
+  virtual int GetCapabilities() {
+    std::vector<Device> devices;
+    int caps = VIDEO_RECV;
+    if (!input_devices_.empty()) {
+      caps |= AUDIO_SEND;
+    }
+    if (!output_devices_.empty()) {
+      caps |= AUDIO_RECV;
+    }
+    if (!vidcap_devices_.empty()) {
+      caps |= VIDEO_SEND;
+    }
+    return caps;
+  }
+  virtual bool GetAudioInputDevices(std::vector<Device>* devs) {
+    *devs = input_devices_;
+    return true;
+  }
+  virtual bool GetAudioOutputDevices(std::vector<Device>* devs) {
+    *devs = output_devices_;
+    return true;
+  }
+  virtual bool GetAudioInputDevice(const std::string& name, Device* out) {
+    return GetAudioDevice(true, name, out);
+  }
+  virtual bool GetAudioOutputDevice(const std::string& name, Device* out) {
+    return GetAudioDevice(false, name, out);
+  }
+  virtual bool GetVideoCaptureDevices(std::vector<Device>* devs) {
+    *devs = vidcap_devices_;
+    return true;
+  }
+  virtual void SetVideoDeviceCapturerFactory(
+      VideoDeviceCapturerFactory* video_device_capturer_factory) {
+  }
+  virtual void SetScreenCapturerFactory(
+      ScreenCapturerFactory* screen_capturer_factory) {
+    screen_capturer_factory_.reset(screen_capturer_factory);
+  }
+  virtual void SetVideoCaptureDeviceMaxFormat(const std::string& usb_id,
+                                              const VideoFormat& max_format) {
+    max_formats_[usb_id] = max_format;
+  }
+  bool IsMaxFormatForDevice(const std::string& usb_id,
+                            const VideoFormat& max_format) const {
+    std::map<std::string, VideoFormat>::const_iterator found =
+        max_formats_.find(usb_id);
+    return (found != max_formats_.end()) ?
+        max_format == found->second :
+        false;
+  }
+  virtual void ClearVideoCaptureDeviceMaxFormat(const std::string& usb_id) {
+    max_formats_.erase(usb_id);
+  }
+  virtual VideoCapturer* CreateVideoCapturer(const Device& device) const {
+    return new FakeVideoCapturer();
+  }
+  virtual VideoCapturer* CreateScreenCapturer(
+      const ScreencastId& screenid) const {
+    if (!screen_capturer_factory_) {
+      return new FakeVideoCapturer();
+    }
+    return screen_capturer_factory_->Create(screenid);
+  }
+  virtual bool GetWindows(
+      std::vector<rtc::WindowDescription>* descriptions) {
+    descriptions->clear();
+    const uint32_t id = 1u;  // Note that 0 is not a valid ID.
+    const rtc::WindowId window_id =
+        rtc::WindowId::Cast(id);
+    std::string title = "FakeWindow";
+    rtc::WindowDescription window_description(window_id, title);
+    descriptions->push_back(window_description);
+    return true;
+  }
+  virtual VideoCapturer* CreateWindowCapturer(rtc::WindowId window) {
+    if (!window.IsValid()) {
+      return NULL;
+    }
+    return new FakeVideoCapturer;
+  }
+  virtual bool GetDesktops(
+      std::vector<rtc::DesktopDescription>* descriptions) {
+    descriptions->clear();
+    const int id = 0;
+    const int valid_index = 0;
+    const rtc::DesktopId desktop_id =
+        rtc::DesktopId::Cast(id, valid_index);
+    std::string title = "FakeDesktop";
+    rtc::DesktopDescription desktop_description(desktop_id, title);
+    descriptions->push_back(desktop_description);
+    return true;
+  }
+  virtual VideoCapturer* CreateDesktopCapturer(rtc::DesktopId desktop) {
+    if (!desktop.IsValid()) {
+      return NULL;
+    }
+    return new FakeVideoCapturer;
+  }
+
+  virtual bool GetDefaultVideoCaptureDevice(Device* device) {
+    if (vidcap_devices_.empty()) {
+      return false;
+    }
+    *device = vidcap_devices_[0];
+    return true;
+  }
+
+#ifdef OSX
+  bool QtKitToSgDevice(const std::string& qtkit_name, Device* out) {
+    out->name = qtkit_name;
+    out->id = "sg:" + qtkit_name;
+    return true;
+  }
+#endif
+
+  void SetAudioInputDevices(const std::vector<std::string>& devices) {
+    input_devices_.clear();
+    for (size_t i = 0; i < devices.size(); ++i) {
+      input_devices_.push_back(Device(devices[i],
+                                      static_cast<int>(i)));
+    }
+    SignalDevicesChange();
+  }
+  void SetAudioOutputDevices(const std::vector<std::string>& devices) {
+    output_devices_.clear();
+    for (size_t i = 0; i < devices.size(); ++i) {
+      output_devices_.push_back(Device(devices[i],
+                                       static_cast<int>(i)));
+    }
+    SignalDevicesChange();
+  }
+  void SetVideoCaptureDevices(const std::vector<std::string>& devices) {
+    vidcap_devices_.clear();
+    for (size_t i = 0; i < devices.size(); ++i) {
+      vidcap_devices_.push_back(Device(devices[i],
+                                       static_cast<int>(i)));
+    }
+    SignalDevicesChange();
+  }
+  virtual bool GetVideoCaptureDevice(const std::string& name,
+                                     Device* out) {
+    if (vidcap_devices_.empty())
+      return false;
+
+    // If the name is empty, return the default device.
+    if (name.empty() || name == kDefaultDeviceName) {
+      *out = vidcap_devices_[0];
+      return true;
+    }
+
+    return FindDeviceByName(vidcap_devices_, name, out);
+  }
+  bool GetAudioDevice(bool is_input, const std::string& name,
+                      Device* out) {
+    // If the name is empty, return the default device.
+    if (name.empty() || name == kDefaultDeviceName) {
+      *out = Device(name, -1);
+      return true;
+    }
+
+    return FindDeviceByName((is_input ? input_devices_ : output_devices_),
+                            name, out);
+  }
+  static bool FindDeviceByName(const std::vector<Device>& devices,
+                               const std::string& name,
+                               Device* out) {
+    for (std::vector<Device>::const_iterator it = devices.begin();
+         it != devices.end(); ++it) {
+      if (name == it->name) {
+        *out = *it;
+        return true;
+      }
+    }
+    return false;
+  }
+
+ private:
+  std::vector<Device> input_devices_;
+  std::vector<Device> output_devices_;
+  std::vector<Device> vidcap_devices_;
+  std::map<std::string, VideoFormat> max_formats_;
+  rtc::scoped_ptr<
+    ScreenCapturerFactory> screen_capturer_factory_;
+};
+
+}  // namespace cricket
+
+#endif  // TALK_MEDIA_DEVICES_FAKEDEVICEMANAGER_H_