content::RTCRtpSenders/Receivers using track adapter references.

third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * 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
@@ skipping 1111 matching lines @@
     return;
   }
 
   size_t pos = local_streams_.Find(stream);
   if (pos == kNotFound)
     return;
 
   local_streams_.erase(pos);
 
   peer_handler_->RemoveStream(stream->Descriptor());
-
-  // The senders of removed tracks will have become inactive.
-  RemoveInactiveSenders();
 }
 
 MediaStreamVector RTCPeerConnection::getLocalStreams() const {
   return local_streams_;
 }
 
 MediaStreamVector RTCPeerConnection::getRemoteStreams() const {
   return remote_streams_;
 }
 
@@ skipping 146 matching lines @@
 MediaStreamTrack* RTCPeerConnection::GetRemoteTrackById(
     const String& track_id) const {
   for (const auto& remote_stream : remote_streams_) {
     MediaStreamTrack* track = remote_stream->getTrackById(track_id);
     if (track)
       return track;
   }
   return nullptr;
 }
 
-void RTCPeerConnection::RemoveInactiveSenders() {
-  std::set<uintptr_t> inactive_sender_ids;
-  for (uintptr_t id : rtp_senders_.Keys()) {
-    inactive_sender_ids.insert(id);
-  }
-  for (const auto& web_rtp_sender : peer_handler_->GetSenders()) {
-    inactive_sender_ids.erase(web_rtp_sender->Id());
-  }
-  for (uintptr_t id : inactive_sender_ids) {
-    rtp_senders_.erase(id);
-  }
-}
-
-void RTCPeerConnection::RemoveInactiveReceivers() {
-  std::set<uintptr_t> inactive_receiver_ids;
-  for (uintptr_t id : rtp_receivers_.Keys()) {
-    inactive_receiver_ids.insert(id);
-  }
-  for (const auto& web_rtp_receiver : peer_handler_->GetReceivers()) {
-    inactive_receiver_ids.erase(web_rtp_receiver->Id());
-  }
-  for (uintptr_t id : inactive_receiver_ids) {
-    rtp_receivers_.erase(id);
-  }
-}
-
 RTCDTMFSender* RTCPeerConnection::createDTMFSender(
     MediaStreamTrack* track,
     ExceptionState& exception_state) {
   if (ThrowExceptionIfSignalingStateClosed(signaling_state_, exception_state))
     return nullptr;
 
   DCHECK(track);
 
   if (!GetLocalTrackById(track->id())) {
     exception_state.ThrowDOMException(
@@ skipping 81 matching lines @@
   MediaStream* stream = static_cast<MediaStream*>(stream_descriptor->Client());
   stream->StreamEnded();
 
   if (signaling_state_ == kSignalingStateClosed)
     return;
 
   size_t pos = remote_streams_.Find(stream);
   DCHECK(pos != kNotFound);
   remote_streams_.erase(pos);
 
-  // The receivers of removed tracks will have become inactive.
-  RemoveInactiveReceivers();
-
   ScheduleDispatchEvent(
       MediaStreamEvent::Create(EventTypeNames::removestream, stream));
 }
 
 void RTCPeerConnection::DidAddRemoteDataChannel(
     WebRTCDataChannelHandler* handler) {
   DCHECK(!closed_);
   DCHECK(GetExecutionContext()->IsContextThread());
 
   if (signaling_state_ == kSignalingStateClosed)
@@ skipping 161 matching lines @@
   visitor->Trace(remote_streams_);
   visitor->Trace(rtp_senders_);
   visitor->Trace(rtp_receivers_);
   visitor->Trace(dispatch_scheduled_event_runner_);
   visitor->Trace(scheduled_events_);
   EventTargetWithInlineData::Trace(visitor);
   SuspendableObject::Trace(visitor);
 }
 
 }  // namespace blink