Wire up RTP keep-alive in ortc api.

webrtc/ortc/rtptransportadapter.cc

 /*
  *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/ortc/rtptransportadapter.h"
 
 #include <algorithm>  // For std::find.
 #include <set>
 #include <sstream>
 #include <utility>  // For std::move.
 
 #include "webrtc/api/proxy.h"
 #include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 
 BEGIN_OWNED_PROXY_MAP(RtpTransport)
 PROXY_SIGNALING_THREAD_DESTRUCTOR()
 PROXY_CONSTMETHOD0(PacketTransportInterface*, GetRtpPacketTransport)
 PROXY_CONSTMETHOD0(PacketTransportInterface*, GetRtcpPacketTransport)
-PROXY_METHOD1(RTCError, SetRtcpParameters, const RtcpParameters&)
-PROXY_CONSTMETHOD0(RtcpParameters, GetRtcpParameters)
+PROXY_METHOD1(RTCError, SetParameters, const RtpTransportParameters&)
+PROXY_CONSTMETHOD0(RtpTransportParameters, GetParameters)
 protected:
 RtpTransportAdapter* GetInternal() override {
   return internal();
 }
 END_PROXY_MAP()
 
 BEGIN_OWNED_PROXY_MAP(SrtpTransport)
 PROXY_SIGNALING_THREAD_DESTRUCTOR()
 PROXY_CONSTMETHOD0(PacketTransportInterface*, GetRtpPacketTransport)
 PROXY_CONSTMETHOD0(PacketTransportInterface*, GetRtcpPacketTransport)
-PROXY_METHOD1(RTCError, SetRtcpParameters, const RtcpParameters&)
-PROXY_CONSTMETHOD0(RtcpParameters, GetRtcpParameters)
+PROXY_METHOD1(RTCError, SetParameters, const RtpTransportParameters&)
+PROXY_CONSTMETHOD0(RtpTransportParameters, GetParameters)
 PROXY_METHOD1(RTCError, SetSrtpSendKey, const cricket::CryptoParams&)
 PROXY_METHOD1(RTCError, SetSrtpReceiveKey, const cricket::CryptoParams&)
 protected:
 RtpTransportAdapter* GetInternal() override {
   return internal();
 }
 END_PROXY_MAP()
 
 // static
 RTCErrorOr<std::unique_ptr<RtpTransportInterface>>
 RtpTransportAdapter::CreateProxied(
-    const RtcpParameters& rtcp_parameters,
+    const RtpTransportParameters& parameters,
     PacketTransportInterface* rtp,
     PacketTransportInterface* rtcp,
     RtpTransportControllerAdapter* rtp_transport_controller) {
   if (!rtp) {
     LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER,
                          "Must provide an RTP packet transport.");
   }
-  if (!rtcp_parameters.mux && !rtcp) {
+  if (!parameters.rtcp.mux && !rtcp) {
     LOG_AND_RETURN_ERROR(
         RTCErrorType::INVALID_PARAMETER,
         "Must provide an RTCP packet transport when RTCP muxing is not used.");
   }
-  if (rtcp_parameters.mux && rtcp) {
+  if (parameters.rtcp.mux && rtcp) {
     LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER,
                          "Creating an RtpTransport with RTCP muxing enabled, "
                          "with a separate RTCP packet transport?");
   }
   if (!rtp_transport_controller) {
     // Since OrtcFactory::CreateRtpTransport creates an RtpTransportController
     // automatically when one isn't passed in, this should never be reached.
     RTC_NOTREACHED();
     LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER,
                          "Must provide an RTP transport controller.");
   }
+  std::unique_ptr<RtpTransportAdapter> transport_adapter(
+      new RtpTransportAdapter(parameters.rtcp, rtp, rtcp,
+                              rtp_transport_controller,
+                              false /*is_srtp_transport*/));
+  RTCError params_result = transport_adapter->SetParameters(parameters);
+  if (!params_result.ok()) {
+    return RTCErrorOr<std::unique_ptr<RtpTransportInterface>>(
+        std::move(params_result));

[Taylor Brandstetter, 2017/08/07 19:59:36]

nit: I think you should be able to just return "std::move(params_result)".
RTCErrorOr can be constructed implicitly from an RTCError&&, for exactly these
kinds of situations.

[sprang_webrtc, 2017/08/08 08:15:13]

Right, thanks!

+  }
+
   return RtpTransportProxyWithInternal<RtpTransportAdapter>::Create(
       rtp_transport_controller->signaling_thread(),
-      rtp_transport_controller->worker_thread(),
-      std::unique_ptr<RtpTransportAdapter>(new RtpTransportAdapter(
-          rtcp_parameters, rtp, rtcp, rtp_transport_controller,
-          /*is_srtp_transport*/ false)));
+      rtp_transport_controller->worker_thread(), std::move(transport_adapter));
 }
 
 RTCErrorOr<std::unique_ptr<SrtpTransportInterface>>
 RtpTransportAdapter::CreateSrtpProxied(
-    const RtcpParameters& rtcp_parameters,
+    const RtpTransportParameters& parameters,
     PacketTransportInterface* rtp,
     PacketTransportInterface* rtcp,
     RtpTransportControllerAdapter* rtp_transport_controller) {
   if (!rtp) {
     LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER,
                          "Must provide an RTP packet transport.");
   }
-  if (!rtcp_parameters.mux && !rtcp) {
+  if (!parameters.rtcp.mux && !rtcp) {
     LOG_AND_RETURN_ERROR(
         RTCErrorType::INVALID_PARAMETER,
         "Must provide an RTCP packet transport when RTCP muxing is not used.");
   }
-  if (rtcp_parameters.mux && rtcp) {
+  if (parameters.rtcp.mux && rtcp) {
     LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER,
                          "Creating an RtpTransport with RTCP muxing enabled, "
                          "with a separate RTCP packet transport?");
   }
   if (!rtp_transport_controller) {
     // Since OrtcFactory::CreateRtpTransport creates an RtpTransportController
     // automatically when one isn't passed in, this should never be reached.
     RTC_NOTREACHED();
     LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER,
                          "Must provide an RTP transport controller.");
   }
+  std::unique_ptr<RtpTransportAdapter> transport_adapter(
+      new RtpTransportAdapter(parameters.rtcp, rtp, rtcp,
+                              rtp_transport_controller,
+                              true /*is_srtp_transport*/));
+  RTCError params_result = transport_adapter->SetParameters(parameters);
+  if (!params_result.ok()) {
+    return RTCErrorOr<std::unique_ptr<SrtpTransportInterface>>(
+        std::move(params_result));
+  }
+
   return SrtpTransportProxyWithInternal<RtpTransportAdapter>::Create(
       rtp_transport_controller->signaling_thread(),
-      rtp_transport_controller->worker_thread(),
-      std::unique_ptr<RtpTransportAdapter>(new RtpTransportAdapter(
-          rtcp_parameters, rtp, rtcp, rtp_transport_controller,
-          /*is_srtp_transport*/ true)));
+      rtp_transport_controller->worker_thread(), std::move(transport_adapter));
 }
 
 void RtpTransportAdapter::TakeOwnershipOfRtpTransportController(
     std::unique_ptr<RtpTransportControllerInterface> controller) {
   RTC_DCHECK_EQ(rtp_transport_controller_, controller->GetInternal());
   RTC_DCHECK(owned_rtp_transport_controller_.get() == nullptr);
   owned_rtp_transport_controller_ = std::move(controller);
 }
 
 RtpTransportAdapter::RtpTransportAdapter(
-    const RtcpParameters& rtcp_parameters,
+    const RtcpParameters& rtcp_params,
     PacketTransportInterface* rtp,
     PacketTransportInterface* rtcp,
     RtpTransportControllerAdapter* rtp_transport_controller,
     bool is_srtp_transport)
     : rtp_packet_transport_(rtp),
       rtcp_packet_transport_(rtcp),
       rtp_transport_controller_(rtp_transport_controller),
-      rtcp_parameters_(rtcp_parameters),
       is_srtp_transport_(is_srtp_transport) {
+  parameters_.rtcp = rtcp_params;
+  // CNAME should have been filled by OrtcFactory if empty.
+  RTC_DCHECK(!parameters_.rtcp.cname.empty());
   RTC_DCHECK(rtp_transport_controller);
-  // CNAME should have been filled by OrtcFactory if empty.
-  RTC_DCHECK(!rtcp_parameters_.cname.empty());
 }
 
 RtpTransportAdapter::~RtpTransportAdapter() {
   SignalDestroyed(this);
 }
 
 PacketTransportInterface* RtpTransportAdapter::GetRtpPacketTransport() const {
   return rtp_packet_transport_;
 }
 
 PacketTransportInterface* RtpTransportAdapter::GetRtcpPacketTransport() const {
   return rtcp_packet_transport_;
 }
 
-RTCError RtpTransportAdapter::SetRtcpParameters(
-    const RtcpParameters& parameters) {
-  if (!parameters.mux && rtcp_parameters_.mux) {
+RTCError RtpTransportAdapter::SetParameters(
+    const RtpTransportParameters& parameters) {
+  if (!parameters.rtcp.mux && parameters_.rtcp.mux) {
     LOG_AND_RETURN_ERROR(webrtc::RTCErrorType::INVALID_STATE,
                          "Can't disable RTCP muxing after enabling.");
   }
-  if (!parameters.cname.empty() && parameters.cname != rtcp_parameters_.cname) {
+  if (!parameters.rtcp.cname.empty() &&
+      parameters.rtcp.cname != parameters_.rtcp.cname) {
     LOG_AND_RETURN_ERROR(webrtc::RTCErrorType::UNSUPPORTED_OPERATION,
                          "Changing the RTCP CNAME is currently unsupported.");
   }
   // If the CNAME is empty, use the existing one.
-  RtcpParameters copy = parameters;
-  if (copy.cname.empty()) {
-    copy.cname = rtcp_parameters_.cname;
+  RtpTransportParameters copy = parameters;
+  if (copy.rtcp.cname.empty()) {
+    copy.rtcp.cname = parameters_.rtcp.cname;
   }
-  RTCError err = rtp_transport_controller_->SetRtcpParameters(copy, this);
+  RTCError err =
+      rtp_transport_controller_->SetRtpTransportParameters(copy, this);
   if (!err.ok()) {
     return err;
   }
-  rtcp_parameters_ = copy;
-  if (rtcp_parameters_.mux) {
+  parameters_ = copy;
+  if (parameters_.rtcp.mux) {
     rtcp_packet_transport_ = nullptr;
   }
   return RTCError::OK();
 }
 
 RTCError RtpTransportAdapter::SetSrtpSendKey(
     const cricket::CryptoParams& params) {
   if (send_key_) {
     LOG_AND_RETURN_ERROR(
         webrtc::RTCErrorType::UNSUPPORTED_OPERATION,
@@ skipping 18 matching lines @@
   if (send_key_ && send_key_->cipher_suite != params.cipher_suite) {
     LOG_AND_RETURN_ERROR(
         webrtc::RTCErrorType::UNSUPPORTED_OPERATION,
         "The send key and receive key must have the same cipher suite.");
   }
   receive_key_ = rtc::Optional<cricket::CryptoParams>(params);
   return RTCError::OK();
 }
 
 }  // namespace webrtc