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

Unified Diff: webrtc/video/end_to_end_tests.cc

Issue 2180843002: Remove unrelated checks from DecodesRetransmittedFrame* tests (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 5 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/end_to_end_tests.cc
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index 1f4ed77ffa35e3b945f1231e9dec74d30c88b8cf..d7553500da3aa3b9808f3fc50139af0766feec29 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<int>(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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698