commit 13b8bad23543c59e57428a642aa31a24f0923d76
author Seth Hampson <shampson@webrtc.org> Tue Mar 13 23:05:28 2018
committer Commit Bot <commit-bot@chromium.org> Wed Mar 14 20:30:52 2018
tree 8be0eb2a4827aa107bcfac9a803a351c404fd33a
parent 097085140e8258a1e3a3ff73c1725e5163c04b93

Final name changing of MediaStreamInterface.label() to id().

Downstreams have been updated, and this now updates all uses of label()
to id() within WebRTC code. This change also makes id() pure virtual and
removes label().

Bug: webrtc:8977
Change-Id: Ib045ea4fabba6f14447c64875c7aeba87dc2be24
Reviewed-on: https://webrtc-review.googlesource.com/60382
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Commit-Queue: Seth Hampson <shampson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22431}

pc/peerconnection.cc

diff --git a/pc/peerconnection.cc b/pc/peerconnection.cc
index 7f1ddef..17977ad 100644
--- a/pc/peerconnection.cc
+++ b/pc/peerconnection.cc
@@ -142,8 +142,8 @@
   if (!new_stream || !current_streams) {
     return false;
   }
-  if (current_streams->find(new_stream->label()) != nullptr) {
-    RTC_LOG(LS_ERROR) << "MediaStream with label " << new_stream->label()
+  if (current_streams->find(new_stream->id()) != nullptr) {
+    RTC_LOG(LS_ERROR) << "MediaStream with ID " << new_stream->id()
                       << " is already added.";
     return false;
   }
@@ -1091,8 +1091,7 @@
       std::remove_if(
           stream_observers_.begin(), stream_observers_.end(),
           [local_stream](const std::unique_ptr<MediaStreamObserver>& observer) {
-            return observer->stream()->label().compare(local_stream->label()) ==
-                   0;
+            return observer->stream()->id().compare(local_stream->id()) == 0;
           }),
       stream_observers_.end());
 
@@ -1112,7 +1111,7 @@
       RTC_LOG(LS_ERROR) << "Stream list has null element.";
       return nullptr;
     }
-    stream_ids.push_back(stream->label());
+    stream_ids.push_back(stream->id());
   }
   auto sender_or_error = AddTrack(track, stream_ids);
   if (!sender_or_error.ok()) {
@@ -3233,13 +3232,13 @@
   if (sender) {
     // We already have a sender for this track, so just change the stream_id
     // so that it's correct in the next call to CreateOffer.
-    sender->internal()->set_stream_id(stream->label());
+    sender->internal()->set_stream_id(stream->id());
     return;
   }
 
   // Normal case; we've never seen this track before.
   auto new_sender =
-      CreateSender(cricket::MEDIA_TYPE_AUDIO, track, {stream->label()});
+      CreateSender(cricket::MEDIA_TYPE_AUDIO, track, {stream->id()});
   new_sender->internal()->SetVoiceMediaChannel(voice_media_channel());
   GetAudioTransceiver()->internal()->AddSender(new_sender);
   // If the sender has already been configured in SDP, we call SetSsrc,
@@ -3249,7 +3248,7 @@
   // session description is not changed and RemoveStream is called, and
   // later AddStream is called again with the same stream.
   const RtpSenderInfo* sender_info =
-      FindSenderInfo(local_audio_sender_infos_, stream->label(), track->id());
+      FindSenderInfo(local_audio_sender_infos_, stream->id(), track->id());
   if (sender_info) {
     new_sender->internal()->SetSsrc(sender_info->first_ssrc);
   }
@@ -3276,17 +3275,17 @@
   if (sender) {
     // We already have a sender for this track, so just change the stream_id
     // so that it's correct in the next call to CreateOffer.
-    sender->internal()->set_stream_id(stream->label());
+    sender->internal()->set_stream_id(stream->id());
     return;
   }
 
   // Normal case; we've never seen this track before.
   auto new_sender =
-      CreateSender(cricket::MEDIA_TYPE_VIDEO, track, {stream->label()});
+      CreateSender(cricket::MEDIA_TYPE_VIDEO, track, {stream->id()});
   new_sender->internal()->SetVideoMediaChannel(video_media_channel());
   GetVideoTransceiver()->internal()->AddSender(new_sender);
   const RtpSenderInfo* sender_info =
-      FindSenderInfo(local_video_sender_infos_, stream->label(), track->id());
+      FindSenderInfo(local_video_sender_infos_, stream->id(), track->id());
   if (sender_info) {
     new_sender->internal()->SetSsrc(sender_info->first_ssrc);
   }