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

Unified Diff: webrtc/media/base/videoengine_unittest.h

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 | « no previous file | webrtc/media/engine/webrtcvideoengine2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/videoengine_unittest.h
diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h
index f44e63ac1c2248ed97ab824c870a5774406fe473..b04060a4aff473fa086943a76f6c18674ce9ef17 100644
--- a/webrtc/media/base/videoengine_unittest.h
+++ b/webrtc/media/base/videoengine_unittest.h
@@ -1143,41 +1143,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_;
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698