commit ef65ef18111311e3b523e9affb39e7d0502f0d96
author Steve Anton <steveanton@webrtc.org> Thu Jan 11 01:15:20 2018
committer Commit Bot <commit-bot@chromium.org> Thu Jan 11 01:43:00 2018
tree f846333d1b1d0174cf8b71a095cbdb269e094ff0
parent 02ee47c1ae2a7beecae36a886994d82390eb3d57

Fire OnAddTrack when Unified Plan is enabled

When Unified Plan semantics are set, PeerConnection will fire OnAddTrack
according to the WebRTC spec. OnRemoveTrack will never be fired and will
be deprecated in the future.

Bug: webrtc:7600
Change-Id: Idfaada65b795b5fb9fe4844cff036d52ea90da17
Reviewed-on: https://webrtc-review.googlesource.com/38122
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21564}

pc/peerconnection.cc

diff --git a/pc/peerconnection.cc b/pc/peerconnection.cc
index d6b4414..0888acc 100644
--- a/pc/peerconnection.cc
+++ b/pc/peerconnection.cc
@@ -1980,6 +1980,7 @@
   }
 
   if (IsUnifiedPlan()) {
+    std::vector<TrackEvent> track_events;
     for (auto transceiver : transceivers_) {
       const ContentInfo* content =
           FindMediaSectionForTransceiver(transceiver, remote_description());
@@ -1997,15 +1998,27 @@
           (!transceiver->current_direction() ||
            !RtpTransceiverDirectionHasRecv(
                *transceiver->current_direction()))) {
-        // TODO(bugs.webrtc.org/7600): Process the addition of a remote track.
+        const std::string& sync_label = media_desc->streams()[0].sync_label;
+        rtc::scoped_refptr<MediaStreamInterface> stream =
+            remote_streams_->find(sync_label);
+        if (!stream) {
+          stream = MediaStreamProxy::Create(rtc::Thread::Current(),
+                                            MediaStream::Create(sync_label));
+          remote_streams_->AddStream(stream);
+        }
+        transceiver->internal()->receiver_internal()->SetStreams({stream});
+        TrackEvent track_event;
+        track_event.receiver = transceiver->receiver();
+        track_event.streams = transceiver->receiver()->streams();
+        track_events.push_back(std::move(track_event));
       }
       // If direction is sendonly or inactive, and transceiver's current
       // direction is neither sendonly nor inactive, process the removal of a
       // remote track for the media description.
       if (!RtpTransceiverDirectionHasRecv(local_direction) &&
-          (!transceiver->current_direction() ||
+          (transceiver->current_direction() &&
            RtpTransceiverDirectionHasRecv(*transceiver->current_direction()))) {
-        // TODO(bugs.webrtc.org/7600): Process the removal of a remote track.
+        transceiver->internal()->receiver_internal()->SetStreams({});
       }
       if (type == SdpType::kPrAnswer || type == SdpType::kAnswer) {
         transceiver->internal()->set_current_direction(local_direction);
@@ -2014,6 +2027,9 @@
         transceiver->Stop();
       }
     }
+    for (auto event : track_events) {
+      observer_->OnAddTrack(event.receiver, event.streams);
+    }
   }
 
   const cricket::ContentInfo* audio_content =
@@ -2760,8 +2776,6 @@
           new AudioRtpReceiver(worker_thread(), remote_sender_info.sender_id,
                                streams, remote_sender_info.first_ssrc,
                                voice_media_channel()));
-  stream->AddTrack(
-      static_cast<AudioTrackInterface*>(receiver->internal()->track().get()));
   GetAudioTransceiver()->internal()->AddReceiver(receiver);
   observer_->OnAddTrack(receiver, std::move(streams));
 }
@@ -2777,8 +2791,6 @@
           new VideoRtpReceiver(worker_thread(), remote_sender_info.sender_id,
                                streams, remote_sender_info.first_ssrc,
                                video_media_channel()));
-  stream->AddTrack(
-      static_cast<VideoTrackInterface*>(receiver->internal()->track().get()));
   GetVideoTransceiver()->internal()->AddReceiver(receiver);
   observer_->OnAddTrack(receiver, std::move(streams));
 }