Add port range setting to pcd factory

Author: taste1981

DEPS

@@ -50,7 +50,7 @@ vars = {
   # chromium waterfalls. More info at: crbug.com/570091.
   'checkout_configuration': 'default',
   'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
-  'deps_webrtc_git': 'https://github.com/taste1981',
+  'deps_webrtc_git': 'https://github.com/open-webrtc-toolkit',
   'chromium_revision': '56e883537df53a3b3cbc39c264799bedb695b5f9',
   'boringssl_git': 'https://boringssl.googlesource.com',
   # Three lines of non-changing comments so that

scripts/prepare_dev.py

@@ -44,7 +44,7 @@
     ('0013-Remove-unused-gni-for-av1-build.patch', THIRD_PARTY_PATH),
     ('0014-Fix-missing-ffmpeg-configure-item-for-msvc-build.patch', FFMPEG_PATH),
     ('0015-Remove-custom-d8-dependency.patch', BUILD_PATH),
-    ('0016-Remove-deprecated-create_srcjar-property.patch', THIRD_PARTY_PATH)
+    ('0016-Remove-deprecated-create_srcjar-property.patch', THIRD_PARTY_PATH),
     ('0017-Build-libvpx-with-RTC-rate-control-impl-included.patch', THIRD_PARTY_PATH) 
 ]
 

talk/owt/BUILD.gn

@@ -239,8 +239,6 @@ static_library("owt_sdk_base") {
       "sdk/base/win/videorendererd3d11.h",
       "sdk/base/win/vp9ratecontrol.cc",
       "sdk/base/win/vp9ratecontrol.h",
-      #"sdk/base/win/vp9temporallayers.cc",
-      #"sdk/base/win/vp9temporallayers.h",
       "sdk/base/windowcapturer.cc",
     ]
     public_deps += [ "//third_party/webrtc/modules/audio_device:audio_device_module_from_input_and_output" ]

talk/owt/sdk/base/peerconnectiondependencyfactory.cc

@@ -225,6 +225,24 @@ PeerConnectionDependencyFactory::CreatePeerConnectionOnCurrentThread(
   std::unique_ptr<cricket::PortAllocator> port_allocator;
   port_allocator.reset(new cricket::BasicPortAllocator(
       network_manager_.get(), packet_socket_factory_.get()));
+  // Handle port ranges.
+  int audio_min, audio_max, video_min, video_max, screen_min, screen_max,
+      data_min, data_max;
+  GlobalConfiguration::GetPortRanges(audio_min, audio_max, video_min, video_max,
+                                     screen_min, screen_max, data_min,
+                                     data_max);
+  if (audio_min > 0 && audio_max > audio_min) {
+    port_allocator->SetAudioPortRange(audio_min, audio_max);
+  }
+  if (video_min > 0 && video_max > video_min) {
+    port_allocator->SetVideoPortRange(video_min, video_max);
+  }
+  if (screen_min > 0 && screen_max > screen_min) {
+    port_allocator->SetScreenPortRange(screen_min, screen_max);
+  }
+  if (data_min > 0 && data_max > data_min) {
+    port_allocator->SetDataPortRange(data_min, data_max);
+  }
   return (pc_factory_->CreatePeerConnection(config, std::move(port_allocator),
                                             nullptr, observer))
       .get();