From a71bb6033b54276fe9d199508b080d47d441645b Mon Sep 17 00:00:00 2001 From: "sprang@webrtc.org" Date: Wed, 26 Nov 2014 19:33:15 +0000 Subject: [PATCH] Revert 7750 "Don't reset sequence number for a stream on deactiv..." > Don't reset sequence number for a stream on deactivate/reactivate. > > BUG=chromium:431908 > R=pbos@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/32199004 TBR=sprang@webrtc.org Review URL: https://webrtc-codereview.appspot.com/29099004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7752 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine.cc | 3 +- .../webrtc/webrtcvideoengine_unittest.cc | 31 +------------------ 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index 2c6e561734..3bcec4de48 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -3927,8 +3927,7 @@ bool WebRtcVideoMediaChannel::SetSendParams( } engine()->vie()->rtp()->SetTransmissionSmoothingStatus(channel_id, true); - if (send_channel->IsActive() && - !SetSendSsrcs(channel_id, send_params.stream, codec)) { + if (!SetSendSsrcs(channel_id, send_params.stream, codec)) { return false; } diff --git a/talk/media/webrtc/webrtcvideoengine_unittest.cc b/talk/media/webrtc/webrtcvideoengine_unittest.cc index e481114777..00d6e4b1ed 100644 --- a/talk/media/webrtc/webrtcvideoengine_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine_unittest.cc @@ -41,6 +41,7 @@ #include "talk/media/webrtc/webrtcvoiceengine.h" #include "talk/session/media/mediasession.h" #include "webrtc/system_wrappers/interface/trace.h" + // Tests for the WebRtcVideoEngine/VideoChannel code. using cricket::kRtpTimestampOffsetHeaderExtension; @@ -2552,33 +2553,3 @@ TEST_F(WebRtcVideoMediaChannelTest, 640, 400, 30, 0)); } - -// Test that sequence number are not reset if stopping and then -// resuming a stream. -TEST_F(WebRtcVideoMediaChannelTest, DontResetSequenceNumbers) { - cricket::VideoCodec codec = DefaultCodec(); - EXPECT_TRUE(SetOneCodec(codec)); - - uint16_t seq_before = - engine_.vie() - ->rtp() - ->GetRtpStateForSsrc(channel_->GetDefaultChannelId(), kSsrc) - .sequence_number; - - // Deactive. - EXPECT_TRUE(channel_->RemoveSendStream(kSsrc)); - EXPECT_TRUE(SetOneCodec(codec)); - - // Reactivate. - EXPECT_TRUE(channel_->AddSendStream(DefaultSendStreamParams())); - EXPECT_TRUE(SetOneCodec(codec)); - - // Sequence number should now have changed. - uint16_t seq_after = - engine_.vie() - ->rtp() - ->GetRtpStateForSsrc(channel_->GetDefaultChannelId(), kSsrc) - .sequence_number; - - EXPECT_EQ(seq_before, seq_after); -}