Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Unified Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 1814233002: Delete default_send_ssrc_. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Delete ssrc==0 check in RemoveSendStream. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2.h ('k') | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/webrtcvideoengine2.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
index e34056d905257371b6f9c0db015f38a3bdcf3a85..2a6e540e73fd5d90d496ffba88dd9208aa256c5d 100644
--- a/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/webrtc/media/engine/webrtcvideoengine2.cc
@@ -619,7 +619,6 @@ WebRtcVideoChannel2::WebRtcVideoChannel2(
rtcp_receiver_report_ssrc_ = kDefaultRtcpReceiverReportSsrc;
sending_ = false;
- default_send_ssrc_ = 0;
RTC_DCHECK(ValidateCodecFormats(recv_codecs));
recv_codecs_ = FilterSupportedCodecs(MapCodecs(recv_codecs));
}
@@ -1030,9 +1029,6 @@ bool WebRtcVideoChannel2::AddSendStream(const StreamParams& sp) {
for (auto& kv : receive_streams_)
kv.second->SetLocalSsrc(ssrc);
}
- if (default_send_ssrc_ == 0) {
- default_send_ssrc_ = ssrc;
- }
if (sending_) {
stream->Start();
}
@@ -1043,16 +1039,6 @@ bool WebRtcVideoChannel2::AddSendStream(const StreamParams& sp) {
bool WebRtcVideoChannel2::RemoveSendStream(uint32_t ssrc) {
LOG(LS_INFO) << "RemoveSendStream: " << ssrc;
- if (ssrc == 0) {
- if (default_send_ssrc_ == 0) {
- LOG(LS_ERROR) << "No default send stream active.";
- return false;
- }
-
- LOG(LS_VERBOSE) << "Removing default stream: " << default_send_ssrc_;
- ssrc = default_send_ssrc_;
- }
-
WebRtcVideoSendStream* removed_stream;
{
rtc::CritScope stream_lock(&stream_crit_);
@@ -1084,10 +1070,6 @@ bool WebRtcVideoChannel2::RemoveSendStream(uint32_t ssrc) {
delete removed_stream;
- if (ssrc == default_send_ssrc_) {
- default_send_ssrc_ = 0;
- }
-
return true;
}
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2.h ('k') | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698