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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cast/test/end2end_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/test/cast_benchmarks.cc ('k') | media/cast/test/loopback_transport.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/test/end2end_unittest.cc
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index 3765949b749814bb34cad46b1ddeca1b6eadb57a..a1d4a3ab3479f87c01496dfdf0c04263fbbd8804 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -29,6 +29,10 @@
#include "media/cast/cast_receiver.h"
#include "media/cast/cast_sender.h"
#include "media/cast/logging/simple_event_subscriber.h"
+#include "media/cast/net/cast_transport_config.h"
+#include "media/cast/net/cast_transport_defines.h"
+#include "media/cast/net/cast_transport_sender.h"
+#include "media/cast/net/cast_transport_sender_impl.h"
#include "media/cast/test/fake_single_thread_task_runner.h"
#include "media/cast/test/skewed_single_thread_task_runner.h"
#include "media/cast/test/skewed_tick_clock.h"
@@ -36,10 +40,6 @@
#include "media/cast/test/utility/default_config.h"
#include "media/cast/test/utility/udp_proxy.h"
#include "media/cast/test/utility/video_utility.h"
-#include "media/cast/transport/cast_transport_config.h"
-#include "media/cast/transport/cast_transport_defines.h"
-#include "media/cast/transport/cast_transport_sender.h"
-#include "media/cast/transport/cast_transport_sender_impl.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace media {
@@ -97,9 +97,9 @@ std::string ConvertFromBase16String(const std::string base_16) {
return compressed;
}
-void UpdateCastTransportStatus(transport::CastTransportStatus status) {
- bool result = (status == transport::TRANSPORT_AUDIO_INITIALIZED ||
- status == transport::TRANSPORT_VIDEO_INITIALIZED);
+void UpdateCastTransportStatus(CastTransportStatus status) {
+ bool result = (status == TRANSPORT_AUDIO_INITIALIZED ||
+ status == TRANSPORT_VIDEO_INITIALIZED);
EXPECT_TRUE(result);
}
@@ -168,23 +168,23 @@ std::map<uint16, LoggingEventCounts> GetEventCountForPacketEvents(
// PacketReceiverCallback.
class LoopBackPacketPipe : public test::PacketPipe {
public:
- LoopBackPacketPipe(const transport::PacketReceiverCallback& packet_receiver)
+ LoopBackPacketPipe(const PacketReceiverCallback& packet_receiver)
: packet_receiver_(packet_receiver) {}
virtual ~LoopBackPacketPipe() {}
// PacketPipe implementations.
- virtual void Send(scoped_ptr<transport::Packet> packet) OVERRIDE {
+ virtual void Send(scoped_ptr<Packet> packet) OVERRIDE {
packet_receiver_.Run(packet.Pass());
}
private:
- transport::PacketReceiverCallback packet_receiver_;
+ PacketReceiverCallback packet_receiver_;
};
// Class that sends the packet direct from sender into the receiver with the
// ability to drop packets between the two.
-class LoopBackTransport : public transport::PacketSender {
+class LoopBackTransport : public PacketSender {
public:
explicit LoopBackTransport(scoped_refptr<CastEnvironment> cast_environment)
: send_packets_(true),
@@ -192,7 +192,7 @@ class LoopBackTransport : public transport::PacketSender {
cast_environment_(cast_environment) {}
void SetPacketReceiver(
- const transport::PacketReceiverCallback& packet_receiver,
+ const PacketReceiverCallback& packet_receiver,
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
base::TickClock* clock) {
scoped_ptr<test::PacketPipe> loopback_pipe(
@@ -205,7 +205,7 @@ class LoopBackTransport : public transport::PacketSender {
packet_pipe_->InitOnIOThread(task_runner, clock);
}
- virtual bool SendPacket(transport::PacketRef packet,
+ virtual bool SendPacket(PacketRef packet,
const base::Closure& cb) OVERRIDE {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
if (!send_packets_)
@@ -307,7 +307,7 @@ class TestReceiverAudioCallback
EXPECT_TRUE(is_continuous);
}
- void CheckCodedAudioFrame(scoped_ptr<transport::EncodedFrame> audio_frame) {
+ void CheckCodedAudioFrame(scoped_ptr<EncodedFrame> audio_frame) {
ASSERT_TRUE(!!audio_frame);
ASSERT_FALSE(expected_frames_.empty());
const ExpectedAudioFrame& expected_audio_frame =
@@ -458,8 +458,8 @@ class End2EndTest : public ::testing::Test {
&event_subscriber_sender_);
}
- void Configure(transport::Codec video_codec,
- transport::Codec audio_codec,
+ void Configure(Codec video_codec,
+ Codec audio_codec,
int audio_sampling_frequency,
int max_number_of_video_buffers_used) {
audio_sender_config_.ssrc = 1;
@@ -582,7 +582,7 @@ class End2EndTest : public ::testing::Test {
&receiver_to_sender_);
net::IPEndPoint dummy_endpoint;
- transport_sender_.reset(new transport::CastTransportSenderImpl(
+ transport_sender_.reset(new CastTransportSenderImpl(
NULL,
testing_clock_sender_,
dummy_endpoint,
@@ -762,7 +762,7 @@ class End2EndTest : public ::testing::Test {
LoopBackTransport receiver_to_sender_;
LoopBackTransport sender_to_receiver_;
- scoped_ptr<transport::CastTransportSenderImpl> transport_sender_;
+ scoped_ptr<CastTransportSenderImpl> transport_sender_;
scoped_ptr<CastReceiver> cast_receiver_;
scoped_ptr<CastSender> cast_sender_;
@@ -784,7 +784,7 @@ class End2EndTest : public ::testing::Test {
};
TEST_F(End2EndTest, LoopNoLossPcm16) {
- Configure(transport::CODEC_VIDEO_VP8, transport::CODEC_AUDIO_PCM16, 32000, 1);
+ Configure(CODEC_VIDEO_VP8, CODEC_AUDIO_PCM16, 32000, 1);
// Reduce video resolution to allow processing multiple frames within a
// reasonable time frame.
video_sender_config_.width = kVideoQcifWidth;
@@ -838,7 +838,7 @@ TEST_F(End2EndTest, LoopNoLossPcm16) {
// This tests our external decoder interface for Audio.
// Audio test without packet loss using raw PCM 16 audio "codec";
TEST_F(End2EndTest, LoopNoLossPcm16ExternalDecoder) {
- Configure(transport::CODEC_VIDEO_VP8, transport::CODEC_AUDIO_PCM16, 32000, 1);
+ Configure(CODEC_VIDEO_VP8, CODEC_AUDIO_PCM16, 32000, 1);
Create();
const int kNumIterations = 10;
@@ -856,7 +856,7 @@ TEST_F(End2EndTest, LoopNoLossPcm16ExternalDecoder) {
// This tests our Opus audio codec without video.
TEST_F(End2EndTest, LoopNoLossOpus) {
- Configure(transport::CODEC_VIDEO_VP8, transport::CODEC_AUDIO_OPUS,
+ Configure(CODEC_VIDEO_VP8, CODEC_AUDIO_OPUS,
kDefaultAudioSamplingRate, 1);
Create();
@@ -883,7 +883,7 @@ TEST_F(End2EndTest, LoopNoLossOpus) {
// in audio_receiver.cc for likely cause(s) of this bug.
// http://crbug.com/356942
TEST_F(End2EndTest, DISABLED_StartSenderBeforeReceiver) {
- Configure(transport::CODEC_VIDEO_VP8, transport::CODEC_AUDIO_PCM16,
+ Configure(CODEC_VIDEO_VP8, CODEC_AUDIO_PCM16,
kDefaultAudioSamplingRate, 1);
Create();
@@ -972,7 +972,7 @@ TEST_F(End2EndTest, DISABLED_StartSenderBeforeReceiver) {
// This tests a network glitch lasting for 10 video frames.
// Flaky. See crbug.com/351596.
TEST_F(End2EndTest, DISABLED_GlitchWith3Buffers) {
- Configure(transport::CODEC_VIDEO_VP8, transport::CODEC_AUDIO_OPUS,
+ Configure(CODEC_VIDEO_VP8, CODEC_AUDIO_OPUS,
kDefaultAudioSamplingRate, 3);
video_sender_config_.target_playout_delay =
base::TimeDelta::FromMilliseconds(67);
@@ -1037,7 +1037,7 @@ TEST_F(End2EndTest, DISABLED_GlitchWith3Buffers) {
// Disabled due to flakiness and crashiness. http://crbug.com/360951
TEST_F(End2EndTest, DISABLED_DropEveryOtherFrame3Buffers) {
- Configure(transport::CODEC_VIDEO_VP8, transport::CODEC_AUDIO_OPUS,
+ Configure(CODEC_VIDEO_VP8, CODEC_AUDIO_OPUS,
kDefaultAudioSamplingRate, 3);
video_sender_config_.target_playout_delay =
base::TimeDelta::FromMilliseconds(67);
@@ -1077,7 +1077,7 @@ TEST_F(End2EndTest, DISABLED_DropEveryOtherFrame3Buffers) {
}
TEST_F(End2EndTest, CryptoVideo) {
- Configure(transport::CODEC_VIDEO_VP8, transport::CODEC_AUDIO_PCM16, 32000, 1);
+ Configure(CODEC_VIDEO_VP8, CODEC_AUDIO_PCM16, 32000, 1);
video_sender_config_.aes_iv_mask =
ConvertFromBase16String("1234567890abcdeffedcba0987654321");
@@ -1115,7 +1115,7 @@ TEST_F(End2EndTest, CryptoVideo) {
}
TEST_F(End2EndTest, CryptoAudio) {
- Configure(transport::CODEC_VIDEO_VP8, transport::CODEC_AUDIO_PCM16, 32000, 1);
+ Configure(CODEC_VIDEO_VP8, CODEC_AUDIO_PCM16, 32000, 1);
audio_sender_config_.aes_iv_mask =
ConvertFromBase16String("abcdeffedcba12345678900987654321");
@@ -1144,7 +1144,7 @@ TEST_F(End2EndTest, CryptoAudio) {
// Video test without packet loss - tests the logging aspects of the end2end,
// but is basically equivalent to LoopNoLossPcm16.
TEST_F(End2EndTest, VideoLogging) {
- Configure(transport::CODEC_VIDEO_VP8, transport::CODEC_AUDIO_PCM16, 32000, 1);
+ Configure(CODEC_VIDEO_VP8, CODEC_AUDIO_PCM16, 32000, 1);
Create();
int video_start = kVideoStart;
@@ -1268,7 +1268,7 @@ TEST_F(End2EndTest, VideoLogging) {
// Audio test without packet loss - tests the logging aspects of the end2end,
// but is basically equivalent to LoopNoLossPcm16.
TEST_F(End2EndTest, AudioLogging) {
- Configure(transport::CODEC_VIDEO_VP8, transport::CODEC_AUDIO_PCM16, 32000, 1);
+ Configure(CODEC_VIDEO_VP8, CODEC_AUDIO_PCM16, 32000, 1);
Create();
int audio_diff = kFrameTimerMs;
@@ -1349,7 +1349,7 @@ TEST_F(End2EndTest, AudioLogging) {
}
TEST_F(End2EndTest, BasicFakeSoftwareVideo) {
- Configure(transport::CODEC_VIDEO_FAKE, transport::CODEC_AUDIO_PCM16, 32000,
+ Configure(CODEC_VIDEO_FAKE, CODEC_AUDIO_PCM16, 32000,
1);
Create();
StartBasicPlayer();
@@ -1371,7 +1371,7 @@ TEST_F(End2EndTest, BasicFakeSoftwareVideo) {
}
TEST_F(End2EndTest, ReceiverClockFast) {
- Configure(transport::CODEC_VIDEO_FAKE, transport::CODEC_AUDIO_PCM16, 32000,
+ Configure(CODEC_VIDEO_FAKE, CODEC_AUDIO_PCM16, 32000,
1);
Create();
StartBasicPlayer();
@@ -1387,7 +1387,7 @@ TEST_F(End2EndTest, ReceiverClockFast) {
}
TEST_F(End2EndTest, ReceiverClockSlow) {
- Configure(transport::CODEC_VIDEO_FAKE, transport::CODEC_AUDIO_PCM16, 32000,
+ Configure(CODEC_VIDEO_FAKE, CODEC_AUDIO_PCM16, 32000,
1);
Create();
StartBasicPlayer();
@@ -1403,7 +1403,7 @@ TEST_F(End2EndTest, ReceiverClockSlow) {
}
TEST_F(End2EndTest, SmoothPlayoutWithFivePercentClockRateSkew) {
- Configure(transport::CODEC_VIDEO_FAKE, transport::CODEC_AUDIO_PCM16, 32000,
+ Configure(CODEC_VIDEO_FAKE, CODEC_AUDIO_PCM16, 32000,
1);
Create();
StartBasicPlayer();
@@ -1425,7 +1425,7 @@ TEST_F(End2EndTest, SmoothPlayoutWithFivePercentClockRateSkew) {
}
TEST_F(End2EndTest, EvilNetwork) {
- Configure(transport::CODEC_VIDEO_FAKE, transport::CODEC_AUDIO_PCM16, 32000,
+ Configure(CODEC_VIDEO_FAKE, CODEC_AUDIO_PCM16, 32000,
1);
receiver_to_sender_.SetPacketPipe(test::EvilNetwork().Pass());
sender_to_receiver_.SetPacketPipe(test::EvilNetwork().Pass());
« no previous file with comments | « media/cast/test/cast_benchmarks.cc ('k') | media/cast/test/loopback_transport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698