Renable gpra with new interface (#74)

Author: taste1981

modules/congestion_controller/goog_cc/BUILD.gn

@@ -8,6 +8,8 @@
 
 import("../../../webrtc.gni")
 
+defines = []
+
 config("bwe_test_logging") {
   if (rtc_enable_bwe_test_logging) {
     defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1" ]
@@ -23,6 +25,14 @@ rtc_library("goog_cc") {
     "goog_cc_network_control.h",
   ]
 
+  if (owt_use_gpra) {
+    # use Intel Goodput Rate Adapatation BWE
+      include_dirs = [ owt_gpra_header_root ]
+      libs = [ "gpra_lib.lib" ]
+      lib_dirs = [ owt_gpra_lib_root ]
+      defines += [ "INTEL_GPRA" ]
+  }
+
   deps = [
     ":alr_detector",
     ":delay_based_bwe",

modules/congestion_controller/goog_cc/goog_cc_network_control.cc

@@ -518,9 +518,15 @@ NetworkControlUpdate GoogCcNetworkController::OnTransportPacketsFeedback(
   }
   absl::optional<DataRate> probe_bitrate =
       probe_bitrate_estimator_->FetchAndResetLastEstimatedBitrate();
+#ifdef INTEL_GPRA
+
+  if (ignore_probes_lower_than_network_estimate_ && probe_bitrate &&
+      estimate_ && *probe_bitrate < estimate_->link_capacity_lower) {
+#else
   if (ignore_probes_lower_than_network_estimate_ && probe_bitrate &&
       estimate_ && *probe_bitrate < delay_based_bwe_->last_estimate() &&
       *probe_bitrate < estimate_->link_capacity_lower) {
+#endif
     probe_bitrate.reset();
   }
   if (limit_probes_lower_than_throughput_estimate_ && probe_bitrate &&

modules/congestion_controller/rtp/BUILD.gn

@@ -52,10 +52,6 @@ rtc_library("transport_feedback") {
     "transport_feedback_demuxer.h",
   ]
 
-  if (owt_use_gpra) {
-    defines += [ "INTEL_GPRA" ]
-  }
-
   deps = [
     "../..:module_api_public",
     "../../../api:sequence_checker",

modules/pacing/paced_sender.cc

@@ -224,9 +224,9 @@ void PacedSender::SetQueueTimeLimit(TimeDelta limit) {
 void PacedSender::SendRtpPacket(std::unique_ptr<RtpPacketToSend> packet,
                                 const PacedPacketInfo& cluster_info) {
   // Since we don't generate padding for realtime mode, no lock required.
-  //critsect_.Leave();
+  critsect_.Leave();
   packet_router_->SendPacket(std::move(packet), cluster_info);
-  //critsect_.Enter();
+  critsect_.Enter();
 }
 
 std::vector<std::unique_ptr<RtpPacketToSend>> PacedSender::GeneratePadding(

p2p/client/basic_port_allocator.cc

@@ -615,7 +615,8 @@ void BasicPortAllocatorSession::GetCandidatesFromPort(
 }
 
 bool BasicPortAllocator::MdnsObfuscationEnabled() const {
-  return network_manager()->GetMdnsResponder() != nullptr;
+  // Jianlin: disable Mdns support. TODO: negotiate at SDK level with UaInfo exchange.
+  return false;
 }
 
 bool BasicPortAllocatorSession::CandidatesAllocationDone() const {

pc/peer_connection.cc

@@ -1808,7 +1808,7 @@ void PeerConnection::Close() {
   }
   // Update stats here so that we have the most recent stats for tracks and
   // streams before the channels are closed.
-  legacy_stats_->UpdateStats(kStatsOutputLevelStandard);
+  stats_->UpdateStats(kStatsOutputLevelStandard);
 
   ice_connection_state_ = PeerConnectionInterface::kIceConnectionClosed;
   Observer()->OnIceConnectionChange(ice_connection_state_);