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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 288103002: [Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
Download patch
« media/cast/framer/frame_buffer.h ('K') | « media/cast/framer/framer.cc ('k') | media/cast/test/encode_decode_test.cc » ('j') | media/cast/transport/cast_transport_config.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/framer/framer_unittest.cc
diff --git a/media/cast/framer/framer_unittest.cc b/media/cast/framer/framer_unittest.cc
index 06a340ebb0b893b6b18aa671736b7d4e16a8c750..3a3ef216c55f7b3a08fe94ebe52dd52ec8d3d639 100644
--- a/media/cast/framer/framer_unittest.cc
+++ b/media/cast/framer/framer_unittest.cc
@@ -33,13 +33,13 @@ class FramerTest : public ::testing::Test {
};
TEST_F(FramerTest, EmptyState) {
- transport::EncodedVideoFrame frame;
+ transport::EncodedFrame frame;
bool next_frame = false;
EXPECT_FALSE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
}
TEST_F(FramerTest, AlwaysStartWithKey) {
- transport::EncodedVideoFrame frame;
+ transport::EncodedFrame frame;
bool next_frame = false;
bool complete = false;
bool duplicate = false;
@@ -58,12 +58,12 @@ TEST_F(FramerTest, AlwaysStartWithKey) {
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_TRUE(next_frame);
EXPECT_EQ(1u, frame.frame_id);
- EXPECT_TRUE(frame.key_frame);
+ EXPECT_EQ(1u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
}
TEST_F(FramerTest, CompleteFrame) {
- transport::EncodedVideoFrame frame;
+ transport::EncodedFrame frame;
bool next_frame = false;
bool complete = false;
bool duplicate = false;
@@ -76,7 +76,7 @@ TEST_F(FramerTest, CompleteFrame) {
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_TRUE(next_frame);
EXPECT_EQ(0u, frame.frame_id);
- EXPECT_TRUE(frame.key_frame);
+ EXPECT_EQ(0u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
// Incomplete delta.
@@ -100,7 +100,7 @@ TEST_F(FramerTest, CompleteFrame) {
}
TEST_F(FramerTest, DuplicatePackets) {
- transport::EncodedVideoFrame frame;
+ transport::EncodedFrame frame;
bool next_frame = false;
bool complete = false;
bool duplicate = false;
@@ -132,6 +132,7 @@ TEST_F(FramerTest, DuplicatePackets) {
EXPECT_FALSE(duplicate);
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_EQ(0u, frame.frame_id);
+ EXPECT_EQ(0u, frame.base_frame_id);
// Add same packet again in complete key frame.
duplicate = false;
@@ -141,6 +142,7 @@ TEST_F(FramerTest, DuplicatePackets) {
EXPECT_TRUE(duplicate);
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_EQ(0u, frame.frame_id);
+ EXPECT_EQ(0u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
// Incomplete delta frame.
@@ -172,6 +174,7 @@ TEST_F(FramerTest, DuplicatePackets) {
EXPECT_FALSE(duplicate);
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_EQ(1u, frame.frame_id);
+ EXPECT_EQ(0u, frame.base_frame_id);
// Add same packet again in complete delta frame.
duplicate = false;
@@ -181,10 +184,11 @@ TEST_F(FramerTest, DuplicatePackets) {
EXPECT_TRUE(duplicate);
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_EQ(1u, frame.frame_id);
+ EXPECT_EQ(0u, frame.base_frame_id);
}
TEST_F(FramerTest, ContinuousSequence) {
- transport::EncodedVideoFrame frame;
+ transport::EncodedFrame frame;
bool next_frame = false;
bool complete = false;
bool duplicate = false;
@@ -197,7 +201,7 @@ TEST_F(FramerTest, ContinuousSequence) {
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_TRUE(next_frame);
EXPECT_EQ(0u, frame.frame_id);
- EXPECT_TRUE(frame.key_frame);
+ EXPECT_EQ(0u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
// Complete - not continuous.
@@ -212,7 +216,7 @@ TEST_F(FramerTest, ContinuousSequence) {
TEST_F(FramerTest, Wrap) {
// Insert key frame, frame_id = 255 (will jump to that)
- transport::EncodedVideoFrame frame;
+ transport::EncodedFrame frame;
bool next_frame = false;
bool duplicate = false;
@@ -225,6 +229,7 @@ TEST_F(FramerTest, Wrap) {
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_TRUE(next_frame);
EXPECT_EQ(255u, frame.frame_id);
+ EXPECT_EQ(255u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
// Insert wrapped delta frame - should be continuous.
@@ -235,11 +240,12 @@ TEST_F(FramerTest, Wrap) {
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_TRUE(next_frame);
EXPECT_EQ(256u, frame.frame_id);
+ EXPECT_EQ(255u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
}
TEST_F(FramerTest, Reset) {
- transport::EncodedVideoFrame frame;
+ transport::EncodedFrame frame;
bool next_frame = false;
bool complete = false;
bool duplicate = false;
@@ -254,7 +260,7 @@ TEST_F(FramerTest, Reset) {
}
TEST_F(FramerTest, RequireKeyAfterReset) {
- transport::EncodedVideoFrame frame;
+ transport::EncodedFrame frame;
bool next_frame = false;
bool duplicate = false;
@@ -276,7 +282,7 @@ TEST_F(FramerTest, RequireKeyAfterReset) {
}
TEST_F(FramerTest, BasicNonLastReferenceId) {
- transport::EncodedVideoFrame frame;
+ transport::EncodedFrame frame;
bool next_frame = false;
bool duplicate = false;
@@ -300,7 +306,7 @@ TEST_F(FramerTest, BasicNonLastReferenceId) {
TEST_F(FramerTest, InOrderReferenceFrameSelection) {
// Create pattern: 0, 1, 4, 5.
- transport::EncodedVideoFrame frame;
+ transport::EncodedFrame frame;
bool next_frame = false;
bool duplicate = false;
@@ -325,14 +331,17 @@ TEST_F(FramerTest, InOrderReferenceFrameSelection) {
payload_.data(), payload_.size(), rtp_header_, &duplicate);
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_EQ(0u, frame.frame_id);
+ EXPECT_EQ(0u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_TRUE(next_frame);
EXPECT_EQ(1u, frame.frame_id);
+ EXPECT_EQ(0u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_FALSE(next_frame);
EXPECT_EQ(4u, frame.frame_id);
+ EXPECT_EQ(0u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
// Insert remaining packet of frame #2 - should no be continuous.
rtp_header_.frame_id = 2;
@@ -349,11 +358,12 @@ TEST_F(FramerTest, InOrderReferenceFrameSelection) {
EXPECT_TRUE(framer_.GetEncodedVideoFrame(&frame, &next_frame));
EXPECT_TRUE(next_frame);
EXPECT_EQ(5u, frame.frame_id);
+ EXPECT_EQ(4u, frame.base_frame_id);
}
TEST_F(FramerTest, AudioWrap) {
// All audio frames are marked as key frames.
- transport::EncodedAudioFrame frame;
+ transport::EncodedFrame frame;
bool next_frame = false;
bool duplicate = false;
@@ -366,6 +376,7 @@ TEST_F(FramerTest, AudioWrap) {
EXPECT_TRUE(framer_.GetEncodedAudioFrame(&frame, &next_frame));
EXPECT_TRUE(next_frame);
EXPECT_EQ(254u, frame.frame_id);
+ EXPECT_EQ(254u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
rtp_header_.frame_id = 255;
@@ -382,17 +393,19 @@ TEST_F(FramerTest, AudioWrap) {
EXPECT_TRUE(framer_.GetEncodedAudioFrame(&frame, &next_frame));
EXPECT_TRUE(next_frame);
EXPECT_EQ(255u, frame.frame_id);
+ EXPECT_EQ(255u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
EXPECT_TRUE(framer_.GetEncodedAudioFrame(&frame, &next_frame));
EXPECT_TRUE(next_frame);
EXPECT_EQ(256u, frame.frame_id);
+ EXPECT_EQ(256u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
}
TEST_F(FramerTest, AudioWrapWithMissingFrame) {
// All audio frames are marked as key frames.
- transport::EncodedAudioFrame frame;
+ transport::EncodedFrame frame;
bool next_frame = false;
bool duplicate = false;
@@ -405,6 +418,7 @@ TEST_F(FramerTest, AudioWrapWithMissingFrame) {
EXPECT_TRUE(framer_.GetEncodedAudioFrame(&frame, &next_frame));
EXPECT_TRUE(next_frame);
EXPECT_EQ(253u, frame.frame_id);
+ EXPECT_EQ(253u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
// Insert third and fourth packets.
@@ -421,10 +435,12 @@ TEST_F(FramerTest, AudioWrapWithMissingFrame) {
EXPECT_TRUE(framer_.GetEncodedAudioFrame(&frame, &next_frame));
EXPECT_FALSE(next_frame);
EXPECT_EQ(255u, frame.frame_id);
+ EXPECT_EQ(255u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
EXPECT_TRUE(framer_.GetEncodedAudioFrame(&frame, &next_frame));
EXPECT_TRUE(next_frame);
EXPECT_EQ(256u, frame.frame_id);
+ EXPECT_EQ(256u, frame.base_frame_id);
framer_.ReleaseFrame(frame.frame_id);
}
« media/cast/framer/frame_buffer.h ('K') | « media/cast/framer/framer.cc ('k') | media/cast/test/encode_decode_test.cc » ('j') | media/cast/transport/cast_transport_config.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698