From fdd381c163bcfea5887c1bc98618a05bb55d4b80 Mon Sep 17 00:00:00 2001 From: danilchap Date: Mon, 25 Jul 2016 04:03:20 -0700 Subject: [PATCH] Remove unrelated checks from DecodesRetransmittedFrame* tests Test was expecting no rtx packet before dropped packet. Because of prober there might be some non-padding rtx packets before nack. Those checks removed, test primary expectations are unaffected. BUG=webrtc:5540 R=stefan@webrtc.org Review-Url: https://codereview.webrtc.org/2180843002 Cr-Commit-Position: refs/heads/master@{#13522} --- webrtc/video/end_to_end_tests.cc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc index 1f4ed77ffa..d7553500da 100644 --- a/webrtc/video/end_to_end_tests.cc +++ b/webrtc/video/end_to_end_tests.cc @@ -791,18 +791,10 @@ void EndToEndTest::DecodesRetransmittedFrame(bool enable_rtx, bool enable_red) { return SEND_PACKET; } - EXPECT_EQ(kVideoSendSsrcs[0], header.ssrc) - << "Unexpected packet length " << length - << ", header_length " << header.headerLength - << ", padding_length " << header.paddingLength - << ", timestamp " << header.timestamp - << ", expected timestamp " << retransmitted_timestamp_ - << ", payload type " << static_cast(header.payloadType); - EXPECT_EQ(payload_type_, header.payloadType); - // Found the final packet of the frame to inflict loss to, drop this and // expect a retransmission. - if (header.markerBit && ++marker_bits_observed_ == kDroppedFrameNumber) { + if (header.payloadType == payload_type_ && header.markerBit && + ++marker_bits_observed_ == kDroppedFrameNumber) { // This should be the only dropped packet. EXPECT_EQ(0u, retransmitted_timestamp_); retransmitted_timestamp_ = header.timestamp;