summaryrefslogtreecommitdiffstats
path: root/media/cast/test
diff options
context:
space:
mode:
Diffstat (limited to 'media/cast/test')
-rw-r--r--media/cast/test/end2end_unittest.cc94
-rw-r--r--media/cast/test/utility/udp_proxy.cc27
-rw-r--r--media/cast/test/utility/udp_proxy.h16
-rw-r--r--media/cast/test/utility/udp_proxy_main.cc2
4 files changed, 101 insertions, 38 deletions
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index 4e38a53..6dccbcf 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -33,6 +33,7 @@
#include "media/cast/test/fake_single_thread_task_runner.h"
#include "media/cast/test/utility/audio_utility.h"
#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"
@@ -159,8 +160,30 @@ std::map<uint16, LoggingEventCounts> GetEventCountForPacketEvents(
return event_counter_for_packet;
}
+void CountVideoFrame(int* counter,
+ const scoped_refptr<media::VideoFrame>& video_frame,
+ const base::TimeTicks& render_time, bool continuous) {
+ ++*counter;
+}
+
} // namespace
+class LoopBackPacketPipe : public test::PacketPipe {
+ public:
+ LoopBackPacketPipe(const transport::PacketReceiverCallback& packet_receiver)
+ : packet_receiver_(packet_receiver) {}
+
+ virtual ~LoopBackPacketPipe() {}
+
+ // PacketPipe implementations.
+ virtual void Send(scoped_ptr<transport::Packet> packet) OVERRIDE {
+ packet_receiver_.Run(packet.Pass());
+ }
+
+ private:
+ transport::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 {
@@ -173,7 +196,13 @@ class LoopBackTransport : public transport::PacketSender {
void SetPacketReceiver(
const transport::PacketReceiverCallback& packet_receiver) {
- packet_receiver_ = packet_receiver;
+ scoped_ptr<test::PacketPipe> loopback_pipe(
+ new LoopBackPacketPipe(packet_receiver));
+ if (packet_pipe_) {
+ packet_pipe_->AppendToPipe(loopback_pipe.Pass());
+ } else {
+ packet_pipe_ = loopback_pipe.Pass();
+ }
}
virtual bool SendPacket(transport::PacketRef packet,
@@ -193,7 +222,7 @@ class LoopBackTransport : public transport::PacketSender {
// Reset the is_reference bit in the cast header.
(*packet_copy)[kCommonRtpHeaderLength] &= kCastReferenceFrameIdBitReset;
}
- packet_receiver_.Run(packet_copy.Pass());
+ packet_pipe_->Send(packet_copy.Pass());
return true;
}
@@ -205,12 +234,18 @@ class LoopBackTransport : public transport::PacketSender {
void AlwaysResetReferenceFrameId() { reset_reference_frame_id_ = true; }
+ void SetPacketPipe(scoped_ptr<test::PacketPipe> pipe) {
+ // Append the loopback pipe to the end.
+ pipe->AppendToPipe(packet_pipe_.Pass());
+ packet_pipe_ = pipe.Pass();
+ }
+
private:
- transport::PacketReceiverCallback packet_receiver_;
bool send_packets_;
bool drop_packets_belonging_to_odd_frames_;
bool reset_reference_frame_id_;
scoped_refptr<CastEnvironment> cast_environment_;
+ scoped_ptr<test::PacketPipe> packet_pipe_;
};
// Class that verifies the audio frames coming out of the receiver.
@@ -436,7 +471,8 @@ class End2EndTest : public ::testing::Test {
&event_subscriber_sender_);
}
- void Configure(transport::AudioCodec audio_codec,
+ void Configure(transport::VideoCodec video_codec,
+ transport::AudioCodec audio_codec,
int audio_sampling_frequency,
bool external_audio_decoder,
int max_number_of_video_buffers_used) {
@@ -476,7 +512,7 @@ class End2EndTest : public ::testing::Test {
video_sender_config_.max_frame_rate = 30;
video_sender_config_.max_number_of_video_buffers_used =
max_number_of_video_buffers_used;
- video_sender_config_.codec = transport::kVp8;
+ video_sender_config_.codec = video_codec;
video_receiver_config_.feedback_ssrc =
video_sender_config_.incoming_feedback_ssrc;
@@ -601,6 +637,11 @@ class End2EndTest : public ::testing::Test {
video_frame_input_->InsertRawVideoFrame(video_frame, capture_time);
}
+ void SendFakeVideoFrame(const base::TimeTicks& capture_time) {
+ video_frame_input_->InsertRawVideoFrame(
+ media::VideoFrame::CreateBlackFrame(gfx::Size(2, 2)), capture_time);
+ }
+
void RunTasks(int during_ms) {
for (int i = 0; i < during_ms; ++i) {
// Call process the timers every 1 ms.
@@ -664,7 +705,7 @@ class End2EndTest : public ::testing::Test {
};
TEST_F(End2EndTest, LoopNoLossPcm16) {
- Configure(transport::kPcm16, 32000, false, 1);
+ Configure(transport::kVp8, transport::kPcm16, 32000, false, 1);
// Reduce video resolution to allow processing multiple frames within a
// reasonable time frame.
video_sender_config_.width = kVideoQcifWidth;
@@ -717,7 +758,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::kPcm16, 32000, true, 1);
+ Configure(transport::kVp8, transport::kPcm16, 32000, true, 1);
Create();
const int kNumIterations = 10;
@@ -735,7 +776,8 @@ TEST_F(End2EndTest, LoopNoLossPcm16ExternalDecoder) {
// This tests our Opus audio codec without video.
TEST_F(End2EndTest, LoopNoLossOpus) {
- Configure(transport::kOpus, kDefaultAudioSamplingRate, false, 1);
+ Configure(transport::kVp8, transport::kOpus, kDefaultAudioSamplingRate,
+ false, 1);
Create();
const int kNumIterations = 300;
@@ -761,7 +803,8 @@ 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::kPcm16, kDefaultAudioSamplingRate, false, 1);
+ Configure(transport::kVp8, transport::kPcm16, kDefaultAudioSamplingRate,
+ false, 1);
Create();
int video_start = kVideoStart;
@@ -847,7 +890,8 @@ 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::kOpus, kDefaultAudioSamplingRate, false, 3);
+ Configure(transport::kVp8, transport::kOpus, kDefaultAudioSamplingRate,
+ false, 3);
video_sender_config_.rtp_config.max_delay_ms = 67;
video_receiver_config_.rtp_max_delay_ms = 67;
Create();
@@ -909,7 +953,8 @@ TEST_F(End2EndTest, DISABLED_GlitchWith3Buffers) {
// Disabled due to flakiness and crashiness. http://crbug.com/360951
TEST_F(End2EndTest, DISABLED_DropEveryOtherFrame3Buffers) {
- Configure(transport::kOpus, kDefaultAudioSamplingRate, false, 3);
+ Configure(transport::kVp8, transport::kOpus, kDefaultAudioSamplingRate, false,
+ 3);
video_sender_config_.rtp_config.max_delay_ms = 67;
video_receiver_config_.rtp_max_delay_ms = 67;
Create();
@@ -946,7 +991,8 @@ TEST_F(End2EndTest, DISABLED_DropEveryOtherFrame3Buffers) {
}
TEST_F(End2EndTest, ResetReferenceFrameId) {
- Configure(transport::kOpus, kDefaultAudioSamplingRate, false, 3);
+ Configure(transport::kVp8, transport::kOpus, kDefaultAudioSamplingRate,
+ false, 3);
video_sender_config_.rtp_config.max_delay_ms = 67;
video_receiver_config_.rtp_max_delay_ms = 67;
Create();
@@ -977,7 +1023,7 @@ TEST_F(End2EndTest, ResetReferenceFrameId) {
}
TEST_F(End2EndTest, CryptoVideo) {
- Configure(transport::kPcm16, 32000, false, 1);
+ Configure(transport::kVp8, transport::kPcm16, 32000, false, 1);
transport_video_config_.base.aes_iv_mask =
ConvertFromBase16String("1234567890abcdeffedcba0987654321");
@@ -1013,7 +1059,7 @@ TEST_F(End2EndTest, CryptoVideo) {
}
TEST_F(End2EndTest, CryptoAudio) {
- Configure(transport::kPcm16, 32000, false, 1);
+ Configure(transport::kVp8, transport::kPcm16, 32000, false, 1);
transport_audio_config_.base.aes_iv_mask =
ConvertFromBase16String("abcdeffedcba12345678900987654321");
@@ -1040,7 +1086,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::kPcm16, 32000, false, 1);
+ Configure(transport::kVp8, transport::kPcm16, 32000, false, 1);
Create();
int video_start = kVideoStart;
@@ -1166,7 +1212,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::kPcm16, 32000, false, 1);
+ Configure(transport::kVp8, transport::kPcm16, 32000, false, 1);
Create();
int audio_diff = kFrameTimerMs;
@@ -1257,6 +1303,22 @@ TEST_F(End2EndTest, AudioLogging) {
EXPECT_EQ(total_event_count_for_frame, expected_event_count_for_frame);
}
+TEST_F(End2EndTest, BasicFakeSoftwareVideo) {
+ Configure(transport::kFakeSoftwareVideo, transport::kPcm16, 32000, false, 1);
+ Create();
+
+ int frames_counter = 0;
+ int received_counter = 0;
+ for (; frames_counter < 1000; ++frames_counter) {
+ SendFakeVideoFrame(testing_clock_sender_->NowTicks());
+ frame_receiver_->GetRawVideoFrame(
+ base::Bind(&CountVideoFrame, &received_counter));
+ RunTasks(kFrameTimerMs);
+ }
+ RunTasks(2 * kFrameTimerMs + 1); // Empty the pipeline.
+ EXPECT_EQ(1000, received_counter);
+}
+
// TODO(pwestin): Add repeatable packet loss test.
// TODO(pwestin): Add test for misaligned send get calls.
// TODO(pwestin): Add more tests that does not resample.
diff --git a/media/cast/test/utility/udp_proxy.cc b/media/cast/test/utility/udp_proxy.cc
index 5936ef5..eed3744 100644
--- a/media/cast/test/utility/udp_proxy.cc
+++ b/media/cast/test/utility/udp_proxy.cc
@@ -21,10 +21,11 @@ const size_t kMaxPacketSize = 65536;
PacketPipe::PacketPipe() {}
PacketPipe::~PacketPipe() {}
-void PacketPipe::InitOnIOThread() {
- task_runner_ = base::MessageLoopProxy::current();
+void PacketPipe::InitOnIOThread(
+ const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
+ task_runner_ = task_runner;
if (pipe_) {
- pipe_->InitOnIOThread();
+ pipe_->InitOnIOThread(task_runner);
}
}
void PacketPipe::AppendToPipe(scoped_ptr<PacketPipe> pipe) {
@@ -181,8 +182,9 @@ class RandomSortedDelay : public PacketPipe {
Schedule();
}
}
- virtual void InitOnIOThread() OVERRIDE {
- PacketPipe::InitOnIOThread();
+ virtual void InitOnIOThread(
+ const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) OVERRIDE {
+ PacketPipe::InitOnIOThread(task_runner);
// As we start the stream, assume that we are in a random
// place between two extra delays, thus multiplier = 1.0;
ScheduleExtraDelay(1.0);
@@ -261,8 +263,9 @@ class NetworkGlitchPipe : public PacketPipe {
max_outage_time_(average_outage_time * 2),
weak_factory_(this) {}
- virtual void InitOnIOThread() OVERRIDE {
- PacketPipe::InitOnIOThread();
+ virtual void InitOnIOThread(
+ const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) OVERRIDE {
+ PacketPipe::InitOnIOThread(task_runner);
Flip();
}
@@ -444,8 +447,8 @@ class UDPProxyImpl : public UDPProxy {
BuildPipe(&to_dest_pipe_, new PacketSender(socket_.get(), &destination_));
BuildPipe(&from_dest_pipe_,
new PacketSender(socket_.get(), &return_address_));
- to_dest_pipe_->InitOnIOThread();
- from_dest_pipe_->InitOnIOThread();
+ to_dest_pipe_->InitOnIOThread(base::MessageLoopProxy::current());
+ from_dest_pipe_->InitOnIOThread(base::MessageLoopProxy::current());
VLOG(0) << "From:" << local_port_.ToString();
VLOG(0) << "To:" << destination_.ToString();
@@ -463,8 +466,7 @@ class UDPProxyImpl : public UDPProxy {
stop_event->Signal();
}
- void ProcessPacket(scoped_refptr<net::IOBuffer> recv_buf,
- int len) {
+ void ProcessPacket(scoped_refptr<net::IOBuffer> recv_buf, int len) {
DCHECK_NE(len, net::ERR_IO_PENDING);
VLOG(1) << "Got packet, len = " << len;
if (len < 0) {
@@ -481,8 +483,7 @@ class UDPProxyImpl : public UDPProxy {
}
}
- void ReadCallback(scoped_refptr<net::IOBuffer> recv_buf,
- int len) {
+ void ReadCallback(scoped_refptr<net::IOBuffer> recv_buf, int len) {
ProcessPacket(recv_buf, len);
PollRead();
}
diff --git a/media/cast/test/utility/udp_proxy.h b/media/cast/test/utility/udp_proxy.h
index 322572a..41c686e 100644
--- a/media/cast/test/utility/udp_proxy.h
+++ b/media/cast/test/utility/udp_proxy.h
@@ -27,7 +27,9 @@ class PacketPipe {
PacketPipe();
virtual ~PacketPipe();
virtual void Send(scoped_ptr<transport::Packet> packet) = 0;
- virtual void InitOnIOThread();
+ // Allows injection of fake test runner for testing.
+ virtual void InitOnIOThread(
+ const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
virtual void AppendToPipe(scoped_ptr<PacketPipe> pipe);
protected:
scoped_ptr<PacketPipe> pipe_;
@@ -77,17 +79,15 @@ scoped_ptr<PacketPipe> NewRandomUnsortedDelay(double delay);
// packet is asically |min_delay| + random( |random_delay| )
// However, every now and then a delay of |big_delay| will be
// inserted (roughly every |seconds_between_big_delay| seconds).
-scoped_ptr<PacketPipe> NewRandomSortedDelay(
- double random_delay,
- double big_delay,
- double seconds_between_big_delay);
+scoped_ptr<PacketPipe> NewRandomSortedDelay(double random_delay,
+ double big_delay,
+ double seconds_between_big_delay);
// This PacketPipe emulates network outages. It basically waits
// for 0-2*|average_work_time| seconds, then kills the network for
// 0-|2*average_outage_time| seconds. Then it starts over again.
-scoped_ptr<PacketPipe> NewNetworkGlitchPipe(
- double average_work_time,
- double average_outage_time);
+scoped_ptr<PacketPipe> NewNetworkGlitchPipe(double average_work_time,
+ double average_outage_time);
// This method builds a stack of PacketPipes to emulate a reasonably
// good wifi network. ~5mbit, 1% packet loss, ~3ms latency.
diff --git a/media/cast/test/utility/udp_proxy_main.cc b/media/cast/test/utility/udp_proxy_main.cc
index 4e196d7..58019b4 100644
--- a/media/cast/test/utility/udp_proxy_main.cc
+++ b/media/cast/test/utility/udp_proxy_main.cc
@@ -15,7 +15,7 @@
int main(int argc, char** argv) {
if (argc < 5) {
fprintf(stderr,
- "Usage: udp_proxy <localport> <remotehost> <remoteport> <type>\n",
+ "Usage: udp_proxy <localport> <remotehost> <remoteport> <type>\n"
"Where type is one of: perfect, wifi, evil\n");
exit(1);
}
generated by cgit v1.1 at 2024-12-23 23:36:22 +0000