Wire up RTP keep-alive in ortc api.

webrtc/video/video_send_stream.cc

Index: webrtc/video/video_send_stream.cc
diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index 8d587f82b3bb7def94a0450e2d822c59ad19f0aa..4312a499b472176e100199c4c66c15ff6d4f7fab 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -347,8 +347,7 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
                       const VideoSendStream::Config* config,
                       int initial_encoder_max_bitrate,
                       std::map<uint32_t, RtpState> suspended_ssrcs,
-                      VideoEncoderConfig::ContentType content_type,
-                      const RtpKeepAliveConfig& keepalive_config);
+                      VideoEncoderConfig::ContentType content_type);
   ~VideoSendStreamImpl() override;
 
   // RegisterProcessThread register |module_process_thread| with those objects
@@ -479,8 +478,7 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
                    const VideoSendStream::Config* config,
                    int initial_encoder_max_bitrate,
                    const std::map<uint32_t, RtpState>& suspended_ssrcs,
-                   VideoEncoderConfig::ContentType content_type,
-                   const RtpKeepAliveConfig& keepalive_config)
+                   VideoEncoderConfig::ContentType content_type)
       : send_stream_(send_stream),
         done_event_(done_event),
         stats_proxy_(stats_proxy),
@@ -493,8 +491,7 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
         config_(config),
         initial_encoder_max_bitrate_(initial_encoder_max_bitrate),
         suspended_ssrcs_(suspended_ssrcs),
-        content_type_(content_type),
-        keepalive_config_(keepalive_config) {}
+        content_type_(content_type) {}
 
   ~ConstructionTask() override { done_event_->Set(); }
 
@@ -504,7 +501,7 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
         stats_proxy_, rtc::TaskQueue::Current(), call_stats_, transport_,
         bitrate_allocator_, send_delay_stats_, video_stream_encoder_,
         event_log_, config_, initial_encoder_max_bitrate_,
-        std::move(suspended_ssrcs_), content_type_, keepalive_config_));
+        std::move(suspended_ssrcs_), content_type_));
     return true;
   }
 
@@ -521,7 +518,6 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
   int initial_encoder_max_bitrate_;
   std::map<uint32_t, RtpState> suspended_ssrcs_;
   const VideoEncoderConfig::ContentType content_type_;
-  const RtpKeepAliveConfig& keepalive_config_;
 };
 
 class VideoSendStream::DestructAndGetRtpStateTask : public rtc::QueuedTask {
@@ -634,8 +630,7 @@ VideoSendStream::VideoSendStream(
     RtcEventLog* event_log,
     VideoSendStream::Config config,
     VideoEncoderConfig encoder_config,
-    const std::map<uint32_t, RtpState>& suspended_ssrcs,
-    const RtpKeepAliveConfig& keepalive_config)
+    const std::map<uint32_t, RtpState>& suspended_ssrcs)
     : worker_queue_(worker_queue),
       thread_sync_event_(false /* manual_reset */, false),
       stats_proxy_(Clock::GetRealTimeClock(),
@@ -654,7 +649,7 @@ VideoSendStream::VideoSendStream(
       video_stream_encoder_.get(), module_process_thread, call_stats, transport,
       bitrate_allocator, send_delay_stats, event_log, &config_,
       encoder_config.max_bitrate_bps, suspended_ssrcs,
-      encoder_config.content_type, keepalive_config)));
+      encoder_config.content_type)));
 
   // Wait for ConstructionTask to complete so that |send_stream_| can be used.
   // |module_process_thread| must be registered and deregistered on the thread
@@ -774,8 +769,7 @@ VideoSendStreamImpl::VideoSendStreamImpl(
     const VideoSendStream::Config* config,
     int initial_encoder_max_bitrate,
     std::map<uint32_t, RtpState> suspended_ssrcs,
-    VideoEncoderConfig::ContentType content_type,
-    const RtpKeepAliveConfig& keepalive_config)
+    VideoEncoderConfig::ContentType content_type)
     : send_side_bwe_with_overhead_(
           webrtc::field_trial::IsEnabled("WebRTC-SendSideBwe-WithOverhead")),
       stats_proxy_(stats_proxy),
@@ -813,7 +807,7 @@ VideoSendStreamImpl::VideoSendStreamImpl(
           transport->send_side_cc()->GetRetransmissionRateLimiter(),
           this,
           config_->rtp.ssrcs.size(),
-          keepalive_config)),
+          transport->keepalive_config())),
       payload_router_(rtp_rtcp_modules_,
                       config_->encoder_settings.payload_type),
       weak_ptr_factory_(this),