webrtc/modules/rtp_rtcp/source/flexfec_sender_unittest.cc - Issue 2867713003: Remove hardcoded kValueSizeBytes values from variable-length header extensions.

Unified Diff: webrtc/modules/rtp_rtcp/source/flexfec_sender_unittest.cc

Issue 2867713003: Remove hardcoded kValueSizeBytes values from variable-length header extensions. (Closed)

Patch Set: Patch 4 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 side-by-side diff with in-line comments

« webrtc/modules/rtp_rtcp/include/flexfec_sender.h ('K') | « webrtc/modules/rtp_rtcp/source/flexfec_sender.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_header_extension.h » ('j') | webrtc/modules/rtp_rtcp/source/rtp_sender.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/rtp_rtcp/source/flexfec_sender_unittest.cc

diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/flexfec_sender_unittest.cc

index c906750fe3e20e4a80b85a469d6e10699b023110..a08f6744b0ab0917d5ad5e27911ea86f0a47ff42 100644

--- a/webrtc/modules/rtp_rtcp/source/flexfec_sender_unittest.cc

+++ b/webrtc/modules/rtp_rtcp/source/flexfec_sender_unittest.cc

@@ -30,6 +30,7 @@ constexpr int kFlexfecPayloadType = 123;

constexpr uint32_t kMediaSsrc = 1234;

constexpr uint32_t kFlexfecSsrc = 5678;

const std::vector<RtpExtension> kNoRtpHeaderExtensions;

+const std::vector<RtpExtensionSize> kNoRtpHeaderExtensionSizes;

// Assume a single protected media SSRC.

constexpr size_t kFlexfecMaxHeaderSize = 32;

constexpr size_t kPayloadLength = 50;

@@ -73,7 +74,8 @@ std::unique_ptr<RtpPacketToSend> GenerateSingleFlexfecPacket(

TEST(FlexfecSenderTest, Ssrc) {

SimulatedClock clock(kInitialSimulatedClockTime);

FlexfecSender sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,

- kNoRtpHeaderExtensions, &clock);

+ kNoRtpHeaderExtensions, kNoRtpHeaderExtensionSizes,

+ &clock);

EXPECT_EQ(kFlexfecSsrc, sender.ssrc());

}

@@ -81,7 +83,8 @@ TEST(FlexfecSenderTest, Ssrc) {

TEST(FlexfecSenderTest, NoFecAvailableBeforeMediaAdded) {

SimulatedClock clock(kInitialSimulatedClockTime);

FlexfecSender sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,

- kNoRtpHeaderExtensions, &clock);

+ kNoRtpHeaderExtensions, kNoRtpHeaderExtensionSizes,

+ &clock);

EXPECT_FALSE(sender.FecAvailable());

auto fec_packets = sender.GetFecPackets();

@@ -91,7 +94,8 @@ TEST(FlexfecSenderTest, NoFecAvailableBeforeMediaAdded) {

TEST(FlexfecSenderTest, ProtectOneFrameWithOneFecPacket) {

SimulatedClock clock(kInitialSimulatedClockTime);

FlexfecSender sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,

- kNoRtpHeaderExtensions, &clock);

+ kNoRtpHeaderExtensions, kNoRtpHeaderExtensionSizes,

+ &clock);

auto fec_packet = GenerateSingleFlexfecPacket(&sender);

EXPECT_EQ(kRtpHeaderSize, fec_packet->headers_size());

@@ -113,7 +117,8 @@ TEST(FlexfecSenderTest, ProtectTwoFramesWithOneFecPacket) {

constexpr size_t kNumPacketsPerFrame = 2;

SimulatedClock clock(kInitialSimulatedClockTime);

FlexfecSender sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,

- kNoRtpHeaderExtensions, &clock);

+ kNoRtpHeaderExtensions, kNoRtpHeaderExtensionSizes,

+ &clock);

sender.SetFecParameters(params);

AugmentedPacketGenerator packet_generator(kMediaSsrc);

@@ -152,7 +157,8 @@ TEST(FlexfecSenderTest, ProtectTwoFramesWithTwoFecPackets) {

constexpr size_t kNumPacketsPerFrame = 2;

SimulatedClock clock(kInitialSimulatedClockTime);

FlexfecSender sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,

- kNoRtpHeaderExtensions, &clock);

+ kNoRtpHeaderExtensions, kNoRtpHeaderExtensionSizes,

+ &clock);

sender.SetFecParameters(params);

AugmentedPacketGenerator packet_generator(kMediaSsrc);

@@ -187,7 +193,8 @@ TEST(FlexfecSenderTest, NoRtpHeaderExtensionsForBweByDefault) {

const std::vector<RtpExtension> kRtpHeaderExtensions{};

SimulatedClock clock(kInitialSimulatedClockTime);

FlexfecSender sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,

- kRtpHeaderExtensions, &clock);

+ kRtpHeaderExtensions, kNoRtpHeaderExtensionSizes,

+ &clock);

auto fec_packet = GenerateSingleFlexfecPacket(&sender);

EXPECT_FALSE(fec_packet->HasExtension<AbsoluteSendTime>());

@@ -200,7 +207,8 @@ TEST(FlexfecSenderTest, RegisterAbsoluteSendTimeRtpHeaderExtension) {

{RtpExtension::kAbsSendTimeUri, 1}};

SimulatedClock clock(kInitialSimulatedClockTime);

FlexfecSender sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,

- kRtpHeaderExtensions, &clock);

+ kRtpHeaderExtensions, kNoRtpHeaderExtensionSizes,

+ &clock);

auto fec_packet = GenerateSingleFlexfecPacket(&sender);

EXPECT_TRUE(fec_packet->HasExtension<AbsoluteSendTime>());

@@ -213,7 +221,8 @@ TEST(FlexfecSenderTest, RegisterTransmissionOffsetRtpHeaderExtension) {

{RtpExtension::kTimestampOffsetUri, 1}};

SimulatedClock clock(kInitialSimulatedClockTime);

FlexfecSender sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,

- kRtpHeaderExtensions, &clock);

+ kRtpHeaderExtensions, kNoRtpHeaderExtensionSizes,

+ &clock);

auto fec_packet = GenerateSingleFlexfecPacket(&sender);

EXPECT_FALSE(fec_packet->HasExtension<AbsoluteSendTime>());

@@ -226,7 +235,8 @@ TEST(FlexfecSenderTest, RegisterTransportSequenceNumberRtpHeaderExtension) {

{RtpExtension::kTransportSequenceNumberUri, 1}};

SimulatedClock clock(kInitialSimulatedClockTime);

FlexfecSender sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,

- kRtpHeaderExtensions, &clock);

+ kRtpHeaderExtensions, kNoRtpHeaderExtensionSizes,

+ &clock);

auto fec_packet = GenerateSingleFlexfecPacket(&sender);

EXPECT_FALSE(fec_packet->HasExtension<AbsoluteSendTime>());

@@ -241,7 +251,8 @@ TEST(FlexfecSenderTest, RegisterAllRtpHeaderExtensionsForBwe) {

{RtpExtension::kTransportSequenceNumberUri, 3}};

SimulatedClock clock(kInitialSimulatedClockTime);

FlexfecSender sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,

- kRtpHeaderExtensions, &clock);

+ kRtpHeaderExtensions, kNoRtpHeaderExtensionSizes,

+ &clock);

auto fec_packet = GenerateSingleFlexfecPacket(&sender);

EXPECT_TRUE(fec_packet->HasExtension<AbsoluteSendTime>());

@@ -252,7 +263,8 @@ TEST(FlexfecSenderTest, RegisterAllRtpHeaderExtensionsForBwe) {

TEST(FlexfecSenderTest, MaxPacketOverhead) {

SimulatedClock clock(kInitialSimulatedClockTime);

FlexfecSender sender(kFlexfecPayloadType, kFlexfecSsrc, kMediaSsrc,

- kNoRtpHeaderExtensions, &clock);

+ kNoRtpHeaderExtensions, kNoRtpHeaderExtensionSizes,

+ &clock);

EXPECT_EQ(kFlexfecMaxHeaderSize, sender.MaxPacketOverhead());

}