Wire up RTP keep-alive in ortc api.

webrtc/ortc/rtptransportcontrolleradapter.h

Index: webrtc/ortc/rtptransportcontrolleradapter.h
diff --git a/webrtc/ortc/rtptransportcontrolleradapter.h b/webrtc/ortc/rtptransportcontrolleradapter.h
index 9728c3968aaf94fb232e6e205354fa96c906ac99..e63336ad17f927183c81ffbd95b7d391c210e3b0 100644
--- a/webrtc/ortc/rtptransportcontrolleradapter.h
+++ b/webrtc/ortc/rtptransportcontrolleradapter.h
@@ -62,6 +62,7 @@ class RtpTransportControllerAdapter : public RtpTransportControllerInterface,
   // |channel_manager| must not be null.
   static std::unique_ptr<RtpTransportControllerInterface> CreateProxied(
       const cricket::MediaConfig& config,
+      const RtpTransportParameters& parameters,
       cricket::ChannelManager* channel_manager,
       webrtc::RtcEventLog* event_log,
       rtc::Thread* signaling_thread,
@@ -77,12 +78,12 @@ class RtpTransportControllerAdapter : public RtpTransportControllerInterface,
   // these methods return proxies that will safely call methods on the correct
   // thread.
   RTCErrorOr<std::unique_ptr<RtpTransportInterface>> CreateProxiedRtpTransport(
-      const RtcpParameters& rtcp_parameters,
+      const RtpTransportParameters& rtcp_parameters,
       PacketTransportInterface* rtp,
       PacketTransportInterface* rtcp);
 
   RTCErrorOr<std::unique_ptr<SrtpTransportInterface>>
-  CreateProxiedSrtpTransport(const RtcpParameters& rtcp_parameters,
+  CreateProxiedSrtpTransport(const RtpTransportParameters& rtcp_parameters,
                              PacketTransportInterface* rtp,
                              PacketTransportInterface* rtcp);
 
@@ -100,8 +101,10 @@ class RtpTransportControllerAdapter : public RtpTransportControllerInterface,
   rtc::Thread* signaling_thread() const { return signaling_thread_; }
   rtc::Thread* worker_thread() const { return worker_thread_; }
 
-  RTCError SetRtcpParameters(const RtcpParameters& parameters,
-                             RtpTransportInterface* inner_transport);
+  // |parameters.keepalive| will be set for ALL RTP transports in the call.
+  RTCError SetRtpTransportAndParameters(

[Taylor Brandstetter, 2017/08/03 01:18:03]

Can remove "And" from this name.

[sprang_webrtc, 2017/08/03 13:08:14]

Done.

+      const RtpTransportParameters& parameters,
+      RtpTransportInterface* inner_transport);
 
   cricket::VoiceChannel* voice_channel() { return voice_channel_; }
   cricket::VideoChannel* video_channel() { return video_channel_; }
@@ -125,11 +128,12 @@ class RtpTransportControllerAdapter : public RtpTransportControllerInterface,
  private:
   // Only expected to be called by RtpTransportControllerAdapter::CreateProxied.
   RtpTransportControllerAdapter(const cricket::MediaConfig& config,
+                                const RtpTransportParameters& params,
                                 cricket::ChannelManager* channel_manager,
                                 webrtc::RtcEventLog* event_log,
                                 rtc::Thread* signaling_thread,
                                 rtc::Thread* worker_thread);
-  void Init_w();
+  void Init_w(const RtpTransportParameters& params);
   void Close_w();
 
   // These return an error if another of the same type of object is already
@@ -193,6 +197,7 @@ class RtpTransportControllerAdapter : public RtpTransportControllerInterface,
   RtpTransportInterface* inner_audio_transport_ = nullptr;
   RtpTransportInterface* inner_video_transport_ = nullptr;
   const cricket::MediaConfig media_config_;
+  RtpKeepAliveConfig keepalive_;
   cricket::ChannelManager* channel_manager_;
   webrtc::RtcEventLog* event_log_;
   std::unique_ptr<Call> call_;