Delete default_send_ssrc_.

webrtc/media/engine/webrtcvideoengine2.cc

Index: webrtc/media/engine/webrtcvideoengine2.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
index e34056d905257371b6f9c0db015f38a3bdcf3a85..7b82b9ce5361fa76d5b869365e9677f47d3c267b 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,15 +1039,10 @@ 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_;
-  }
+  // TODO(nisse): ssrc == 0 is technically valid, but currently not
+  // supported.
+  if (ssrc == 0)
+    return false;

[pthatcher1, 2016/03/22 21:30:28]

{}s please.

[pthatcher1, 2016/03/22 21:31:38]

We don't need this here, because what will be passed in here is only what was
passed into AddSendStream.  So we should just allow ssrc == 0 and let
AddSendStream control whether or not ssrc == 0 is supported.

[nisse-webrtc, 2016/03/23 07:42:23]

Ok, deleted this check and comment.

 
   WebRtcVideoSendStream* removed_stream;
   {
@@ -1084,10 +1075,6 @@ bool WebRtcVideoChannel2::RemoveSendStream(uint32_t ssrc) {
 
   delete removed_stream;
 
-  if (ssrc == default_send_ssrc_) {
-    default_send_ssrc_ = 0;
-  }
-
   return true;
 }