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

Unified Diff: webrtc/video/video_quality_test.h

Issue 2997883002: Video/Screenshare loopback tool.
Patch Set: Rebase Created 3 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/BUILD.gn ('k') | webrtc/video/video_quality_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/video_quality_test.h
diff --git a/webrtc/video/video_quality_test.h b/webrtc/video/video_quality_test.h
index 3bb5cd282eac87994e4c8b2a7062c8b069038205..de4eea555ee947be164a7b9c483b0dd23826ce88 100644
--- a/webrtc/video/video_quality_test.h
+++ b/webrtc/video/video_quality_test.h
@@ -93,8 +93,10 @@ class VideoQualityTest : public test::CallTest {
};
VideoQualityTest();
- void RunWithAnalyzer(const Params& params);
- void RunWithRenderers(const Params& params);
+ void SetupCall(const Call::Config::BitrateConfig& bitrate_config,
+ const FakeNetworkPipe::Config& pipe_cofing);
+ void AddParams(const Params& p);
+ void RunWithRenderers();
static void FillScalabilitySettings(
Params* params,
@@ -114,7 +116,7 @@ class VideoQualityTest : public test::CallTest {
// Helper methods accessing only params_.
std::string GenerateGraphTitle() const;
- void CheckParams();
+ void CheckParams(Params* params);
// Helper static methods.
static VideoStream DefaultVideoStream(const Params& params);
@@ -122,19 +124,33 @@ class VideoQualityTest : public test::CallTest {
static std::vector<int> ParseCSV(const std::string& str);
// Helper methods for setting up the call.
- void CreateCapturer();
+ void CreateCapturer(Params* params,
+ std::unique_ptr<test::VideoCapturer>* video_capturer_);
void SetupThumbnailCapturers(size_t num_thumbnail_streams);
- void SetupVideo(Transport* send_transport, Transport* recv_transport);
+ void SetupVideo(
+ Transport* send_transport,
+ Transport* recv_transport,
+ Params* params,
+ VideoSendStream::Config* video_send_config,
+ VideoEncoderConfig* video_encoder_config,
+ std::unique_ptr<VideoEncoder>* video_encoder,
+ std::vector<VideoReceiveStream::Config>* video_receive_configs,
+ std::vector<std::unique_ptr<VideoDecoder>>* allocated_decoders,
+ std::vector<uint32_t>* send_ssrcs,
+ std::vector<uint32_t>* send_rtx_ssrcs);
void SetupThumbnails(Transport* send_transport, Transport* recv_transport);
void DestroyThumbnailStreams();
- void SetupScreenshareOrSVC();
+ void SetupScreenshareOrSVC(
+ Params* params,
+ VideoEncoderConfig* video_encoder_config,
+ std::unique_ptr<test::FrameGenerator>* frame_generator);
void SetupAudio(int send_channel_id,
int receive_channel_id,
Transport* transport,
AudioReceiveStream** audio_receive_stream);
- void StartEncodedFrameLogs(VideoSendStream* stream);
- void StartEncodedFrameLogs(VideoReceiveStream* stream);
+ void StartEncodedFrameLogs(Params* params, VideoSendStream* stream);
+ void StartEncodedFrameLogs(Params* params, VideoReceiveStream* stream);
// We need a more general capturer than the FrameGeneratorCapturer.
std::unique_ptr<test::VideoCapturer> video_capturer_;
@@ -158,7 +174,14 @@ class VideoQualityTest : public test::CallTest {
VideoSendStream::DegradationPreference degradation_preference_ =
VideoSendStream::DegradationPreference::kMaintainFramerate;
- Params params_;
+
+ std::vector<Params> params_;
+
+ Call::Config::BitrateConfig bitrate_config_;
+ FakeNetworkPipe::Config pipe_config_;
+ std::unique_ptr<test::DirectTransport> send_transport_;
+ std::unique_ptr<test::DirectTransport> recv_transport_;
+ uint32_t last_ssrc = 10000;
};
} // namespace webrtc
« no previous file with comments | « webrtc/video/BUILD.gn ('k') | webrtc/video/video_quality_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698