generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert 7750 "Don't reset sequence number for a stream on deactiv..."

Browse Source 
> 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
This commit is contained in:
sprang@webrtc.org 2014-11-26 19:33:15 +00:00
parent a56a2c57cf
commit a71bb6033b
2 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
talk/media/webrtc/webrtcvideoengine.cc
View File

@ -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;
}

31
talk/media/webrtc/webrtcvideoengine_unittest.cc
View File

@ -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);
}