Adding "adapter" ORTC objects on top of ChannelManager/BaseChannel/etc.

webrtc/ortc/rtpsendershim.cc

Index: webrtc/ortc/rtpsendershim.cc
diff --git a/webrtc/ortc/rtpsendershim.cc b/webrtc/ortc/rtpsendershim.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b15baec2a55cc8f7a7bbb0e91d1737f927c7e8b7
--- /dev/null
+++ b/webrtc/ortc/rtpsendershim.cc
@@ -0,0 +1,193 @@
+/*
+ *  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/rtpsendershim.h"
+
+#include "webrtc/base/checks.h"
+
+namespace {
+
+static const int kVideoClockrate = 90000;
+
+void FillAudioSenderParameters(webrtc::RtpParameters* parameters) {
+  for (webrtc::RtpCodecParameters& codec : parameters->codecs) {
+    if (!codec.num_channels) {
+      codec.num_channels = rtc::Optional<int>(1);
+    }
+  }
+}
+
+void FillVideoSenderParameters(webrtc::RtpParameters* parameters) {
+  for (webrtc::RtpCodecParameters& codec : parameters->codecs) {
+    if (!codec.clock_rate) {
+      codec.clock_rate = rtc::Optional<int>(kVideoClockrate);
+    }
+  }

[pthatcher1, 2017/02/10 22:36:52]

Would it make sense to de-dup the code above?

[Taylor Brandstetter, 2017/02/14 06:55:05]

I don't see duplicated code above

+}
+
+}  // namespace
+
+namespace webrtc {
+
+BEGIN_OWNED_PROXY_MAP(OrtcRtpSender)
+PROXY_SIGNALING_THREAD_DESTRUCTOR()
+PROXY_METHOD1(RTCError, SetTrack, MediaStreamTrackInterface*)
+PROXY_CONSTMETHOD0(rtc::scoped_refptr<MediaStreamTrackInterface>, GetTrack)
+PROXY_METHOD1(RTCError, SetTransport, RtpTransportInterface*)
+PROXY_CONSTMETHOD0(RtpTransportInterface*, GetTransport)
+PROXY_METHOD1(RTCError, Send, const RtpParameters&)
+PROXY_CONSTMETHOD0(RtpParameters, GetParameters)
+PROXY_CONSTMETHOD0(cricket::MediaType, GetKind)
+END_PROXY_MAP()
+
+// static
+RTCErrorOr<std::unique_ptr<OrtcRtpSenderInterface>>
+RtpSenderShim::CreateProxied(cricket::MediaType kind,
+                             RtpTransportShim* transport) {
+  RTC_DCHECK(transport);
+  RtpTransportControllerShim* rtp_transport_controller =
+      transport->rtp_transport_controller();
+  // Call "attach" method to ensure more than one sender of the same type
+  // isn't attached to the same transport.
+  RTCError err;
+  switch (kind) {
+    case cricket::MEDIA_TYPE_AUDIO:
+      err = rtp_transport_controller->AttachAudioSender(transport);
+      break;
+    case cricket::MEDIA_TYPE_VIDEO:
+      err = rtp_transport_controller->AttachVideoSender(transport);
+      break;
+    case cricket::MEDIA_TYPE_DATA:
+      RTC_NOTREACHED();
+  }
+  if (!err.ok()) {
+    return err;
+  }
+
+  return OrtcRtpSenderProxy::Create(
+      rtp_transport_controller->signaling_thread(),
+      rtp_transport_controller->worker_thread(),
+      new RtpSenderShim(kind, transport, rtp_transport_controller));
+}
+
+RtpSenderShim::~RtpSenderShim() {
+  internal_sender_ = nullptr;
+  // Need to detach from transport (was attached in Create method).
+  switch (kind_) {
+    case cricket::MEDIA_TYPE_AUDIO:
+      rtp_transport_controller_->DetachAudioSender();
+      break;
+    case cricket::MEDIA_TYPE_VIDEO:
+      rtp_transport_controller_->DetachVideoSender();
+      break;
+    case cricket::MEDIA_TYPE_DATA:
+      RTC_NOTREACHED();
+  }
+}
+
+RTCError RtpSenderShim::SetTrack(MediaStreamTrackInterface* track) {
+  if (cricket::MediaTypeFromString(track->kind()) != kind_) {
+    return CreateAndLogError(
+        RTCErrorType::INVALID_PARAMETER,
+        "Track kind (audio/video) doesn't match the kind of this sender.");
+  }
+  if (!internal_sender_->SetTrack(track)) {
+    // Since we checked the track type above, this should never happen...
+    RTC_NOTREACHED();
+    return RTCError(RTCErrorType::INTERNAL_ERROR);
+  }
+  return RTCError();
+}
+
+rtc::scoped_refptr<MediaStreamTrackInterface> RtpSenderShim::GetTrack() const {
+  return internal_sender_->track();
+}
+
+RTCError RtpSenderShim::SetTransport(RtpTransportInterface* transport) {
+  LOG(LS_ERROR) << "Changing the transport of an RtpSender is not yet "
+                << "supported.";
+  return RTCError(RTCErrorType::UNSUPPORTED_PARAMETER);
+}
+
+RtpTransportInterface* RtpSenderShim::GetTransport() const {
+  return transport_;
+}
+
+RTCError RtpSenderShim::Send(const RtpParameters& parameters) {
+  RtpParameters filled_parameters = parameters;
+  RTCError err;
+  uint32_t ssrc = 0;
+  switch (kind_) {
+    case cricket::MEDIA_TYPE_AUDIO:
+      FillAudioSenderParameters(&filled_parameters);
+      err = rtp_transport_controller_->ValidateAndApplyAudioSenderParameters(
+          filled_parameters, &ssrc);
+      if (!err.ok()) {
+        return err;
+      }
+      break;
+    case cricket::MEDIA_TYPE_VIDEO:
+      FillVideoSenderParameters(&filled_parameters);
+      err = rtp_transport_controller_->ValidateAndApplyVideoSenderParameters(
+          filled_parameters, &ssrc);
+      if (!err.ok()) {
+        return err;
+      }
+      break;
+    case cricket::MEDIA_TYPE_DATA:
+      RTC_NOTREACHED();
+      return webrtc::RTCError(webrtc::RTCErrorType::INTERNAL_ERROR);
+  }
+  last_applied_parameters_ = filled_parameters;
+
+  // Now that parameters were applied, can call SetSsrc on the internal sender.
+  // This is analogous to a PeerConnection calling SetSsrc after
+  // SetLocalDescription is successful.
+  //
+  // If there were no encodings, this SSRC may be 0, which is valid.
+  internal_sender_->SetSsrc(ssrc);
+
+  return RTCError();
+}
+
+RtpParameters RtpSenderShim::GetParameters() const {
+  return last_applied_parameters_;
+}
+
+cricket::MediaType RtpSenderShim::GetKind() const {
+  return internal_sender_->media_type();
+}
+
+RtpSenderShim::RtpSenderShim(
+    cricket::MediaType kind,
+    RtpTransportShim* transport,
+    RtpTransportControllerShim* rtp_transport_controller)
+    : kind_(kind),
+      transport_(transport),
+      rtp_transport_controller_(rtp_transport_controller) {
+  CreateInternalSender();
+}
+
+void RtpSenderShim::CreateInternalSender() {
+  switch (kind_) {
+    case cricket::MEDIA_TYPE_AUDIO:
+      internal_sender_ = new AudioRtpSender(
+          rtp_transport_controller_->voice_channel(), nullptr);
+      break;
+    case cricket::MEDIA_TYPE_VIDEO:
+      internal_sender_ =
+          new VideoRtpSender(rtp_transport_controller_->video_channel());
+      break;
+    case cricket::MEDIA_TYPE_DATA:
+      RTC_NOTREACHED();

[pthatcher1, 2017/02/10 22:36:52]

I'm going to stop commenting on these.  Perhaps I don't understand
RTC_NOTREACHED.  I thought it was for code that could never (theoretically). 
But you're using it in code that *could* be reached, I think, if someone used
the API incorrectly, which is a different thing.  

I wish RTC_NOTREACHED had a comment that would make this clear one way or the
other.  But it doesn't.

[Taylor Brandstetter, 2017/02/14 06:55:05]

Yes.
No, I'm using it for code that can never be reached.

+  }
+}
+
+}  // namespace webrtc