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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/video/end_to_end_tests.cc

Issue 2784543002: Revert of Don't hardcode MediaType::ANY in FakeNetworkPipe. (Closed)
Patch Set: Created 3 years, 9 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 | « webrtc/test/rtp_rtcp_observer.h ('k') | webrtc/video/replay.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/end_to_end_tests.cc
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index 87289f19d6b7ebb049caf01fafbbf27a7c34b06c..baf7161252935d5bf964c8c6e5453eb1a12993ce 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -202,10 +202,8 @@
CreateCalls(Call::Config(&event_log_), Call::Config(&event_log_));
- test::DirectTransport sender_transport(
- sender_call_.get(), MediaType::VIDEO);
- test::DirectTransport receiver_transport(
- receiver_call_.get(), MediaType::VIDEO);
+ test::DirectTransport sender_transport(sender_call_.get());
+ test::DirectTransport receiver_transport(receiver_call_.get());
sender_transport.SetReceiver(receiver_call_->Receiver());
receiver_transport.SetReceiver(sender_call_->Receiver());
@@ -251,10 +249,8 @@
CreateCalls(Call::Config(&event_log_), Call::Config(&event_log_));
- test::DirectTransport sender_transport(
- sender_call_.get(), MediaType::VIDEO);
- test::DirectTransport receiver_transport(
- receiver_call_.get(), MediaType::VIDEO);
+ test::DirectTransport sender_transport(sender_call_.get());
+ test::DirectTransport receiver_transport(receiver_call_.get());
sender_transport.SetReceiver(receiver_call_->Receiver());
receiver_transport.SetReceiver(sender_call_->Receiver());
@@ -525,7 +521,6 @@
test::PacketTransport* CreateReceiveTransport() override {
test::PacketTransport* receive_transport = new test::PacketTransport(
nullptr, this, test::PacketTransport::kReceiver,
- MediaType::AUDIO,
FakeNetworkPipe::Config());
receive_transport_ = receive_transport;
return receive_transport;
@@ -787,8 +782,7 @@
FakeNetworkPipe::Config config;
config.queue_delay_ms = kNetworkDelayMs;
return new test::PacketTransport(sender_call, this,
- test::PacketTransport::kSender,
- MediaType::VIDEO, config);
+ test::PacketTransport::kSender, config);
}
void OnFrame(const VideoFrame& video_frame) override {
@@ -967,8 +961,7 @@
FakeNetworkPipe::Config config;
config.queue_delay_ms = kNetworkDelayMs;
return new test::PacketTransport(sender_call, this,
- test::PacketTransport::kSender,
- MediaType::VIDEO, config);
+ test::PacketTransport::kSender, config);
}
// TODO(holmer): Investigate why we don't send FEC packets when the bitrate
@@ -1310,10 +1303,8 @@
CreateCalls(Call::Config(&event_log_), Call::Config(&event_log_));
- test::DirectTransport send_transport(
- sender_call_.get(), MediaType::VIDEO);
- test::DirectTransport receive_transport(
- receiver_call_.get(), MediaType::VIDEO);
+ test::DirectTransport send_transport(sender_call_.get());
+ test::DirectTransport receive_transport(receiver_call_.get());
PacketInputObserver input_observer(receiver_call_->Receiver());
send_transport.SetReceiver(&input_observer);
receive_transport.SetReceiver(sender_call_->Receiver());
@@ -1540,10 +1531,10 @@
VideoReceiveStream::Config* receive_config) {
}
virtual test::DirectTransport* CreateSendTransport(Call* sender_call) {
- return new test::DirectTransport(sender_call, MediaType::VIDEO);
+ return new test::DirectTransport(sender_call);
}
virtual test::DirectTransport* CreateReceiveTransport(Call* receiver_call) {
- return new test::DirectTransport(receiver_call, MediaType::VIDEO);
+ return new test::DirectTransport(receiver_call);
}
};
@@ -1622,7 +1613,7 @@
RtpExtensionHeaderObserver(Call* sender_call,
const uint32_t& first_media_ssrc,
const std::map<uint32_t, uint32_t>& ssrc_map)
- : DirectTransport(sender_call, MediaType::VIDEO),
+ : DirectTransport(sender_call),
done_(false, false),
parser_(RtpHeaderParser::Create()),
first_media_ssrc_(first_media_ssrc),
@@ -1938,10 +1929,8 @@
CreateCalls(Call::Config(&event_log_), Call::Config(&event_log_));
- test::DirectTransport sender_transport(
- sender_call_.get(), MediaType::VIDEO);
- test::DirectTransport receiver_transport(
- receiver_call_.get(), MediaType::VIDEO);
+ test::DirectTransport sender_transport(sender_call_.get());
+ test::DirectTransport receiver_transport(receiver_call_.get());
sender_transport.SetReceiver(receiver_call_->Receiver());
receiver_transport.SetReceiver(sender_call_->Receiver());
@@ -2105,7 +2094,6 @@
test::PacketTransport* CreateReceiveTransport() override {
receive_transport_ = new test::PacketTransport(
nullptr, this, test::PacketTransport::kReceiver,
- MediaType::VIDEO,
FakeNetworkPipe::Config());
return receive_transport_;
}
@@ -3069,8 +3057,7 @@
FakeNetworkPipe::Config network_config;
network_config.loss_percent = 5;
return new test::PacketTransport(
- sender_call, this, test::PacketTransport::kSender, MediaType::VIDEO,
- network_config);
+ sender_call, this, test::PacketTransport::kSender, network_config);
}
Call::Config GetSenderCallConfig() override {
@@ -3624,11 +3611,9 @@
test::PacketTransport send_transport(sender_call_.get(), &observer,
test::PacketTransport::kSender,
- MediaType::VIDEO,
FakeNetworkPipe::Config());
test::PacketTransport receive_transport(nullptr, &observer,
test::PacketTransport::kReceiver,
- MediaType::VIDEO,
FakeNetworkPipe::Config());
send_transport.SetReceiver(receiver_call_->Receiver());
receive_transport.SetReceiver(sender_call_->Receiver());
@@ -3921,11 +3906,9 @@
FakeNetworkPipe::Config config;
config.queue_delay_ms = kSendDelayMs;
- test::DirectTransport sender_transport(
- config, sender_call_.get(), MediaType::VIDEO);
+ test::DirectTransport sender_transport(config, sender_call_.get());
config.queue_delay_ms = kReceiveDelayMs;
- test::DirectTransport receiver_transport(
- config, receiver_call_.get(), MediaType::VIDEO);
+ test::DirectTransport receiver_transport(config, receiver_call_.get());
sender_transport.SetReceiver(receiver_call_->Receiver());
receiver_transport.SetReceiver(sender_call_->Receiver());
@@ -3987,7 +3970,7 @@
CreateCalls(config, config);
receiver_call_->SignalChannelNetworkState(network_to_bring_up, kNetworkUp);
- test::DirectTransport sender_transport(sender_call_.get(), MediaType::VIDEO);
+ test::DirectTransport sender_transport(sender_call_.get());
sender_transport.SetReceiver(receiver_call_->Receiver());
CreateSendConfig(1, 0, 0, &sender_transport);
CreateMatchingReceiveConfigs(transport);
« no previous file with comments | « webrtc/test/rtp_rtcp_observer.h ('k') | webrtc/video/replay.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698