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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cast/framer/cast_message_builder_unittest.cc

Issue 250363002: [Cast] Clean-up RtpCastHeader and RtpParser, removing the last WebRTC dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « media/cast/cast_testing.gypi ('k') | media/cast/framer/frame_buffer.cc » ('j') | media/cast/rtp_receiver/rtp_parser/rtp_parser.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/framer/cast_message_builder_unittest.cc
diff --git a/media/cast/framer/cast_message_builder_unittest.cc b/media/cast/framer/cast_message_builder_unittest.cc
index 4c3e67bd5bf11c0610ce08247b7c1519e00e7d1c..c84a28f88864c410f37e1259b6952facf0adf836 100644
--- a/media/cast/framer/cast_message_builder_unittest.cc
+++ b/media/cast/framer/cast_message_builder_unittest.cc
@@ -88,7 +88,7 @@ class CastMessageBuilderTest : public ::testing::Test {
kSsrc,
true,
0)) {
- rtp_header_.webrtc.header.ssrc = kSsrc;
+ rtp_header_.sender_ssrc = kSsrc;
rtp_header_.is_key_frame = false;
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kStartMillisecond));
@@ -96,7 +96,10 @@ class CastMessageBuilderTest : public ::testing::Test {
virtual ~CastMessageBuilderTest() {}
- void SetFrameId(uint32 frame_id) { rtp_header_.frame_id = frame_id; }
+ void SetFrameIds(uint32 frame_id, uint32 reference_frame_id) {
+ rtp_header_.frame_id = frame_id;
+ rtp_header_.reference_frame_id = reference_frame_id;
+ }
void SetPacketId(uint16 packet_id) { rtp_header_.packet_id = packet_id; }
@@ -106,11 +109,6 @@ class CastMessageBuilderTest : public ::testing::Test {
void SetKeyFrame(bool is_key) { rtp_header_.is_key_frame = is_key; }
- void SetReferenceFrameId(uint32 reference_frame_id) {
- rtp_header_.is_reference = true;
- rtp_header_.reference_frame_id = reference_frame_id;
- }
-
void InsertPacket() {
PacketType packet_type = frame_id_map_.InsertPacket(rtp_header_);
if (packet_type == kNewPacketCompletingFrame) {
@@ -139,13 +137,13 @@ class CastMessageBuilderTest : public ::testing::Test {
};
TEST_F(CastMessageBuilderTest, StartWithAKeyFrame) {
- SetFrameId(3);
+ SetFrameIds(3, 2);
SetPacketId(0);
SetMaxPacketId(0);
InsertPacket();
// Should not trigger ack.
EXPECT_FALSE(feedback_.triggered());
- SetFrameId(5);
+ SetFrameIds(5, 5);
SetPacketId(0);
SetMaxPacketId(0);
SetKeyFrame(true);
@@ -159,7 +157,7 @@ TEST_F(CastMessageBuilderTest, StartWithAKeyFrame) {
}
TEST_F(CastMessageBuilderTest, OneFrameNackList) {
- SetFrameId(0);
+ SetFrameIds(0, 0);
SetPacketId(4);
SetMaxPacketId(10);
InsertPacket();
@@ -175,13 +173,13 @@ TEST_F(CastMessageBuilderTest, OneFrameNackList) {
}
TEST_F(CastMessageBuilderTest, CompleteFrameMissing) {
- SetFrameId(0);
+ SetFrameIds(0, 0);
SetPacketId(2);
SetMaxPacketId(5);
InsertPacket();
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
- SetFrameId(2);
+ SetFrameIds(2, 1);
SetPacketId(2);
SetMaxPacketId(5);
InsertPacket();
@@ -190,14 +188,14 @@ TEST_F(CastMessageBuilderTest, CompleteFrameMissing) {
}
TEST_F(CastMessageBuilderTest, FastForwardAck) {
- SetFrameId(1);
+ SetFrameIds(1, 0);
SetPacketId(0);
SetMaxPacketId(0);
InsertPacket();
EXPECT_FALSE(feedback_.triggered());
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
- SetFrameId(2);
+ SetFrameIds(2, 1);
SetPacketId(0);
SetMaxPacketId(0);
InsertPacket();
@@ -205,7 +203,7 @@ TEST_F(CastMessageBuilderTest, FastForwardAck) {
EXPECT_EQ(kStartFrameId, feedback_.last_frame_acked());
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
- SetFrameId(0);
+ SetFrameIds(0, 0);
SetPacketId(0);
SetMaxPacketId(0);
SetKeyFrame(true);
@@ -215,21 +213,21 @@ TEST_F(CastMessageBuilderTest, FastForwardAck) {
}
TEST_F(CastMessageBuilderTest, RemoveOldFrames) {
- SetFrameId(1);
+ SetFrameIds(1, 0);
SetPacketId(0);
SetMaxPacketId(1);
InsertPacket();
EXPECT_FALSE(feedback_.triggered());
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
- SetFrameId(2);
+ SetFrameIds(2, 1);
SetPacketId(0);
SetMaxPacketId(0);
InsertPacket();
EXPECT_TRUE(feedback_.triggered());
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
- SetFrameId(3);
+ SetFrameIds(3, 2);
SetPacketId(0);
SetMaxPacketId(5);
InsertPacket();
@@ -237,7 +235,7 @@ TEST_F(CastMessageBuilderTest, RemoveOldFrames) {
EXPECT_EQ(kStartFrameId, feedback_.last_frame_acked());
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
- SetFrameId(5);
+ SetFrameIds(5, 5);
SetPacketId(0);
SetMaxPacketId(0);
SetKeyFrame(true);
@@ -250,7 +248,7 @@ TEST_F(CastMessageBuilderTest, RemoveOldFrames) {
EXPECT_EQ(5u, feedback_.last_frame_acked());
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kShortTimeIncrementMs));
- SetFrameId(1);
+ SetFrameIds(1, 0);
SetPacketId(1);
SetMaxPacketId(1);
InsertPacket();
@@ -263,7 +261,7 @@ TEST_F(CastMessageBuilderTest, RemoveOldFrames) {
}
TEST_F(CastMessageBuilderTest, WrapFastForward) {
- SetFrameId(254);
+ SetFrameIds(254, 254);
SetPacketId(0);
SetMaxPacketId(1);
SetKeyFrame(true);
@@ -271,7 +269,7 @@ TEST_F(CastMessageBuilderTest, WrapFastForward) {
EXPECT_FALSE(feedback_.triggered());
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
- SetFrameId(255);
+ SetFrameIds(255, 254);
SetPacketId(0);
SetMaxPacketId(0);
SetKeyFrame(false);
@@ -280,7 +278,7 @@ TEST_F(CastMessageBuilderTest, WrapFastForward) {
EXPECT_EQ(253u, feedback_.last_frame_acked());
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
- SetFrameId(256);
+ SetFrameIds(256, 255);
SetPacketId(0);
SetMaxPacketId(0);
SetKeyFrame(false);
@@ -289,7 +287,7 @@ TEST_F(CastMessageBuilderTest, WrapFastForward) {
EXPECT_EQ(253u, feedback_.last_frame_acked());
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
- SetFrameId(254);
+ SetFrameIds(254, 254);
SetPacketId(1);
SetMaxPacketId(1);
SetKeyFrame(true);
@@ -299,7 +297,7 @@ TEST_F(CastMessageBuilderTest, WrapFastForward) {
}
TEST_F(CastMessageBuilderTest, NackUntilMaxReceivedPacket) {
- SetFrameId(0);
+ SetFrameIds(0, 0);
SetPacketId(0);
SetMaxPacketId(20);
SetKeyFrame(true);
@@ -313,7 +311,7 @@ TEST_F(CastMessageBuilderTest, NackUntilMaxReceivedPacket) {
}
TEST_F(CastMessageBuilderTest, NackUntilMaxReceivedPacketNextFrame) {
- SetFrameId(0);
+ SetFrameIds(0, 0);
SetPacketId(0);
SetMaxPacketId(20);
SetKeyFrame(true);
@@ -326,7 +324,7 @@ TEST_F(CastMessageBuilderTest, NackUntilMaxReceivedPacketNextFrame) {
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
EXPECT_TRUE(feedback_.triggered());
EXPECT_EQ(4u, feedback_.num_missing_packets(0));
- SetFrameId(1);
+ SetFrameIds(1, 0);
SetMaxPacketId(2);
SetPacketId(0);
SetKeyFrame(false);
@@ -338,7 +336,7 @@ TEST_F(CastMessageBuilderTest, NackUntilMaxReceivedPacketNextFrame) {
}
TEST_F(CastMessageBuilderTest, NackUntilMaxReceivedPacketNextKey) {
- SetFrameId(0);
+ SetFrameIds(0, 0);
SetPacketId(0);
SetMaxPacketId(20);
SetKeyFrame(true);
@@ -351,7 +349,7 @@ TEST_F(CastMessageBuilderTest, NackUntilMaxReceivedPacketNextKey) {
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
EXPECT_TRUE(feedback_.triggered());
EXPECT_EQ(4u, feedback_.num_missing_packets(0));
- SetFrameId(1);
+ SetFrameIds(1, 1);
SetMaxPacketId(0);
SetPacketId(0);
SetKeyFrame(true);
@@ -375,7 +373,7 @@ TEST_F(CastMessageBuilderTest, Reset) {
}
TEST_F(CastMessageBuilderTest, DeltaAfterReset) {
- SetFrameId(0);
+ SetFrameIds(0, 0);
SetPacketId(0);
SetMaxPacketId(0);
SetKeyFrame(true);
@@ -385,7 +383,7 @@ TEST_F(CastMessageBuilderTest, DeltaAfterReset) {
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
cast_msg_builder_->Reset();
- SetFrameId(1);
+ SetFrameIds(1, 0);
SetPacketId(0);
SetMaxPacketId(0);
SetKeyFrame(true);
@@ -393,7 +391,7 @@ TEST_F(CastMessageBuilderTest, DeltaAfterReset) {
}
TEST_F(CastMessageBuilderTest, BasicRps) {
- SetFrameId(0);
+ SetFrameIds(0, 0);
SetPacketId(0);
SetMaxPacketId(0);
SetKeyFrame(true);
@@ -402,9 +400,8 @@ TEST_F(CastMessageBuilderTest, BasicRps) {
base::TimeDelta::FromMilliseconds(kLongTimeIncrementMs));
EXPECT_TRUE(feedback_.triggered());
EXPECT_EQ(0u, feedback_.last_frame_acked());
- SetFrameId(3);
+ SetFrameIds(3, 0);
SetKeyFrame(false);
- SetReferenceFrameId(0);
InsertPacket();
EXPECT_TRUE(feedback_.triggered());
EXPECT_EQ(0u, feedback_.last_frame_acked());
@@ -418,7 +415,7 @@ TEST_F(CastMessageBuilderTest, BasicRps) {
TEST_F(CastMessageBuilderTest, InOrderRps) {
// Create a pattern - skip to rps, and don't look back.
- SetFrameId(0);
+ SetFrameIds(0, 0);
SetPacketId(0);
SetMaxPacketId(0);
SetKeyFrame(true);
@@ -427,7 +424,7 @@ TEST_F(CastMessageBuilderTest, InOrderRps) {
base::TimeDelta::FromMilliseconds(kShortTimeIncrementMs));
EXPECT_TRUE(feedback_.triggered());
EXPECT_EQ(0u, feedback_.last_frame_acked());
- SetFrameId(1);
+ SetFrameIds(1, 0);
SetPacketId(0);
SetMaxPacketId(1);
SetKeyFrame(false);
@@ -435,11 +432,10 @@ TEST_F(CastMessageBuilderTest, InOrderRps) {
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kShortTimeIncrementMs));
EXPECT_FALSE(feedback_.triggered());
- SetFrameId(3);
+ SetFrameIds(3, 0);
SetPacketId(0);
SetMaxPacketId(0);
SetKeyFrame(false);
- SetReferenceFrameId(0);
InsertPacket();
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kShortTimeIncrementMs));
@@ -450,7 +446,7 @@ TEST_F(CastMessageBuilderTest, InOrderRps) {
EXPECT_TRUE(feedback_.triggered());
EXPECT_EQ(3u, feedback_.last_frame_acked());
// Make an old frame complete - should not trigger an ack.
- SetFrameId(1);
+ SetFrameIds(1, 0);
SetPacketId(1);
SetMaxPacketId(1);
SetKeyFrame(false);
@@ -463,7 +459,7 @@ TEST_F(CastMessageBuilderTest, InOrderRps) {
TEST_F(CastMessageBuilderTest, SlowDownAck) {
SetDecoderSlowerThanMaxFrameRate(3);
- SetFrameId(0);
+ SetFrameIds(0, 0);
SetPacketId(0);
SetMaxPacketId(0);
SetKeyFrame(true);
@@ -476,7 +472,7 @@ TEST_F(CastMessageBuilderTest, SlowDownAck) {
for (frame_id = 1; frame_id < 3; ++frame_id) {
EXPECT_TRUE(feedback_.triggered());
EXPECT_EQ(frame_id - 1, feedback_.last_frame_acked());
- SetFrameId(frame_id);
+ SetFrameIds(frame_id, frame_id - 1);
InsertPacket();
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kShortTimeIncrementMs));
@@ -488,7 +484,7 @@ TEST_F(CastMessageBuilderTest, SlowDownAck) {
++expected_frame_id;
EXPECT_TRUE(feedback_.triggered());
EXPECT_EQ(expected_frame_id, feedback_.last_frame_acked());
- SetFrameId(frame_id);
+ SetFrameIds(frame_id, frame_id - 1);
InsertPacket();
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kShortTimeIncrementMs));
@@ -500,7 +496,7 @@ TEST_F(CastMessageBuilderTest, SlowDownAck) {
frame_id_map_.RemoveOldFrames(frame_id);
// We should now leave the slowdown ACK state.
++frame_id;
- SetFrameId(frame_id);
+ SetFrameIds(frame_id, frame_id - 1);
InsertPacket();
testing_clock_.Advance(
base::TimeDelta::FromMilliseconds(kShortTimeIncrementMs));
« no previous file with comments | « media/cast/cast_testing.gypi ('k') | media/cast/framer/frame_buffer.cc » ('j') | media/cast/rtp_receiver/rtp_parser/rtp_parser.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698