Fix gpra crash caused by INTEL_GPRA macro (#129)

Author: taste1981

BUILD.gn

@@ -293,6 +293,10 @@ config("common_config") {
     defines += [ "WEBRTC_ENABLE_PROTOBUF=0" ]
   }
 
+  if (owt_use_gpra) {
+    defines += [ "INTEL_GPRA" ]
+  }
+
   if (rtc_include_internal_audio_device) {
     defines += [ "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE" ]
   }

modules/congestion_controller/goog_cc/goog_cc_network_control.cc

@@ -318,6 +318,7 @@ NetworkControlUpdate GoogCcNetworkController::OnRoundTripTimeUpdate(
   if (delay_based_bwe_)
     delay_based_bwe_->OnRttUpdate(msg.round_trip_time);
 #ifdef INTEL_GPRA
+  // If gpra is working, gcc_ will not be set.
   if (delay_based_bwe_gcc_)
     delay_based_bwe_gcc_->OnRttUpdate(msg.round_trip_time);
 #endif
@@ -390,6 +391,7 @@ NetworkControlUpdate GoogCcNetworkController::OnStreamsConfig(
       if (delay_based_bwe_)
         delay_based_bwe_->SetMinBitrate(min_data_rate_);
 #ifdef INTEL_GPRA
+      // if GPRA is built but not enabled, we will use gcc.
       if (delay_based_bwe_gcc_)
         delay_based_bwe_gcc_->SetMinBitrate(min_data_rate_);
 #endif

modules/congestion_controller/rtp/transport_feedback_adapter.cc

@@ -199,6 +199,9 @@ TransportFeedbackAdapter::ProcessTransportFeedbackInner(
   // time stamps.
   if (last_timestamp_.IsInfinite()) {
     current_offset_ = feedback_receive_time;
+ #ifdef INTEL_GPRA
+    current_offset_ms_ = feedback_receive_time.ms();
+ #endif
   } else {
     // TODO(srte): We shouldn't need to do rounding here.
     const TimeDelta delta = feedback.GetBaseDelta(last_timestamp_)
@@ -207,8 +210,14 @@ TransportFeedbackAdapter::ProcessTransportFeedbackInner(
     if (delta < Timestamp::Zero() - current_offset_) {
       RTC_LOG(LS_WARNING) << "Unexpected feedback timestamp received.";
       current_offset_ = feedback_receive_time;
+#ifdef INTEL_GPRA
+     current_offset_ms_ = feedback_receive_time.ms();
+#endif
     } else {
       current_offset_ += delta;
+#ifdef INTEL_GPRA
+      current_offset_ms_ += delta.ms();
+#endif
     }
   }
   last_timestamp_ = feedback.BaseTime();

modules/congestion_controller/rtp/transport_feedback_adapter.h

@@ -93,6 +93,9 @@ class TransportFeedbackAdapter {
   // Sequence numbers are never negative, using -1 as it always < a real
   // sequence number.
   int64_t last_ack_seq_num_ = -1;
+#ifdef INTEL_GPRA
+  int64_t current_offset_ms_ = -1;
+#endif
   InFlightBytesTracker in_flight_;
 
   Timestamp current_offset_ = Timestamp::MinusInfinity();