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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc

Issue 2947133002: Fix timing frames and FEC conflict (Closed)
Patch Set: Modify VideoSendStream test for video timing extension Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 fake_clock_.TimeInMilliseconds(), false, 456 fake_clock_.TimeInMilliseconds(), false,
457 PacedPacketInfo()); 457 PacedPacketInfo());
458 458
459 const auto& packet = transport_.last_sent_packet(); 459 const auto& packet = transport_.last_sent_packet();
460 uint16_t transport_seq_no; 460 uint16_t transport_seq_no;
461 EXPECT_TRUE(packet.GetExtension<TransportSequenceNumber>(&transport_seq_no)); 461 EXPECT_TRUE(packet.GetExtension<TransportSequenceNumber>(&transport_seq_no));
462 EXPECT_EQ(kTransportSequenceNumber, transport_seq_no); 462 EXPECT_EQ(kTransportSequenceNumber, transport_seq_no);
463 EXPECT_EQ(transport_.last_packet_id_, transport_seq_no); 463 EXPECT_EQ(transport_.last_packet_id_, transport_seq_no);
464 } 464 }
465 465
466 // Disabled due to webrtc:7859. Until issues with FEC resolved, pacer exit 466 TEST_P(RtpSenderTestWithoutPacer, WritesTimestampToTimingExtension) {
467 // timstamp is not updated in the pacer.
468 TEST_P(RtpSenderTestWithoutPacer, DISABLED_WritesTimestampToTimingExtension) {
469 rtp_sender_->SetStorePacketsStatus(true, 10); 467 rtp_sender_->SetStorePacketsStatus(true, 10);
470 EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension( 468 EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(
471 kRtpExtensionVideoTiming, kVideoTimingExtensionId)); 469 kRtpExtensionVideoTiming, kVideoTimingExtensionId));
472 int64_t capture_time_ms = fake_clock_.TimeInMilliseconds(); 470 int64_t capture_time_ms = fake_clock_.TimeInMilliseconds();
473 auto packet = rtp_sender_->AllocatePacket(); 471 auto packet = rtp_sender_->AllocatePacket();
474 packet->SetPayloadType(kPayload); 472 packet->SetPayloadType(kPayload);
475 packet->SetMarker(true); 473 packet->SetMarker(true);
476 packet->SetTimestamp(kTimestamp); 474 packet->SetTimestamp(kTimestamp);
477 packet->set_capture_time_ms(capture_time_ms); 475 packet->set_capture_time_ms(capture_time_ms);
478 const VideoTiming kVideoTiming = {0u, 0u, 0u, 0u, 0u, 0u, true}; 476 const VideoTiming kVideoTiming = {0u, 0u, 0u, 0u, 0u, 0u, true};
(...skipping 1139 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, 1616 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead,
1619 RtpSenderTestWithoutPacer, 1617 RtpSenderTestWithoutPacer,
1620 ::testing::Bool()); 1618 ::testing::Bool());
1621 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, 1619 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead,
1622 RtpSenderVideoTest, 1620 RtpSenderVideoTest,
1623 ::testing::Bool()); 1621 ::testing::Bool());
1624 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, 1622 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead,
1625 RtpSenderAudioTest, 1623 RtpSenderAudioTest,
1626 ::testing::Bool()); 1624 ::testing::Bool());
1627 } // namespace webrtc 1625 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698