Exposing RtpSenders and RtpReceivers from PeerConnection.

talk/app/webrtc/peerconnection.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 15 matching lines @@
  */
 
 #include "talk/app/webrtc/peerconnection.h"
 
 #include <vector>
 
 #include "talk/app/webrtc/dtmfsender.h"
 #include "talk/app/webrtc/jsepicecandidate.h"
 #include "talk/app/webrtc/jsepsessiondescription.h"
 #include "talk/app/webrtc/mediaconstraintsinterface.h"
-#include "talk/app/webrtc/mediastreamhandler.h"
+#include "talk/app/webrtc/rtpreceiver.h"
+#include "talk/app/webrtc/rtpsender.h"
 #include "talk/app/webrtc/streamcollection.h"
 #include "webrtc/p2p/client/basicportallocator.h"
 #include "talk/session/media/channelmanager.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/system_wrappers/interface/field_trial.h"
 
 namespace {
 
 using webrtc::PeerConnectionInterface;
@@ skipping 285 matching lines @@
       observer_(NULL),
       uma_observer_(NULL),
       signaling_state_(kStable),
       ice_state_(kIceNew),
       ice_connection_state_(kIceConnectionNew),
       ice_gathering_state_(kIceGatheringNew) {
 }
 
 PeerConnection::~PeerConnection() {
   ASSERT(signaling_thread()->IsCurrent());
-  if (mediastream_signaling_)
+  if (mediastream_signaling_) {
     mediastream_signaling_->TearDown();
-  if (stream_handler_container_)
-    stream_handler_container_->TearDown();
+  }
+  // Need to detach RTP senders/receivers from WebRtcSession,
+  // since it's about to be destroyed.
+  for (const auto& sender : rtp_senders_) {
+    sender->Stop();
+  }
+  for (const auto& receiver : rtp_receivers_) {
+    receiver->Stop();
+  }
 }
 
 bool PeerConnection::Initialize(
     const PeerConnectionInterface::RTCConfiguration& configuration,
     const MediaConstraintsInterface* constraints,
     PortAllocatorFactoryInterface* allocator_factory,
     rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
     PeerConnectionObserver* observer) {
   ASSERT(observer != NULL);
   if (!observer)
@@ skipping 36 matching lines @@
   port_allocator_->set_step_delay(cricket::kMinimumStepDelay);
 
   mediastream_signaling_.reset(new MediaStreamSignaling(
       factory_->signaling_thread(), this, factory_->channel_manager()));
 
   session_.reset(new WebRtcSession(factory_->channel_manager(),
                                    factory_->signaling_thread(),
                                    factory_->worker_thread(),
                                    port_allocator_.get(),
                                    mediastream_signaling_.get()));
-  stream_handler_container_.reset(new MediaStreamHandlerContainer(
-      session_.get(), session_.get()));
   stats_.reset(new StatsCollector(session_.get()));
 
   // Initialize the WebRtcSession. It creates transport channels etc.
   if (!session_->Initialize(factory_->options(), constraints,
                             dtls_identity_store.Pass(), configuration))
     return false;
 
   // Register PeerConnection as receiver of local ice candidates.
   // All the callbacks will be posted to the application from PeerConnection.
   session_->RegisterIceObserver(this);
@@ skipping 385 matching lines @@
       break;
   }
 }
 
 void PeerConnection::OnAddRemoteStream(MediaStreamInterface* stream) {
   stats_->AddStream(stream);
   observer_->OnAddStream(stream);
 }
 
 void PeerConnection::OnRemoveRemoteStream(MediaStreamInterface* stream) {
-  stream_handler_container_->RemoveRemoteStream(stream);
   observer_->OnRemoveStream(stream);
 }
 
 void PeerConnection::OnAddDataChannel(DataChannelInterface* data_channel) {
   observer_->OnDataChannel(DataChannelProxy::Create(signaling_thread(),
                                                     data_channel));
 }
 
 void PeerConnection::OnAddRemoteAudioTrack(MediaStreamInterface* stream,
                                            AudioTrackInterface* audio_track,
-                                           uint32 ssrc) {
-  stream_handler_container_->AddRemoteAudioTrack(stream, audio_track, ssrc);
+                                           uint32 ssrc,
+                                           const std::string& mid) {
+  rtp_receivers_.push_back(rtc::scoped_refptr<RtpReceiverInterface>(
+      new rtc::RefCountedObject<AudioRtpReceiver>(audio_track, ssrc, mid,
+                                                  session_.get())));
 }
 
 void PeerConnection::OnAddRemoteVideoTrack(MediaStreamInterface* stream,
                                            VideoTrackInterface* video_track,
-                                           uint32 ssrc) {
-  stream_handler_container_->AddRemoteVideoTrack(stream, video_track, ssrc);
+                                           uint32 ssrc,
+                                           const std::string& mid) {
+  rtp_receivers_.push_back(rtc::scoped_refptr<RtpReceiverInterface>(
+      new rtc::RefCountedObject<VideoRtpReceiver>(video_track, ssrc, mid,
+                                                  session_.get())));
 }
 
 void PeerConnection::OnRemoveRemoteAudioTrack(
     MediaStreamInterface* stream,
     AudioTrackInterface* audio_track) {
-  stream_handler_container_->RemoveRemoteTrack(stream, audio_track);
+  auto it = FindRtpReceiverForTrack(audio_track);
+  if (it == rtp_receivers_.end()) {
+    LOG(LS_WARNING) << "RtpReceiver for track with id " << audio_track->id()
+                    << " doesn't exist.";
+  } else {
+    (*it)->Stop();
+    rtp_receivers_.erase(it);

[pthatcher1, 2015/09/17 04:25:46]

Long-term, I think we want to keep senders and receivers in here (perhaps as
Transceivers), because we'll want to use them track m-lines, and m-lines can't
go away

Just having a TODO might be sufficient for now.

[Taylor Brandstetter, 2015/09/23 00:10:45]

Can't an m-line go away if someone calls "stop" on the Transceiver? Or if it's
send-only and the local track is removed? Anyway, for now I'll add a TODO.

[pthatcher1, 2015/09/23 14:47:39]

No, an m-line can never go away.  

+  }
 }
 
 void PeerConnection::OnRemoveRemoteVideoTrack(
     MediaStreamInterface* stream,
     VideoTrackInterface* video_track) {
-  stream_handler_container_->RemoveRemoteTrack(stream, video_track);
+  auto it = FindRtpReceiverForTrack(video_track);
+  if (it == rtp_receivers_.end()) {
+    LOG(LS_WARNING) << "RtpReceiver for track with id " << video_track->id()
+                    << " doesn't exist.";
+  } else {
+    (*it)->Stop();
+    rtp_receivers_.erase(it);
+  }
 }
+
 void PeerConnection::OnAddLocalAudioTrack(MediaStreamInterface* stream,
                                           AudioTrackInterface* audio_track,
-                                          uint32 ssrc) {
-  stream_handler_container_->AddLocalAudioTrack(stream, audio_track, ssrc);
+                                          uint32 ssrc,
+                                          const std::string& mid) {
+  rtp_senders_.push_back(rtc::scoped_refptr<RtpSenderInterface>(
+      new rtc::RefCountedObject<AudioRtpSender>(audio_track, ssrc, mid,
+                                                session_.get())));
   stats_->AddLocalAudioTrack(audio_track, ssrc);
 }
+
 void PeerConnection::OnAddLocalVideoTrack(MediaStreamInterface* stream,
                                           VideoTrackInterface* video_track,
-                                          uint32 ssrc) {
-  stream_handler_container_->AddLocalVideoTrack(stream, video_track, ssrc);
+                                          uint32 ssrc,
+                                          const std::string& mid) {
+  rtp_senders_.push_back(rtc::scoped_refptr<RtpSenderInterface>(
+      new rtc::RefCountedObject<VideoRtpSender>(video_track, ssrc, mid,
+                                                session_.get())));
 }
 
 void PeerConnection::OnRemoveLocalAudioTrack(MediaStreamInterface* stream,
                                              AudioTrackInterface* audio_track,
                                              uint32 ssrc) {
-  stream_handler_container_->RemoveLocalTrack(stream, audio_track);
+  auto it = FindRtpSenderForTrack(audio_track);
+  if (it == rtp_senders_.end()) {
+    LOG(LS_WARNING) << "RtpSender for track with id " << audio_track->id()
+                    << " doesn't exist.";
+    return;
+  } else {
+    (*it)->Stop();
+    rtp_senders_.erase(it);
+  }
   stats_->RemoveLocalAudioTrack(audio_track, ssrc);
 }
 
 void PeerConnection::OnRemoveLocalVideoTrack(MediaStreamInterface* stream,
                                              VideoTrackInterface* video_track) {
-  stream_handler_container_->RemoveLocalTrack(stream, video_track);
+  auto it = FindRtpSenderForTrack(video_track);
+  if (it == rtp_senders_.end()) {
+    LOG(LS_WARNING) << "RtpSender for track with id " << video_track->id()
+                    << " doesn't exist.";
+    return;
+  } else {
+    (*it)->Stop();
+    rtp_senders_.erase(it);
+  }
 }
 
 void PeerConnection::OnRemoveLocalStream(MediaStreamInterface* stream) {
-  stream_handler_container_->RemoveLocalStream(stream);
 }
 
 void PeerConnection::OnIceConnectionChange(
     PeerConnectionInterface::IceConnectionState new_state) {
   ASSERT(signaling_thread()->IsCurrent());
   ice_connection_state_ = new_state;
   observer_->OnIceConnectionChange(ice_connection_state_);
 }
 
 void PeerConnection::OnIceGatheringChange(
@@ skipping 29 matching lines @@
     observer_->OnIceConnectionChange(ice_connection_state_);
     if (ice_gathering_state_ != kIceGatheringComplete) {
       ice_gathering_state_ = kIceGatheringComplete;
       observer_->OnIceGatheringChange(ice_gathering_state_);
     }
   }
   observer_->OnSignalingChange(signaling_state_);
   observer_->OnStateChange(PeerConnectionObserver::kSignalingState);
 }
 
+PeerConnectionInterface::RtpSenders::iterator
+PeerConnection::FindRtpSenderForTrack(MediaStreamTrackInterface* track) {
+  return std::find_if(
+      rtp_senders_.begin(), rtp_senders_.end(),
+      [track](const rtc::scoped_refptr<RtpSenderInterface>& sender)
+          -> bool { return sender->track() == track; });

[pthatcher1, 2015/09/17 04:25:46]

Is the "-> bool" necessary?  I thought it could infer that.

[Taylor Brandstetter, 2015/09/23 00:10:45]

Oh, I guess so. Removed.

+}
+PeerConnectionInterface::RtpReceivers::iterator
+PeerConnection::FindRtpReceiverForTrack(MediaStreamTrackInterface* track) {
+  return std::find_if(
+      rtp_receivers_.begin(), rtp_receivers_.end(),
+      [track](const rtc::scoped_refptr<RtpReceiverInterface>& receiver)
+          -> bool { return receiver->track() == track; });
+}
+
 }  // namespace webrtc