Chromium Code Reviews

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

Issue 2912713002: Persist RTP state for FlexFEC. (Closed)
Patch Set: sprang comments 1. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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 828 matching lines...)
839 839
840 TEST_P(RtpSenderTest, SendFlexfecPackets) { 840 TEST_P(RtpSenderTest, SendFlexfecPackets) {
841 constexpr int kMediaPayloadType = 127; 841 constexpr int kMediaPayloadType = 127;
842 constexpr int kFlexfecPayloadType = 118; 842 constexpr int kFlexfecPayloadType = 118;
843 constexpr uint32_t kMediaSsrc = 1234; 843 constexpr uint32_t kMediaSsrc = 1234;
844 constexpr uint32_t kFlexfecSsrc = 5678; 844 constexpr uint32_t kFlexfecSsrc = 5678;
845 const std::vector<RtpExtension> kNoRtpExtensions; 845 const std::vector<RtpExtension> kNoRtpExtensions;
846 const std::vector<RtpExtensionSize> kNoRtpExtensionSizes; 846 const std::vector<RtpExtensionSize> kNoRtpExtensionSizes;
847 FlexfecSender flexfec_sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc, 847 FlexfecSender flexfec_sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,
848 kNoRtpExtensions, kNoRtpExtensionSizes, 848 kNoRtpExtensions, kNoRtpExtensionSizes,
849 &fake_clock_); 849 nullptr /* rtp_state */, &fake_clock_);
850 850
851 // Reset |rtp_sender_| to use FlexFEC. 851 // Reset |rtp_sender_| to use FlexFEC.
852 rtp_sender_.reset(new RTPSender( 852 rtp_sender_.reset(new RTPSender(
853 false, &fake_clock_, &transport_, &mock_paced_sender_, &flexfec_sender, 853 false, &fake_clock_, &transport_, &mock_paced_sender_, &flexfec_sender,
854 &seq_num_allocator_, nullptr, nullptr, nullptr, nullptr, 854 &seq_num_allocator_, nullptr, nullptr, nullptr, nullptr,
855 &mock_rtc_event_log_, &send_packet_observer_, 855 &mock_rtc_event_log_, &send_packet_observer_,
856 &retransmission_rate_limiter_, nullptr)); 856 &retransmission_rate_limiter_, nullptr));
857 rtp_sender_->SetSSRC(kMediaSsrc); 857 rtp_sender_->SetSSRC(kMediaSsrc);
858 rtp_sender_->SetSequenceNumber(kSeqNum); 858 rtp_sender_->SetSequenceNumber(kSeqNum);
859 rtp_sender_->SetSendPayloadType(kMediaPayloadType); 859 rtp_sender_->SetSendPayloadType(kMediaPayloadType);
(...skipping 36 matching lines...)
896 896
897 TEST_P(RtpSenderTestWithoutPacer, SendFlexfecPackets) { 897 TEST_P(RtpSenderTestWithoutPacer, SendFlexfecPackets) {
898 constexpr int kMediaPayloadType = 127; 898 constexpr int kMediaPayloadType = 127;
899 constexpr int kFlexfecPayloadType = 118; 899 constexpr int kFlexfecPayloadType = 118;
900 constexpr uint32_t kMediaSsrc = 1234; 900 constexpr uint32_t kMediaSsrc = 1234;
901 constexpr uint32_t kFlexfecSsrc = 5678; 901 constexpr uint32_t kFlexfecSsrc = 5678;
902 const std::vector<RtpExtension> kNoRtpExtensions; 902 const std::vector<RtpExtension> kNoRtpExtensions;
903 const std::vector<RtpExtensionSize> kNoRtpExtensionSizes; 903 const std::vector<RtpExtensionSize> kNoRtpExtensionSizes;
904 FlexfecSender flexfec_sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc, 904 FlexfecSender flexfec_sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,
905 kNoRtpExtensions, kNoRtpExtensionSizes, 905 kNoRtpExtensions, kNoRtpExtensionSizes,
906 &fake_clock_); 906 nullptr /* rtp_state */, &fake_clock_);
907 907
908 // Reset |rtp_sender_| to use FlexFEC. 908 // Reset |rtp_sender_| to use FlexFEC.
909 rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport_, nullptr, 909 rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport_, nullptr,
910 &flexfec_sender, &seq_num_allocator_, nullptr, 910 &flexfec_sender, &seq_num_allocator_, nullptr,
911 nullptr, nullptr, nullptr, 911 nullptr, nullptr, nullptr,
912 &mock_rtc_event_log_, &send_packet_observer_, 912 &mock_rtc_event_log_, &send_packet_observer_,
913 &retransmission_rate_limiter_, nullptr)); 913 &retransmission_rate_limiter_, nullptr));
914 rtp_sender_->SetSSRC(kMediaSsrc); 914 rtp_sender_->SetSSRC(kMediaSsrc);
915 rtp_sender_->SetSequenceNumber(kSeqNum); 915 rtp_sender_->SetSequenceNumber(kSeqNum);
916 rtp_sender_->SetSendPayloadType(kMediaPayloadType); 916 rtp_sender_->SetSendPayloadType(kMediaPayloadType);
(...skipping 20 matching lines...)
937 937
938 TEST_P(RtpSenderTest, FecOverheadRate) { 938 TEST_P(RtpSenderTest, FecOverheadRate) {
939 constexpr int kMediaPayloadType = 127; 939 constexpr int kMediaPayloadType = 127;
940 constexpr int kFlexfecPayloadType = 118; 940 constexpr int kFlexfecPayloadType = 118;
941 constexpr uint32_t kMediaSsrc = 1234; 941 constexpr uint32_t kMediaSsrc = 1234;
942 constexpr uint32_t kFlexfecSsrc = 5678; 942 constexpr uint32_t kFlexfecSsrc = 5678;
943 const std::vector<RtpExtension> kNoRtpExtensions; 943 const std::vector<RtpExtension> kNoRtpExtensions;
944 const std::vector<RtpExtensionSize> kNoRtpExtensionSizes; 944 const std::vector<RtpExtensionSize> kNoRtpExtensionSizes;
945 FlexfecSender flexfec_sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc, 945 FlexfecSender flexfec_sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,
946 kNoRtpExtensions, kNoRtpExtensionSizes, 946 kNoRtpExtensions, kNoRtpExtensionSizes,
947 &fake_clock_); 947 nullptr /* rtp_state */, &fake_clock_);
948 948
949 // Reset |rtp_sender_| to use FlexFEC. 949 // Reset |rtp_sender_| to use FlexFEC.
950 rtp_sender_.reset(new RTPSender( 950 rtp_sender_.reset(new RTPSender(
951 false, &fake_clock_, &transport_, &mock_paced_sender_, &flexfec_sender, 951 false, &fake_clock_, &transport_, &mock_paced_sender_, &flexfec_sender,
952 &seq_num_allocator_, nullptr, nullptr, nullptr, nullptr, 952 &seq_num_allocator_, nullptr, nullptr, nullptr, nullptr,
953 &mock_rtc_event_log_, &send_packet_observer_, 953 &mock_rtc_event_log_, &send_packet_observer_,
954 &retransmission_rate_limiter_, nullptr)); 954 &retransmission_rate_limiter_, nullptr));
955 rtp_sender_->SetSSRC(kMediaSsrc); 955 rtp_sender_->SetSSRC(kMediaSsrc);
956 rtp_sender_->SetSequenceNumber(kSeqNum); 956 rtp_sender_->SetSequenceNumber(kSeqNum);
957 rtp_sender_->SetSendPayloadType(kMediaPayloadType); 957 rtp_sender_->SetSendPayloadType(kMediaPayloadType);
(...skipping 583 matching lines...)
1541 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, 1541 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead,
1542 RtpSenderTestWithoutPacer, 1542 RtpSenderTestWithoutPacer,
1543 ::testing::Bool()); 1543 ::testing::Bool());
1544 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, 1544 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead,
1545 RtpSenderVideoTest, 1545 RtpSenderVideoTest,
1546 ::testing::Bool()); 1546 ::testing::Bool());
1547 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, 1547 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead,
1548 RtpSenderAudioTest, 1548 RtpSenderAudioTest,
1549 ::testing::Bool()); 1549 ::testing::Bool());
1550 } // namespace webrtc 1550 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/flexfec_sender_unittest.cc ('k') | webrtc/test/fuzzers/flexfec_sender_fuzzer.cc » ('j') | no next file with comments »

Powered by Google App Engine