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

Unified Diff: webrtc/video/video_send_stream_tests.cc

Issue 1273363005: Add send transports to individual webrtc::Call streams. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase+comment Created 5 years, 4 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/video/video_send_stream.cc ('k') | webrtc/video_receive_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/video_send_stream_tests.cc
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index 8b18622e9e9f54f06c05580a908f4ab7d11b0245..4a68fe812773e3bed481ab0cfc884201a40acaee 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -59,11 +59,11 @@ class VideoSendStreamTest : public test::CallTest {
};
TEST_F(VideoSendStreamTest, CanStartStartedStream) {
- test::NullTransport transport;
- Call::Config call_config(&transport);
+ Call::Config call_config;
CreateSenderCall(call_config);
- CreateSendConfig(1);
+ test::NullTransport transport;
+ CreateSendConfig(1, &transport);
CreateStreams();
send_stream_->Start();
send_stream_->Start();
@@ -71,11 +71,11 @@ TEST_F(VideoSendStreamTest, CanStartStartedStream) {
}
TEST_F(VideoSendStreamTest, CanStopStoppedStream) {
- test::NullTransport transport;
- Call::Config call_config(&transport);
+ Call::Config call_config;
CreateSenderCall(call_config);
- CreateSendConfig(1);
+ test::NullTransport transport;
+ CreateSendConfig(1, &transport);
CreateStreams();
send_stream_->Stop();
send_stream_->Stop();
@@ -614,7 +614,7 @@ void VideoSendStreamTest::TestPacketFragmentationSize(VideoFormat format,
}
Call::Config GetSenderCallConfig() override {
- Call::Config config(SendTransport());
+ Call::Config config;
const int kMinBitrateBps = 30000;
config.bitrate_config.min_bitrate_bps = kMinBitrateBps;
return config;
@@ -1044,10 +1044,10 @@ TEST_F(VideoSendStreamTest, CanReconfigureToUseStartBitrateAbovePreviousMax) {
int start_bitrate_kbps_ GUARDED_BY(crit_);
};
- test::NullTransport transport;
- CreateSenderCall(Call::Config(&transport));
+ CreateSenderCall(Call::Config());
- CreateSendConfig(1);
+ test::NullTransport transport;
+ CreateSendConfig(1, &transport);
Call::Config::BitrateConfig bitrate_config;
bitrate_config.start_bitrate_bps =
@@ -1104,10 +1104,10 @@ TEST_F(VideoSendStreamTest, CapturesTextureAndVideoFrames) {
};
// Initialize send stream.
- test::NullTransport transport;
- CreateSenderCall(Call::Config(&transport));
+ CreateSenderCall(Call::Config());
- CreateSendConfig(1);
+ test::NullTransport transport;
+ CreateSendConfig(1, &transport);
FrameObserver observer;
send_config_.pre_encode_callback = &observer;
CreateStreams();
@@ -1659,7 +1659,7 @@ TEST_F(VideoSendStreamTest, ReconfigureBitratesSetsEncoderBitratesCorrectly) {
}
Call::Config GetSenderCallConfig() override {
- Call::Config config(SendTransport());
+ Call::Config config;
config.bitrate_config.min_bitrate_bps = kMinBitrateKbps * 1000;
config.bitrate_config.start_bitrate_bps = kStartBitrateKbps * 1000;
config.bitrate_config.max_bitrate_bps = kMaxBitrateKbps * 1000;
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video_receive_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698