Adding a MediaStream parameter to createSender.

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 795 matching lines @@
   rtc::scoped_refptr<DtmfSenderInterface> sender(
       DtmfSender::Create(track, signaling_thread(), session_.get()));
   if (!sender.get()) {
     LOG(LS_ERROR) << "CreateDtmfSender failed on DtmfSender::Create.";
     return NULL;
   }
   return DtmfSenderProxy::Create(signaling_thread(), sender.get());
 }
 
 rtc::scoped_refptr<RtpSenderInterface> PeerConnection::CreateSender(
-    const std::string& kind) {
+    const std::string& kind,
+    const std::string& stream_id) {
   TRACE_EVENT0("webrtc", "PeerConnection::CreateSender");
   RtpSenderInterface* new_sender;
   if (kind == MediaStreamTrackInterface::kAudioKind) {
     new_sender = new AudioRtpSender(session_.get(), stats_.get());
   } else if (kind == MediaStreamTrackInterface::kVideoKind) {
     new_sender = new VideoRtpSender(session_.get());
   } else {
     LOG(LS_ERROR) << "CreateSender called with invalid kind: " << kind;
     return rtc::scoped_refptr<RtpSenderInterface>();
   }
+  if (!stream_id.empty()) {
+    new_sender->set_stream_id(stream_id);
+  }
   senders_.push_back(new_sender);
   return RtpSenderProxy::Create(signaling_thread(), new_sender);
 }
 
 std::vector<rtc::scoped_refptr<RtpSenderInterface>> PeerConnection::GetSenders()
     const {
   std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders;
   for (const auto& sender : senders_) {
     senders.push_back(RtpSenderProxy::Create(signaling_thread(), sender.get()));
   }
@@ skipping 1235 matching lines @@
 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const {
   for (const auto& channel : sctp_data_channels_) {
     if (channel->id() == sid) {
       return channel;
     }
   }
   return nullptr;
 }
 
 }  // namespace webrtc