Index: webrtc/test/call_test.cc |
diff --git a/webrtc/test/call_test.cc b/webrtc/test/call_test.cc |
index 519c89931a900716fb4650d7a54d37007e0ab402..d6cbaa6d7ee02a0c097f62761ea8824edc028df7 100644 |
--- a/webrtc/test/call_test.cc |
+++ b/webrtc/test/call_test.cc |
@@ -11,6 +11,7 @@ |
#include "webrtc/config.h" |
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" |
#include "webrtc/test/call_test.h" |
+#include "webrtc/test/encoder_settings.h" |
#include "webrtc/test/testsupport/fileutils.h" |
#include "webrtc/voice_engine/include/voe_base.h" |
#include "webrtc/voice_engine/include/voe_codec.h" |
@@ -94,11 +95,7 @@ |
} |
if (num_video_streams_ > 0) { |
- int width = kDefaultWidth; |
- int height = kDefaultHeight; |
- int frame_rate = kDefaultFramerate; |
- test->ModifyVideoCaptureStartResolution(&width, &height, &frame_rate); |
- CreateFrameGeneratorCapturer(frame_rate, width, height); |
+ CreateFrameGeneratorCapturer(); |
test->OnFrameGeneratorCapturerCreated(frame_generator_capturer_.get()); |
} |
@@ -189,8 +186,7 @@ |
kFakeVideoSendPayloadType; |
video_send_config_.rtp.extensions.push_back( |
RtpExtension(RtpExtension::kAbsSendTimeUri, kAbsSendTimeExtensionId)); |
- FillEncoderConfiguration(num_video_streams, &video_encoder_config_); |
- |
+ video_encoder_config_.streams = test::CreateVideoStreams(num_video_streams); |
for (size_t i = 0; i < num_video_streams; ++i) |
video_send_config_.rtp.ssrcs.push_back(kVideoSendSsrcs[i]); |
video_send_config_.rtp.extensions.push_back(RtpExtension( |
@@ -240,20 +236,17 @@ |
} |
void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock, |
- float speed, |
- int framerate, |
- int width, |
- int height) { |
+ float speed) { |
+ VideoStream stream = video_encoder_config_.streams.back(); |
frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( |
- width, height, framerate * speed, clock)); |
+ stream.width, stream.height, stream.max_framerate * speed, clock)); |
video_send_stream_->SetSource(frame_generator_capturer_.get()); |
} |
-void CallTest::CreateFrameGeneratorCapturer(int framerate, |
- int width, |
- int height) { |
- frame_generator_capturer_.reset( |
- test::FrameGeneratorCapturer::Create(width, height, framerate, clock_)); |
+void CallTest::CreateFrameGeneratorCapturer() { |
+ VideoStream stream = video_encoder_config_.streams.back(); |
+ frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( |
+ stream.width, stream.height, stream.max_framerate, clock_)); |
video_send_stream_->SetSource(frame_generator_capturer_.get()); |
} |
@@ -353,9 +346,6 @@ |
voe_recv_.voice_engine = nullptr; |
} |
-const int CallTest::kDefaultWidth; |
-const int CallTest::kDefaultHeight; |
-const int CallTest::kDefaultFramerate; |
const int CallTest::kDefaultTimeoutMs = 30 * 1000; |
const int CallTest::kLongTimeoutMs = 120 * 1000; |
const uint8_t CallTest::kVideoSendPayloadType = 100; |
@@ -414,10 +404,6 @@ |
std::vector<VideoReceiveStream::Config>* receive_configs, |
VideoEncoderConfig* encoder_config) {} |
-void BaseTest::ModifyVideoCaptureStartResolution(int* width, |
- int* heigt, |
- int* frame_rate) {} |
- |
void BaseTest::OnVideoStreamsCreated( |
VideoSendStream* send_stream, |
const std::vector<VideoReceiveStream*>& receive_streams) {} |