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

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

Issue 2867713003: Remove hardcoded kValueSizeBytes values from variable-length header extensions. (Closed)
Patch Set: Patch 5 Created 3 years, 7 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 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 EXPECT_TRUE(generic_header & RtpFormatVideoGeneric::kFirstPacketBit); 836 EXPECT_TRUE(generic_header & RtpFormatVideoGeneric::kFirstPacketBit);
837 EXPECT_THAT(sent_payload.subview(1), ElementsAreArray(payload)); 837 EXPECT_THAT(sent_payload.subview(1), ElementsAreArray(payload));
838 } 838 }
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 FlexfecSender flexfec_sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc, 847 FlexfecSender flexfec_sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,
847 kNoRtpExtensions, &fake_clock_); 848 kNoRtpExtensions, kNoRtpExtensionSizes,
849 &fake_clock_);
848 850
849 // Reset |rtp_sender_| to use FlexFEC. 851 // Reset |rtp_sender_| to use FlexFEC.
850 rtp_sender_.reset(new RTPSender( 852 rtp_sender_.reset(new RTPSender(
851 false, &fake_clock_, &transport_, &mock_paced_sender_, &flexfec_sender, 853 false, &fake_clock_, &transport_, &mock_paced_sender_, &flexfec_sender,
852 &seq_num_allocator_, nullptr, nullptr, nullptr, nullptr, 854 &seq_num_allocator_, nullptr, nullptr, nullptr, nullptr,
853 &mock_rtc_event_log_, &send_packet_observer_, 855 &mock_rtc_event_log_, &send_packet_observer_,
854 &retransmission_rate_limiter_, nullptr)); 856 &retransmission_rate_limiter_, nullptr));
855 rtp_sender_->SetSSRC(kMediaSsrc); 857 rtp_sender_->SetSSRC(kMediaSsrc);
856 rtp_sender_->SetSequenceNumber(kSeqNum); 858 rtp_sender_->SetSequenceNumber(kSeqNum);
857 rtp_sender_->SetSendPayloadType(kMediaPayloadType); 859 rtp_sender_->SetSendPayloadType(kMediaPayloadType);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 EXPECT_EQ(flexfec_seq_num, flexfec_packet.SequenceNumber()); 893 EXPECT_EQ(flexfec_seq_num, flexfec_packet.SequenceNumber());
892 EXPECT_EQ(kFlexfecSsrc, flexfec_packet.Ssrc()); 894 EXPECT_EQ(kFlexfecSsrc, flexfec_packet.Ssrc());
893 } 895 }
894 896
895 TEST_P(RtpSenderTestWithoutPacer, SendFlexfecPackets) { 897 TEST_P(RtpSenderTestWithoutPacer, SendFlexfecPackets) {
896 constexpr int kMediaPayloadType = 127; 898 constexpr int kMediaPayloadType = 127;
897 constexpr int kFlexfecPayloadType = 118; 899 constexpr int kFlexfecPayloadType = 118;
898 constexpr uint32_t kMediaSsrc = 1234; 900 constexpr uint32_t kMediaSsrc = 1234;
899 constexpr uint32_t kFlexfecSsrc = 5678; 901 constexpr uint32_t kFlexfecSsrc = 5678;
900 const std::vector<RtpExtension> kNoRtpExtensions; 902 const std::vector<RtpExtension> kNoRtpExtensions;
903 const std::vector<RtpExtensionSize> kNoRtpExtensionSizes;
901 FlexfecSender flexfec_sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc, 904 FlexfecSender flexfec_sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,
902 kNoRtpExtensions, &fake_clock_); 905 kNoRtpExtensions, kNoRtpExtensionSizes,
906 &fake_clock_);
903 907
904 // Reset |rtp_sender_| to use FlexFEC. 908 // Reset |rtp_sender_| to use FlexFEC.
905 rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport_, nullptr, 909 rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport_, nullptr,
906 &flexfec_sender, &seq_num_allocator_, nullptr, 910 &flexfec_sender, &seq_num_allocator_, nullptr,
907 nullptr, nullptr, nullptr, 911 nullptr, nullptr, nullptr,
908 &mock_rtc_event_log_, &send_packet_observer_, 912 &mock_rtc_event_log_, &send_packet_observer_,
909 &retransmission_rate_limiter_, nullptr)); 913 &retransmission_rate_limiter_, nullptr));
910 rtp_sender_->SetSSRC(kMediaSsrc); 914 rtp_sender_->SetSSRC(kMediaSsrc);
911 rtp_sender_->SetSequenceNumber(kSeqNum); 915 rtp_sender_->SetSequenceNumber(kSeqNum);
912 rtp_sender_->SetSendPayloadType(kMediaPayloadType); 916 rtp_sender_->SetSendPayloadType(kMediaPayloadType);
(...skipping 17 matching lines...) Expand all
930 EXPECT_EQ(kFlexfecPayloadType, flexfec_packet.PayloadType()); 934 EXPECT_EQ(kFlexfecPayloadType, flexfec_packet.PayloadType());
931 EXPECT_EQ(kFlexfecSsrc, flexfec_packet.Ssrc()); 935 EXPECT_EQ(kFlexfecSsrc, flexfec_packet.Ssrc());
932 } 936 }
933 937
934 TEST_P(RtpSenderTest, FecOverheadRate) { 938 TEST_P(RtpSenderTest, FecOverheadRate) {
935 constexpr int kMediaPayloadType = 127; 939 constexpr int kMediaPayloadType = 127;
936 constexpr int kFlexfecPayloadType = 118; 940 constexpr int kFlexfecPayloadType = 118;
937 constexpr uint32_t kMediaSsrc = 1234; 941 constexpr uint32_t kMediaSsrc = 1234;
938 constexpr uint32_t kFlexfecSsrc = 5678; 942 constexpr uint32_t kFlexfecSsrc = 5678;
939 const std::vector<RtpExtension> kNoRtpExtensions; 943 const std::vector<RtpExtension> kNoRtpExtensions;
944 const std::vector<RtpExtensionSize> kNoRtpExtensionSizes;
940 FlexfecSender flexfec_sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc, 945 FlexfecSender flexfec_sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,
941 kNoRtpExtensions, &fake_clock_); 946 kNoRtpExtensions, kNoRtpExtensionSizes,
947 &fake_clock_);
942 948
943 // Reset |rtp_sender_| to use FlexFEC. 949 // Reset |rtp_sender_| to use FlexFEC.
944 rtp_sender_.reset(new RTPSender( 950 rtp_sender_.reset(new RTPSender(
945 false, &fake_clock_, &transport_, &mock_paced_sender_, &flexfec_sender, 951 false, &fake_clock_, &transport_, &mock_paced_sender_, &flexfec_sender,
946 &seq_num_allocator_, nullptr, nullptr, nullptr, nullptr, 952 &seq_num_allocator_, nullptr, nullptr, nullptr, nullptr,
947 &mock_rtc_event_log_, &send_packet_observer_, 953 &mock_rtc_event_log_, &send_packet_observer_,
948 &retransmission_rate_limiter_, nullptr)); 954 &retransmission_rate_limiter_, nullptr));
949 rtp_sender_->SetSSRC(kMediaSsrc); 955 rtp_sender_->SetSSRC(kMediaSsrc);
950 rtp_sender_->SetSequenceNumber(kSeqNum); 956 rtp_sender_->SetSequenceNumber(kSeqNum);
951 rtp_sender_->SetSendPayloadType(kMediaPayloadType); 957 rtp_sender_->SetSendPayloadType(kMediaPayloadType);
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
1535 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, 1541 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead,
1536 RtpSenderTestWithoutPacer, 1542 RtpSenderTestWithoutPacer,
1537 ::testing::Bool()); 1543 ::testing::Bool());
1538 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, 1544 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead,
1539 RtpSenderVideoTest, 1545 RtpSenderVideoTest,
1540 ::testing::Bool()); 1546 ::testing::Bool());
1541 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead, 1547 INSTANTIATE_TEST_CASE_P(WithAndWithoutOverhead,
1542 RtpSenderAudioTest, 1548 RtpSenderAudioTest,
1543 ::testing::Bool()); 1549 ::testing::Bool());
1544 } // namespace webrtc 1550 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698