Adding a MediaStream parameter to createSender.

talk/app/webrtc/peerconnection.cc

Index: talk/app/webrtc/peerconnection.cc
diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc
index 85e03f99b8434691f40fbe4bea09163112d34e6d..0fcd0da7459f06a3700292724f61b7af316e71eb 100644
--- a/talk/app/webrtc/peerconnection.cc
+++ b/talk/app/webrtc/peerconnection.cc
@@ -813,7 +813,8 @@ rtc::scoped_refptr<DtmfSenderInterface> PeerConnection::CreateDtmfSender(
 }
 
 rtc::scoped_refptr<RtpSenderInterface> PeerConnection::CreateSender(
-    const std::string& kind) {
+    const std::string& kind,
+    MediaStreamInterface* stream) {
   TRACE_EVENT0("webrtc", "PeerConnection::CreateSender");
   RtpSenderInterface* new_sender;
   if (kind == MediaStreamTrackInterface::kAudioKind) {
@@ -824,6 +825,9 @@ rtc::scoped_refptr<RtpSenderInterface> PeerConnection::CreateSender(
     LOG(LS_ERROR) << "CreateSender called with invalid kind: " << kind;
     return rtc::scoped_refptr<RtpSenderInterface>();
   }
+  if (stream) {
+    new_sender->set_stream_id(stream->label());

[pthatcher1, 2015/12/17 22:04:11]

Since this is non-standard anyway, would it make sense to pass in a stream id
into CreateSender instead of a full MediaStream object?

[Taylor Brandstetter, 2015/12/18 01:49:06]

Good point. Then you wouldn't have to create a dummy MediaStream. Done.

+  }
   senders_.push_back(new_sender);
   return RtpSenderProxy::Create(signaling_thread(), new_sender);
 }