From a4f07887c7bfcc2db1826a1fe3e068fd8604d1cd Mon Sep 17 00:00:00 2001
From: nisse <nisse@webrtc.org>
Date: Thu, 24 Mar 2016 01:02:49 -0700
Subject: [PATCH] Delete default_send_ssrc_.

BUG=webrtc:5426

Review URL: https://codereview.webrtc.org/1814233002

Cr-Commit-Position: refs/heads/master@{#12112}
---
 webrtc/media/base/videoengine_unittest.h      | 35 -------------------
 webrtc/media/engine/webrtcvideoengine2.cc     | 18 ----------
 webrtc/media/engine/webrtcvideoengine2.h      |  3 --
 .../engine/webrtcvideoengine2_unittest.cc     |  4 ---
 4 files changed, 60 deletions(-)

diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h
index 10459db074..929c948d45 100644
--- a/webrtc/media/base/videoengine_unittest.h
+++ b/webrtc/media/base/videoengine_unittest.h
@@ -1145,41 +1145,6 @@ class VideoMediaChannelTest : public testing::Test,
     EXPECT_EQ(1, renderer2_.num_rendered_frames());
   }
 
-  // Set up 2 streams where the first stream uses the default channel.
-  // Then disconnect the first stream and verify default channel becomes
-  // available.
-  // Then add a new stream with |new_ssrc|. The new stream should re-use the
-  // default channel.
-  void TwoStreamsReUseFirstStream(const cricket::VideoCodec& codec) {
-    SetUpSecondStream();
-    // Default channel used by the first stream.
-    EXPECT_EQ(kSsrc, channel_->GetDefaultSendChannelSsrc());
-    EXPECT_TRUE(channel_->RemoveRecvStream(kSsrc));
-    EXPECT_FALSE(channel_->RemoveRecvStream(kSsrc));
-    EXPECT_TRUE(channel_->RemoveSendStream(kSsrc));
-    EXPECT_FALSE(channel_->RemoveSendStream(kSsrc));
-    // Default channel is no longer used by a stream.
-    EXPECT_EQ(0u, channel_->GetDefaultSendChannelSsrc());
-    uint32_t new_ssrc = kSsrc + 100;
-    EXPECT_TRUE(channel_->AddSendStream(
-        cricket::StreamParams::CreateLegacy(new_ssrc)));
-    // Re-use default channel.
-    EXPECT_EQ(new_ssrc, channel_->GetDefaultSendChannelSsrc());
-    EXPECT_FALSE(channel_->AddSendStream(
-        cricket::StreamParams::CreateLegacy(new_ssrc)));
-    EXPECT_TRUE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(new_ssrc)));
-    EXPECT_TRUE(channel_->SetSink(new_ssrc, &renderer_));
-    EXPECT_FALSE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(new_ssrc)));
-
-    EXPECT_TRUE(channel_->SetCapturer(new_ssrc, video_capturer_.get()));
-
-    SendAndReceive(codec);
-    EXPECT_TRUE(channel_->RemoveSendStream(new_ssrc));
-    EXPECT_EQ(0u, channel_->GetDefaultSendChannelSsrc());
-  }
-
   const std::unique_ptr<webrtc::Call> call_;
   VideoEngineOverride<E> engine_;
   std::unique_ptr<cricket::FakeVideoCapturer> video_capturer_;
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
index fbd5961dfd..9f74a86a84 100644
--- a/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/webrtc/media/engine/webrtcvideoengine2.cc
@@ -665,7 +665,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));
 }
@@ -1072,9 +1071,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->SetSend(true);
   }
@@ -1085,16 +1081,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_);
@@ -1126,10 +1112,6 @@ bool WebRtcVideoChannel2::RemoveSendStream(uint32_t ssrc) {
 
   delete removed_stream;
 
-  if (ssrc == default_send_ssrc_) {
-    default_send_ssrc_ = 0;
-  }
-
   return true;
 }
 
diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h
index ff86245929..9cbb640fca 100644
--- a/webrtc/media/engine/webrtcvideoengine2.h
+++ b/webrtc/media/engine/webrtcvideoengine2.h
@@ -171,7 +171,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
 
   // Implemented for VideoMediaChannelTest.
   bool sending() const { return sending_; }
-  uint32_t GetDefaultSendChannelSsrc() { return default_send_ssrc_; }
 
  private:
   class WebRtcVideoReceiveStream;
@@ -499,8 +498,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
   bool sending_;
   webrtc::Call* const call_;
 
-  uint32_t default_send_ssrc_;
-
   DefaultUnsignalledSsrcHandler default_unsignalled_ssrc_handler_;
   UnsignalledSsrcHandler* const unsignalled_ssrc_handler_;
 
diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
index 649f905400..e8800ba66f 100644
--- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc
+++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
@@ -868,10 +868,6 @@ TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsSendAndReceive) {
   Base::TwoStreamsSendAndReceive(kVp8Codec);
 }
 
-TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsReUseFirstStream) {
-  Base::TwoStreamsReUseFirstStream(kVp8Codec);
-}
-
 class WebRtcVideoChannel2Test : public WebRtcVideoEngine2Test {
  public:
   WebRtcVideoChannel2Test() : WebRtcVideoChannel2Test("") {}