Add Data Channel support

.gclient

@@ -0,0 +1 @@
+'solutions=[{name:src,url:https://www.github.com/ispysoftware/webrtc@origin/nudi}]'

api/jsep.h

@@ -110,7 +110,7 @@ enum class SdpType {
 
   // Description must be treated as an SDP final answer, and the offer-
   // answer exchange must be considered complete after receiving this.
-  kAnswer = WEBRTC_SDP_TYPE_ANSER
+  kAnswer = WEBRTC_SDP_TYPE_ANSWER
 };
 
 // Returns the string form of the given SDP type. String forms are defined in

media/base/video_adapter.cc

@@ -220,22 +220,24 @@ bool VideoAdapter::AdaptFrameResolution(int in_width,
   const Fraction scale = FindScale((*cropped_width) * (*cropped_height),
                                    target_pixel_count, max_pixel_count);
 
-  // Make sure the resulting dimensions are aligned correctly to be nice to
-  // hardware encoders.
-  *out_width =
-      roundUp(*cropped_width * scale.numerator,
-              scale.denominator * required_resolution_alignment_,
-              in_width * scale.numerator) / scale.denominator;
-  *out_height =
-      roundUp(*cropped_height * scale.numerator,
-              scale.denominator * required_resolution_alignment_,
-              in_height * scale.numerator) / scale.denominator;
+  // Adjust cropping slightly to get even integer output size and a perfect
+  // scale factor. Make sure the resulting dimensions are aligned correctly
+  // to be nice to hardware encoders.
+  *cropped_width =
+      roundUp(*cropped_width,
+              scale.denominator * required_resolution_alignment_, in_width);
+  *cropped_height =
+      roundUp(*cropped_height,
+              scale.denominator * required_resolution_alignment_, in_height);
+  RTC_DCHECK_EQ(0, *cropped_width % scale.denominator);
+  RTC_DCHECK_EQ(0, *cropped_height % scale.denominator);
+
+  // Calculate final output size.
+  *out_width = *cropped_width / scale.denominator * scale.numerator;
+  *out_height = *cropped_height / scale.denominator * scale.numerator;
   RTC_DCHECK_EQ(0, *out_width % required_resolution_alignment_);
   RTC_DCHECK_EQ(0, *out_height % required_resolution_alignment_);
 
-  *cropped_width = (*out_width * scale.denominator + scale.numerator - 1) / scale.numerator;
-  *cropped_height = (*out_height * scale.denominator + scale.numerator - 1) / scale.numerator;
-
   ++frames_out_;
   if (scale.numerator != scale.denominator)
     ++frames_scaled_;

modules/desktop_capture/win/dxgi_output_duplicator.cc

@@ -273,7 +273,7 @@ bool DxgiOutputDuplicator::DoDetectUpdatedRegion(
     return false;
   }
 
-  if (metadata_.capacity() < frame_info.TotalMetadataBufferSize) {
+  if (metadata_.size() < frame_info.TotalMetadataBufferSize) {
     metadata_.clear();  // Avoid data copy
     metadata_.reserve(frame_info.TotalMetadataBufferSize);
   }
@@ -283,7 +283,7 @@ bool DxgiOutputDuplicator::DoDetectUpdatedRegion(
       reinterpret_cast<DXGI_OUTDUPL_MOVE_RECT*>(metadata_.data());
   size_t move_rects_count = 0;
   _com_error error = duplication_->GetFrameMoveRects(
-      static_cast<UINT>(metadata_.capacity()), move_rects, &buff_size);
+      static_cast<UINT>(metadata_.size()), move_rects, &buff_size);
   if (error.Error() != S_OK) {
     RTC_LOG(LS_ERROR) << "Failed to get move rectangles, error "
                       << error.ErrorMessage() << ", code " << error.Error();
@@ -294,7 +294,7 @@ bool DxgiOutputDuplicator::DoDetectUpdatedRegion(
   RECT* dirty_rects = reinterpret_cast<RECT*>(metadata_.data() + buff_size);
   size_t dirty_rects_count = 0;
   error = duplication_->GetFrameDirtyRects(
-      static_cast<UINT>(metadata_.capacity()) - buff_size, dirty_rects,
+      static_cast<UINT>(metadata_.size()) - buff_size, dirty_rects,
       &buff_size);
   if (error.Error() != S_OK) {
     RTC_LOG(LS_ERROR) << "Failed to get dirty rectangles, error "

p2p/BUILD.gn

@@ -239,7 +239,6 @@ if (rtc_include_tests) {
 }
 
 rtc_source_set("p2p_server_utils") {
-  testonly = true
   sources = [
     "base/relay_server.cc",
     "base/relay_server.h",

p2p/base/turn_server.cc

@@ -464,7 +464,7 @@ TurnServerAllocation* TurnServer::CreateAllocation(TurnServerConnection* conn,
   RTC_DCHECK(thread_checker_.IsCurrent());
   rtc::AsyncPacketSocket* external_socket =
       (external_socket_factory_)
-          ? external_socket_factory_->CreateUdpSocket(external_addr_, 0, 0)
+          ? external_socket_factory_->CreateUdpSocket(external_addr_, min_udp_port_, max_udp_port_)
           : NULL;
   if (!external_socket) {
     return NULL;

p2p/base/turn_server.h

@@ -191,6 +191,10 @@ class TurnServer : public sigslot::has_slots<> {
     RTC_DCHECK(thread_checker_.IsCurrent());
     realm_ = realm;
   }
+  void set_port_range(size_t min_udp_port, size_t max_udp_port){
+    min_udp_port_ = min_udp_port;
+    max_udp_port_ = max_udp_port;
+  }
 
   // Gets/sets the value for the SOFTWARE attribute for TURN messages.
   const std::string& software() const {
@@ -336,6 +340,8 @@ class TurnServer : public sigslot::has_slots<> {
   std::vector<std::unique_ptr<rtc::AsyncPacketSocket>> sockets_to_delete_;
   std::unique_ptr<rtc::PacketSocketFactory> external_socket_factory_;
   rtc::SocketAddress external_addr_;
+  size_t min_udp_port_ = 0;
+  size_t max_udp_port_ = 0;
 
   AllocationMap allocations_;
 

rtc_base/BUILD.gn

@@ -1007,7 +1007,6 @@ rtc_source_set("testclient") {
 }
 
 rtc_source_set("rtc_base_tests_utils") {
-  testonly = true
   sources = [
     "cpu_time.cc",
     "cpu_time.h",

rtc_base/virtual_socket_server.cc

@@ -1026,10 +1026,9 @@ void VirtualSocketServer::UpdateDelayDistribution() {
   }
 }
 
-static double PI = 4 * atan(1.0);
-
 static double Normal(double x, double mean, double stddev) {
   double a = (x - mean) * (x - mean) / (2 * stddev * stddev);
+  double PI = 4 * atan(1.0);
   return exp(-a) / (stddev * sqrt(2 * PI));
 }
 

sdk/BUILD.gn

@@ -796,9 +796,7 @@ if (is_ios || is_mac) {
         "..:no_global_constructors",
       ]
       sources = [
-        "objc/api/peerconnection/RTCAudioDeviceModule+Private.h",
         "objc/api/peerconnection/RTCAudioDeviceModule.h",
-        "objc/api/peerconnection/RTCAudioDeviceModule.mm",
         "objc/api/peerconnection/RTCAudioSource+Private.h",
         "objc/api/peerconnection/RTCAudioSource.h",
         "objc/api/peerconnection/RTCAudioSource.mm",
@@ -954,6 +952,10 @@ if (is_ios || is_mac) {
       ]
 
       if (is_ios) {
+        sources += [
+          "objc/api/peerconnection/RTCAudioDeviceModule+Private.h",
+          "objc/api/peerconnection/RTCAudioDeviceModule.mm",
+        ]
         deps += [ ":native_api_audio_device_module" ]
       }
     }

sdk/c/BUILD.gn

@@ -12,6 +12,7 @@ rtc_source_set("c") {
   deps = [
     "api:audio_codecs",
     "api:create_peerconnection_factory",
+    "api:create_turn_server",
     "api:libjingle_peerconnection_api",
     "api:video_codecs",
     "api/video:video_frame",

sdk/c/api/BUILD.gn

@@ -63,3 +63,17 @@ rtc_source_set("video_codecs") {
     "../../../api/video_codecs:builtin_video_encoder_factory",
   ]
 }
+
+rtc_source_set("create_turn_server") {
+  sources = [
+    "create_turn_server.cc",
+    "create_turn_server.h",
+  ]
+  deps = [
+    "../../../p2p:p2p_server_utils",
+    "../../../p2p:rtc_p2p",
+    "../../../pc:rtc_pc",
+    "../../../rtc_base",
+    "../../../rtc_base:rtc_base_approved",
+  ]
+}

sdk/c/api/create_turn_server.cc

@@ -0,0 +1,95 @@
+/*
+ *  Copyright 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.
+ */
+#include <iostream>
+#include <map>
+#include <string>
+#include <utility>
+
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/turn_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_server.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/string_encode.h"
+#include "create_turn_server.h"
+
+
+namespace {
+class TurnFileAuth : public cricket::TurnAuthInterface {
+ public:
+  explicit TurnFileAuth(std::map<std::string, std::string> name_to_key)
+      : name_to_key_(std::move(name_to_key)) {}
+
+  virtual bool GetKey(const std::string& username,
+                      const std::string& realm,
+                      std::string* key) {
+    auto it = name_to_key_.find(username);
+    std::cerr << "TURN: Welcome " << username << std::endl;
+    if (it == name_to_key_.end()) {
+      return false;
+    }
+    *key = it->second;
+    return true;
+  }
+
+ private:
+  const std::map<std::string, std::string> name_to_key_;
+};
+
+}  // namespace
+
+RTC_EXPORT extern "C" void webrtcCreateTURNServer(
+	RtcThread* network_thread,
+	const char* local_addr,
+	const char* ip_addr,
+	size_t min_port,
+	size_t max_port) {
+
+  rtc::Thread* thread = rtc::ToCplusplus(network_thread);
+  rtc::SocketAddress int_addr;
+  if (!int_addr.FromString(local_addr)) {
+    std::cerr << "Unable to parse socket address: " << local_addr << std::endl;
+    return;
+  }
+
+  rtc::IPAddress ext_addr;
+  if (!IPFromString(ip_addr, &ext_addr)) {
+    std::cerr << "Unable to parse IP address: " << ip_addr << std::endl;
+    return;
+  }
+
+  rtc::AsyncUDPSocket* int_socket =
+      rtc::AsyncUDPSocket::Create(thread->socketserver(), int_addr);
+  if (!int_socket) {
+    std::cerr << "Failed to create a UDP socket bound at " << int_addr.ToString()
+              << std::endl;
+    return;
+  }
+
+  cricket::TurnServer server(thread);
+  std::string pwd = "a8a16ccd399c0a716e1bca6be0016d6f";
+  char buf[32];
+  size_t len = rtc::hex_decode(buf, sizeof(buf), pwd.data(),pwd.size());
+  std::map<std::string, std::string> usrs = {
+	{"user",std::string(buf, len)}
+  };
+  TurnFileAuth auth(usrs);
+  server.set_realm("Agent");
+  server.set_software("Agent");
+  server.set_port_range(min_port,max_port);
+  server.set_auth_hook(&auth);
+  server.AddInternalSocket(int_socket, cricket::PROTO_UDP);
+  server.SetExternalSocketFactory(new rtc::BasicPacketSocketFactory(),
+                                  rtc::SocketAddress(ext_addr, 0));
+  thread->Run();
+}

sdk/c/api/create_turn_server.h

@@ -0,0 +1,25 @@
+/*
+ *  Copyright 2019 pixiv Inc. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a license that can be
+ *  found in the LICENSE.pixiv file in the root of the source tree.
+ */
+
+#include "sdk/c/interop.h"
+#include "sdk/c/rtc_base/thread.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+RTC_EXPORT void webrtcCreateTURNServer(
+    RtcThread* network_thread,
+    const char* local_addr,
+    const char* ip_addr,
+    size_t min_port,
+    size_t max_port);
+
+#ifdef __cplusplus
+}
+#endif
+