| Index: talk/app/webrtc/peerconnection.cc
|
| diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc
|
| index 85e03f99b8434691f40fbe4bea09163112d34e6d..617eb15518a18bb77730245db63b310ed591cb48 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,
|
| + const std::string& stream_id) {
|
| 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_id.empty()) {
|
| + new_sender->set_stream_id(stream_id);
|
| + }
|
| senders_.push_back(new_sender);
|
| return RtpSenderProxy::Create(signaling_thread(), new_sender);
|
| }
|
|
|