Migrate 2 test with Vp9 SVC test on PC framework

Bug: webrtc:10138
Change-Id: I6532fbaa392bfbf74337ffd879a707258053fc73
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146607
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28682}
This commit is contained in:
Artem Titov
2019-07-24 14:53:15 +02:00
committed by Commit Bot
parent 575998c2da
commit 733a78157d

View File

@ -1377,47 +1377,65 @@ ParamsWithLogging::Video SimulcastVp8VideoLow() {
false, ClipNameToClipPath("ConferenceMotion_1280_720_50")}; false, ClipNameToClipPath("ConferenceMotion_1280_720_50")};
} }
} // namespace } // namespace
*/
#if defined(RTC_ENABLE_VP9) #if defined(RTC_ENABLE_VP9)
// TODO(bugs.webrtc.org/10639) requires simulcast/SVC support in PC framework
TEST(PCFullStackTest, ScreenshareSlidesVP9_3SL_High_Fps) { TEST(PCFullStackTest, ScreenshareSlidesVP9_3SL_High_Fps) {
auto fixture = CreateVideoQualityTestFixture(); std::unique_ptr<NetworkEmulationManager> network_emulation_manager =
ParamsWithLogging screenshare; CreateNetworkEmulationManager();
screenshare.call.send_side_bwe = true; auto fixture = CreateTestFixture(
screenshare.video[0] = {true, 1850, 1110, 30, 50000, 200000, "pc_screenshare_slides_vp9_3sl_high_fps",
2000000, false, "VP9", 1, 0, 400000, CreateTwoNetworkLinks(network_emulation_manager.get(),
false, false, false, ""}; BuiltInNetworkBehaviorConfig()),
screenshare.screenshare[0] = {true, false, 10}; [](PeerConfigurer* alice) {
screenshare.analyzer = {"screenshare_slides_vp9_3sl_high_fps", 0.0, 0.0, VideoConfig video(1850, 1110, 30);
kTestDurationSec}; video.stream_label = "alice-video";
screenshare.ss[0] = { video.screen_share_config = ScreenShareConfig(TimeDelta::seconds(10));
std::vector<VideoStream>(), 0, 3, 2, InterLayerPredMode::kOn, video.simulcast_config = VideoSimulcastConfig(3, 2);
std::vector<SpatialLayer>(), true}; alice->AddVideoConfig(std::move(video));
fixture->RunWithAnalyzer(screenshare); },
[](PeerConfigurer* bob) {});
RunParams run_params(TimeDelta::seconds(kTestDurationSec));
run_params.video_codec_name = cricket::kVp9CodecName;
run_params.video_codec_required_params = {
{kVP9FmtpProfileId, VP9ProfileToString(VP9Profile::kProfile0)}};
run_params.use_flex_fec = false;
run_params.use_ulp_fec = false;
fixture->Run(std::move(run_params));
} }
// TODO(bugs.webrtc.org/10639) requires simulcast/SVC support in PC framework
TEST(PCFullStackTest, ScreenshareSlidesVP9_3SL_Variable_Fps) { TEST(PCFullStackTest, ScreenshareSlidesVP9_3SL_Variable_Fps) {
webrtc::test::ScopedFieldTrials override_trials( webrtc::test::ScopedFieldTrials override_trials(
AppendFieldTrials("WebRTC-VP9VariableFramerateScreenshare/" AppendFieldTrials("WebRTC-VP9VariableFramerateScreenshare/"
"Enabled,min_qp:32,min_fps:5.0,undershoot:30,frames_" "Enabled,min_qp:32,min_fps:5.0,undershoot:30,frames_"
"before_steady_state:5/")); "before_steady_state:5/"));
auto fixture = CreateVideoQualityTestFixture(); std::unique_ptr<NetworkEmulationManager> network_emulation_manager =
ParamsWithLogging screenshare; CreateNetworkEmulationManager();
screenshare.call.send_side_bwe = true; auto fixture = CreateTestFixture(
screenshare.video[0] = {true, 1850, 1110, 30, 50000, 200000, "pc_screenshare_slides_vp9_3sl_variable_fps",
2000000, false, "VP9", 1, 0, 400000, CreateTwoNetworkLinks(network_emulation_manager.get(),
false, false, false, ""}; BuiltInNetworkBehaviorConfig()),
screenshare.screenshare[0] = {true, false, 10}; [](PeerConfigurer* alice) {
screenshare.analyzer = {"screenshare_slides_vp9_3sl_variable_fps", 0.0, 0.0, VideoConfig video(1850, 1110, 30);
kTestDurationSec}; video.stream_label = "alice-video";
screenshare.ss[0] = { video.screen_share_config = ScreenShareConfig(TimeDelta::seconds(10));
std::vector<VideoStream>(), 0, 3, 2, InterLayerPredMode::kOn, video.simulcast_config = VideoSimulcastConfig(3, 2);
std::vector<SpatialLayer>(), true}; alice->AddVideoConfig(std::move(video));
fixture->RunWithAnalyzer(screenshare); },
[](PeerConfigurer* bob) {});
RunParams run_params(TimeDelta::seconds(kTestDurationSec));
run_params.video_codec_name = cricket::kVp9CodecName;
run_params.video_codec_required_params = {
{kVP9FmtpProfileId, VP9ProfileToString(VP9Profile::kProfile0)}};
run_params.use_flex_fec = false;
run_params.use_ulp_fec = false;
fixture->Run(std::move(run_params));
} }
#endif // defined(RTC_ENABLE_VP9)
/*
// TODO(bugs.webrtc.org/10639) requires simulcast/SVC support in PC framework // TODO(bugs.webrtc.org/10639) requires simulcast/SVC support in PC framework
TEST(PCFullStackTest, VP9SVC_3SL_High) { TEST(PCFullStackTest, VP9SVC_3SL_High) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();