media/cast/net/rtcp/rtcp_builder_unittest.cc - Issue 1709863002: Add Cast PLI support on sender side.

Unified Diff: media/cast/net/rtcp/rtcp_builder_unittest.cc

Issue 1709863002: Add Cast PLI support on sender side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased and addressed comments. Created 4 years, 10 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

Index: media/cast/net/rtcp/rtcp_builder_unittest.cc

diff --git a/media/cast/net/rtcp/rtcp_builder_unittest.cc b/media/cast/net/rtcp/rtcp_builder_unittest.cc

index 0ef98db156ca11ed7478641622b18919a55081f2..4999a7867e09c2cbc7a1a899c0ab8e6709d1d430 100644

--- a/media/cast/net/rtcp/rtcp_builder_unittest.cc

+++ b/media/cast/net/rtcp/rtcp_builder_unittest.cc

@@ -82,9 +82,9 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReport) {

RtcpReportBlock report_block = GetReportBlock();

- ExpectPacketEQ(p2.GetPacket(),

- rtcp_builder_->BuildRtcpFromReceiver(&report_block, NULL, NULL,

- NULL, kDefaultDelay));

+ ExpectPacketEQ(p2.GetPacket(), rtcp_builder_->BuildRtcpFromReceiver(

+ &report_block, nullptr, nullptr, nullptr,

+ nullptr, kDefaultDelay));

}

TEST_F(RtcpBuilderTest, RtcpReceiverReportWithRrtr) {

@@ -101,9 +101,9 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithRrtr) {

rrtr.ntp_seconds = kNtpHigh;

rrtr.ntp_fraction = kNtpLow;

- ExpectPacketEQ(p.GetPacket(),

- rtcp_builder_->BuildRtcpFromReceiver(

- &report_block, &rrtr, NULL, NULL, kDefaultDelay));

+ ExpectPacketEQ(p.GetPacket(), rtcp_builder_->BuildRtcpFromReceiver(

+ &report_block, &rrtr, nullptr, nullptr,

+ nullptr, kDefaultDelay));

}

TEST_F(RtcpBuilderTest, RtcpReceiverReportWithCast) {

@@ -126,9 +126,9 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithCast) {

cast_message.missing_frames_and_packets[kFrameIdWithLostPackets] =

missing_packets;

- ExpectPacketEQ(p.GetPacket(),

- rtcp_builder_->BuildRtcpFromReceiver(

- &report_block, NULL, &cast_message, NULL, kDefaultDelay));

+ ExpectPacketEQ(p.GetPacket(), rtcp_builder_->BuildRtcpFromReceiver(

+ &report_block, nullptr, &cast_message,

+ nullptr, nullptr, kDefaultDelay));

}

TEST_F(RtcpBuilderTest, RtcpReceiverReportWithRrtraAndCastMessage) {

@@ -156,9 +156,9 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithRrtraAndCastMessage) {

cast_message.missing_frames_and_packets[kFrameIdWithLostPackets] =

missing_packets;

- ExpectPacketEQ(p.GetPacket(),

- rtcp_builder_->BuildRtcpFromReceiver(

- &report_block, &rrtr, &cast_message, NULL, kDefaultDelay));

+ ExpectPacketEQ(p.GetPacket(), rtcp_builder_->BuildRtcpFromReceiver(

+ &report_block, &rrtr, &cast_message,

+ nullptr, nullptr, kDefaultDelay));

}

TEST_F(RtcpBuilderTest, RtcpReceiverReportWithRrtrCastMessageAndLog) {

@@ -194,7 +194,7 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithRrtrCastMessageAndLog) {

ExpectPacketEQ(p.GetPacket(), rtcp_builder_->BuildRtcpFromReceiver(

&report_block, &rrtr, &cast_message,

- &rtcp_events, kDefaultDelay));

+ nullptr, &rtcp_events, kDefaultDelay));

base::SimpleTestTickClock testing_clock;

testing_clock.Advance(base::TimeDelta::FromMilliseconds(kTimeBaseMs));

@@ -224,7 +224,7 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithRrtrCastMessageAndLog) {

ExpectPacketEQ(p.GetPacket(), rtcp_builder_->BuildRtcpFromReceiver(

&report_block, &rrtr, &cast_message,

- &rtcp_events, kDefaultDelay));

+ nullptr, &rtcp_events, kDefaultDelay));

}

TEST_F(RtcpBuilderTest, RtcpReceiverReportWithOversizedFrameLog) {

@@ -272,9 +272,9 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithOversizedFrameLog) {

ReceiverRtcpEventSubscriber::RtcpEvents rtcp_events;

event_subscriber.GetRtcpEventsWithRedundancy(&rtcp_events);

- ExpectPacketEQ(p.GetPacket(),

- rtcp_builder_->BuildRtcpFromReceiver(

- &report_block, NULL, NULL, &rtcp_events, kDefaultDelay));

+ ExpectPacketEQ(p.GetPacket(), rtcp_builder_->BuildRtcpFromReceiver(

+ &report_block, nullptr, nullptr, nullptr,

+ &rtcp_events, kDefaultDelay));

}

TEST_F(RtcpBuilderTest, RtcpReceiverReportWithTooManyLogFrames) {

@@ -317,9 +317,9 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithTooManyLogFrames) {

ReceiverRtcpEventSubscriber::RtcpEvents rtcp_events;

event_subscriber.GetRtcpEventsWithRedundancy(&rtcp_events);

- ExpectPacketEQ(p.GetPacket(),

- rtcp_builder_->BuildRtcpFromReceiver(

- &report_block, NULL, NULL, &rtcp_events, kDefaultDelay));

+ ExpectPacketEQ(p.GetPacket(), rtcp_builder_->BuildRtcpFromReceiver(

+ &report_block, nullptr, nullptr, nullptr,

+ &rtcp_events, kDefaultDelay));

}

TEST_F(RtcpBuilderTest, RtcpReceiverReportWithOldLogFrames) {

@@ -361,9 +361,9 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithOldLogFrames) {

ReceiverRtcpEventSubscriber::RtcpEvents rtcp_events;

event_subscriber.GetRtcpEventsWithRedundancy(&rtcp_events);

- ExpectPacketEQ(p.GetPacket(),

- rtcp_builder_->BuildRtcpFromReceiver(

- &report_block, NULL, NULL, &rtcp_events, kDefaultDelay));

+ ExpectPacketEQ(p.GetPacket(), rtcp_builder_->BuildRtcpFromReceiver(

+ &report_block, nullptr, nullptr, nullptr,

+ &rtcp_events, kDefaultDelay));

}

TEST_F(RtcpBuilderTest, RtcpReceiverReportRedundancy) {

@@ -405,9 +405,9 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportRedundancy) {

ReceiverRtcpEventSubscriber::RtcpEvents rtcp_events;

event_subscriber.GetRtcpEventsWithRedundancy(&rtcp_events);

- ExpectPacketEQ(p.GetPacket(),

- rtcp_builder_->BuildRtcpFromReceiver(

- &report_block, NULL, NULL, &rtcp_events, kDefaultDelay));

+ ExpectPacketEQ(p.GetPacket(), rtcp_builder_->BuildRtcpFromReceiver(

+ &report_block, nullptr, nullptr, nullptr,

+ &rtcp_events, kDefaultDelay));

testing_clock.Advance(

base::TimeDelta::FromMilliseconds(kTimeBetweenEventsMs));

« media/cast/net/rtcp/rtcp_builder.cc ('K') | « media/cast/net/rtcp/rtcp_builder.cc ('k') | media/cast/net/rtcp/rtcp_defines.h » ('j') | media/cast/net/rtcp/rtcp_defines.h » ('J')