aboutsummaryrefslogtreecommitdiff
path: root/talk/app/webrtc/webrtcsession.cc
diff options
context:
space:
mode:
authordeadbeef <deadbeef@webrtc.org>2015-11-20 09:49:59 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-20 17:50:02 +0000
commit6834fa10f142bf5e2275142acb834898911d09ae (patch)
tree0499c31f514f62a4680406c4d1b293f3156bf5cd /talk/app/webrtc/webrtcsession.cc
parent0a43fef6dc8ce95a3ec52921870e08799ee9a250 (diff)
downloadwebrtc-6834fa10f142bf5e2275142acb834898911d09ae.tar.gz
Reland of Adding the ability to create an RtpSender without a track. (patchset #1 id:1 of https://codereview.webrtc.org/1426443007/ )
Reason for revert: Relanding, after changing the expectations of WebRtcBrowserTest.CallAndModifyStream. Original issue's description: > Revert of Adding the ability to create an RtpSender without a track. (patchset #8 id:140001 of https://codereview.webrtc.org/1413713003/ ) > > Reason for revert: > Causing a compiler warning, and causing WebRtcBrowserTest.CallAndModifyStream to fail. > > Original issue's description: > > Adding the ability to create an RtpSender without a track. > > > > This CL also changes AddStream to immediately create a sender, rather > > than waiting until the track is seen in SDP. And the PeerConnection now > > builds the list of "send streams" from the list of senders, rather than > > the collection of local media streams. > > > > Committed: https://crrev.com/ac9d92ccbe2b29590c53f702e11dc625820480d5 > > Cr-Commit-Position: refs/heads/master@{#10414} > > TBR=pthatcher@webrtc.org,pthatcher@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Committed: https://crrev.com/8f46c63f6f764254892f4111b54aa1cc8f32eeeb > Cr-Commit-Position: refs/heads/master@{#10417} TBR=pthatcher@webrtc.org,pthatcher@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.webrtc.org/1413983004 Cr-Commit-Position: refs/heads/master@{#10730}
Diffstat (limited to 'talk/app/webrtc/webrtcsession.cc')
-rw-r--r--talk/app/webrtc/webrtcsession.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc
index 420477dbed..ecc7c605ea 100644
--- a/talk/app/webrtc/webrtcsession.cc
+++ b/talk/app/webrtc/webrtcsession.cc
@@ -1739,7 +1739,6 @@ void WebRtcSession::RemoveUnusedChannels(const SessionDescription* desc) {
cricket::GetFirstVideoContent(desc);
if ((!video_info || video_info->rejected) && video_channel_) {
SignalVideoChannelDestroyed();
- const std::string content_name = video_channel_->content_name();
channel_manager_->DestroyVideoChannel(video_channel_.release());
}
@@ -1747,7 +1746,6 @@ void WebRtcSession::RemoveUnusedChannels(const SessionDescription* desc) {
cricket::GetFirstAudioContent(desc);
if ((!voice_info || voice_info->rejected) && voice_channel_) {
SignalVoiceChannelDestroyed();
- const std::string content_name = voice_channel_->content_name();
channel_manager_->DestroyVoiceChannel(voice_channel_.release());
}
@@ -1755,7 +1753,6 @@ void WebRtcSession::RemoveUnusedChannels(const SessionDescription* desc) {
cricket::GetFirstDataContent(desc);
if ((!data_info || data_info->rejected) && data_channel_) {
SignalDataChannelDestroyed();
- const std::string content_name = data_channel_->content_name();
channel_manager_->DestroyDataChannel(data_channel_.release());
}
}