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

Unified Diff: media/cast/net/rtp/frame_buffer_unittest.cc

Issue 388663003: Cast: Reshuffle files under media/cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing includes Created 6 years, 5 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/net/rtp/frame_buffer.cc ('k') | media/cast/net/rtp/frame_id_map.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/net/rtp/frame_buffer_unittest.cc
diff --git a/media/cast/framer/frame_buffer_unittest.cc b/media/cast/net/rtp/frame_buffer_unittest.cc
similarity index 92%
rename from media/cast/framer/frame_buffer_unittest.cc
rename to media/cast/net/rtp/frame_buffer_unittest.cc
index d6844f3e9527196a2b1343ffff192b7c4951cd6b..08232a2c3039a94589a957cafd8bba28216616fc 100644
--- a/media/cast/framer/frame_buffer_unittest.cc
+++ b/media/cast/net/rtp/frame_buffer_unittest.cc
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/cast/framer/frame_buffer.h"
+#include "media/cast/net/rtp/frame_buffer.h"
+#include "media/cast/net/cast_transport_defines.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace media {
@@ -29,9 +30,9 @@ TEST_F(FrameBufferTest, OnePacketInsertSanity) {
rtp_header_.frame_id = 5;
rtp_header_.reference_frame_id = 5;
buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
- transport::EncodedFrame frame;
+ EncodedFrame frame;
EXPECT_TRUE(buffer_.AssembleEncodedFrame(&frame));
- EXPECT_EQ(transport::EncodedFrame::KEY, frame.dependency);
+ EXPECT_EQ(EncodedFrame::KEY, frame.dependency);
EXPECT_EQ(5u, frame.frame_id);
EXPECT_EQ(5u, frame.referenced_frame_id);
EXPECT_EQ(3000u, frame.rtp_timestamp);
@@ -39,7 +40,7 @@ TEST_F(FrameBufferTest, OnePacketInsertSanity) {
TEST_F(FrameBufferTest, EmptyBuffer) {
EXPECT_FALSE(buffer_.Complete());
- transport::EncodedFrame frame;
+ EncodedFrame frame;
EXPECT_FALSE(buffer_.AssembleEncodedFrame(&frame));
}
@@ -47,7 +48,7 @@ TEST_F(FrameBufferTest, DefaultOnePacketFrame) {
buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
EXPECT_TRUE(buffer_.Complete());
EXPECT_FALSE(buffer_.is_key_frame());
- transport::EncodedFrame frame;
+ EncodedFrame frame;
EXPECT_TRUE(buffer_.AssembleEncodedFrame(&frame));
EXPECT_EQ(payload_.size(), frame.data.size());
}
@@ -63,7 +64,7 @@ TEST_F(FrameBufferTest, MultiplePacketFrame) {
++rtp_header_.packet_id;
EXPECT_TRUE(buffer_.Complete());
EXPECT_TRUE(buffer_.is_key_frame());
- transport::EncodedFrame frame;
+ EncodedFrame frame;
EXPECT_TRUE(buffer_.AssembleEncodedFrame(&frame));
EXPECT_EQ(3 * payload_.size(), frame.data.size());
}
« no previous file with comments | « media/cast/net/rtp/frame_buffer.cc ('k') | media/cast/net/rtp/frame_id_map.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698