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

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

Issue 109413004: Cast:Adding cast_transport_config and cleaning up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updating chrome/renderer Created 7 years 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/framer/framer_unittest.cc
diff --git a/media/cast/framer/framer_unittest.cc b/media/cast/framer/framer_unittest.cc
index 871f048af4641112edfb817a5433caecaee6382a..ae8a6f5a0b5eb51b9a7eb5be72b29351c55c3bce 100644
--- a/media/cast/framer/framer_unittest.cc
+++ b/media/cast/framer/framer_unittest.cc
@@ -27,7 +27,7 @@ class FramerTest : public ::testing::Test {
rtp_header_.max_packet_id = 0;
rtp_header_.is_reference = false;
rtp_header_.reference_frame_id = 0;
- payload_.assign(kIpPacketSize, 0);
+ payload_.assign(kMaxIpPacketSize, 0);
EXPECT_CALL(mock_rtp_payload_feedback_,
CastFeedback(testing::_)).WillRepeatedly(testing::Return());
@@ -42,7 +42,7 @@ class FramerTest : public ::testing::Test {
TEST_F(FramerTest, EmptyState) {
- EncodedVideoFrame frame;
+ transport::EncodedVideoFrame frame;
uint32 rtp_timestamp;
bool next_frame = false;
EXPECT_FALSE(framer_.GetEncodedVideoFrame(&frame, &rtp_timestamp,
@@ -50,7 +50,7 @@ TEST_F(FramerTest, EmptyState) {
}
TEST_F(FramerTest, AlwaysStartWithKey) {
- EncodedVideoFrame frame;
+ transport::EncodedVideoFrame frame;
uint32 rtp_timestamp;
bool next_frame = false;
@@ -70,7 +70,7 @@ TEST_F(FramerTest, AlwaysStartWithKey) {
}
TEST_F(FramerTest, CompleteFrame) {
- EncodedVideoFrame frame;
+ transport::EncodedVideoFrame frame;
uint32 rtp_timestamp;
bool next_frame = false;
@@ -101,7 +101,7 @@ TEST_F(FramerTest, CompleteFrame) {
}
TEST_F(FramerTest, ContinuousSequence) {
- EncodedVideoFrame frame;
+ transport::EncodedVideoFrame frame;
uint32 rtp_timestamp;
bool next_frame = false;
@@ -125,7 +125,7 @@ TEST_F(FramerTest, ContinuousSequence) {
TEST_F(FramerTest, Wrap) {
// Insert key frame, frame_id = 255 (will jump to that)
- EncodedVideoFrame frame;
+ transport::EncodedVideoFrame frame;
uint32 rtp_timestamp;
bool next_frame = false;
@@ -151,7 +151,7 @@ TEST_F(FramerTest, Wrap) {
}
TEST_F(FramerTest, Reset) {
- EncodedVideoFrame frame;
+ transport::EncodedVideoFrame frame;
uint32 rtp_timestamp;
bool next_frame = false;
@@ -164,7 +164,7 @@ TEST_F(FramerTest, Reset) {
}
TEST_F(FramerTest, RequireKeyAfterReset) {
- EncodedVideoFrame frame;
+ transport::EncodedVideoFrame frame;
uint32 rtp_timestamp;
bool next_frame = false;
framer_.Reset();
@@ -184,7 +184,7 @@ TEST_F(FramerTest, RequireKeyAfterReset) {
}
TEST_F(FramerTest, BasicNonLastReferenceId) {
- EncodedVideoFrame frame;
+ transport::EncodedVideoFrame frame;
uint32 rtp_timestamp;
bool next_frame = false;
rtp_header_.is_key_frame = true;
@@ -208,7 +208,7 @@ TEST_F(FramerTest, BasicNonLastReferenceId) {
TEST_F(FramerTest, InOrderReferenceFrameSelection) {
// Create pattern: 0, 1, 4, 5.
- EncodedVideoFrame frame;
+ transport::EncodedVideoFrame frame;
uint32 rtp_timestamp;
bool next_frame = false;
@@ -261,7 +261,7 @@ TEST_F(FramerTest, InOrderReferenceFrameSelection) {
TEST_F(FramerTest, AudioWrap) {
// All audio frames are marked as key frames.
- EncodedAudioFrame frame;
+ transport::EncodedAudioFrame frame;
uint32 rtp_timestamp;
bool next_frame = false;
rtp_header_.is_key_frame = true;
@@ -296,7 +296,7 @@ TEST_F(FramerTest, AudioWrap) {
TEST_F(FramerTest, AudioWrapWithMissingFrame) {
// All audio frames are marked as key frames.
- EncodedAudioFrame frame;
+ transport::EncodedAudioFrame frame;
uint32 rtp_timestamp;
bool next_frame = false;

Powered by Google App Engine
This is Rietveld 408576698