admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable quality-scaling in all video perf tests.

Browse Source 
Bug: None
Change-Id: Idc8d4b3372dcabdc4b419f1cce3d02adc3c30128
Reviewed-on: https://webrtc-review.googlesource.com/c/116983
Commit-Queue: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26221}
This commit is contained in:
Stefan Holmer 2019-01-11 15:39:08 +01:00 committed by Commit Bot
parent 83953e4d95
commit 1f7a008261
2 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
video/full_stack_tests.cc
View File

@ -124,9 +124,9 @@ TEST(FullStackTest, ForemanCifWithoutPacketLossVp9) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 700000, foreman_cif.video[0] = {true, 352, 288, 30, 700000, 700000, 700000,
700000, 700000, false, "VP9", 1, false, "VP9", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_net_delay_0_0_plr_0_VP9", 0.0, 0.0, foreman_cif.analyzer = {"foreman_cif_net_delay_0_0_plr_0_VP9", 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
fixture->RunWithAnalyzer(foreman_cif); fixture->RunWithAnalyzer(foreman_cif);
@ -136,9 +136,9 @@ TEST_P(GenericDescriptorTest, ForemanCifPlr5Vp9) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "VP9", 1, false, "VP9", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {GetTestName("foreman_cif_delay_50_0_plr_5_VP9"), 0.0, foreman_cif.analyzer = {GetTestName("foreman_cif_delay_50_0_plr_5_VP9"), 0.0,
0.0, kFullStackTestDurationSecs}; 0.0, kFullStackTestDurationSecs};
foreman_cif.config->loss_percent = 5; foreman_cif.config->loss_percent = 5;
@ -167,7 +167,7 @@ TEST(FullStackTest, GeneratorWithoutPacketLossVp9Profile2) {
generator.call.send_side_bwe = true; generator.call.send_side_bwe = true;
generator.video[0] = { generator.video[0] = {
true, 352, 288, 30, 700000, 700000, 700000, false, "VP9", true, 352, 288, 30, 700000, 700000, 700000, false, "VP9",
1, 0, 0, false, false, false, "GeneratorI010", 0, vp92}; 1, 0, 0, false, false, true, "GeneratorI010", 0, vp92};
generator.analyzer = {"generator_net_delay_0_0_plr_0_VP9Profile2", 0.0, 0.0, generator.analyzer = {"generator_net_delay_0_0_plr_0_VP9Profile2", 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
fixture->RunWithAnalyzer(generator); fixture->RunWithAnalyzer(generator);
@ -177,10 +177,9 @@ TEST(FullStackTest, ForemanCifWithoutPacketLossMultiplexI420Frame) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 700000, foreman_cif.video[0] = {true, 352, 288, 30, 700000, 700000, 700000,
700000, 700000, false, "multiplex", 1, false, "multiplex", 1, 0, 0, false, false,
0, 0, false, false, false, false, "foreman_cif"};
"foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_net_delay_0_0_plr_0_Multiplex", 0.0, 0.0, foreman_cif.analyzer = {"foreman_cif_net_delay_0_0_plr_0_Multiplex", 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
fixture->RunWithAnalyzer(foreman_cif); fixture->RunWithAnalyzer(foreman_cif);
@ -191,10 +190,9 @@ TEST(FullStackTest, GeneratorWithoutPacketLossMultiplexI420AFrame) {
ParamsWithLogging generator; ParamsWithLogging generator;
generator.call.send_side_bwe = true; generator.call.send_side_bwe = true;
generator.video[0] = {true, 352, 288, 30, 700000, generator.video[0] = {
700000, 700000, false, "multiplex", 1, true, 352, 288, 30, 700000, 700000, 700000, false,
0, 0, false, false, false, "multiplex", 1, 0, 0, false, false, false, "GeneratorI420A"};
"GeneratorI420A"};
generator.analyzer = {"generator_net_delay_0_0_plr_0_Multiplex", 0.0, 0.0, generator.analyzer = {"generator_net_delay_0_0_plr_0_Multiplex", 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
fixture->RunWithAnalyzer(generator); fixture->RunWithAnalyzer(generator);
@ -212,9 +210,9 @@ TEST(FullStackTest, MAYBE_ParisQcifWithoutPacketLoss) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging paris_qcif; ParamsWithLogging paris_qcif;
paris_qcif.call.send_side_bwe = true; paris_qcif.call.send_side_bwe = true;
paris_qcif.video[0] = {true, 176, 144, 30, 300000, paris_qcif.video[0] = {true, 176, 144, 30, 300000, 300000,
300000, 300000, false, "VP8", 1, 300000, false, "VP8", 1, 0, 0,
0, 0, false, false, false, "paris_qcif"}; false, false, true, "paris_qcif"};
paris_qcif.analyzer = {"net_delay_0_0_plr_0", 36.0, 0.96, paris_qcif.analyzer = {"net_delay_0_0_plr_0", 36.0, 0.96,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
fixture->RunWithAnalyzer(paris_qcif); fixture->RunWithAnalyzer(paris_qcif);
@ -225,9 +223,9 @@ TEST_P(GenericDescriptorTest, ForemanCifWithoutPacketLoss) {
// TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif. // TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif.
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 700000, foreman_cif.video[0] = {true, 352, 288, 30, 700000, 700000, 700000,
700000, 700000, false, "VP8", 1, false, "VP8", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {GetTestName("foreman_cif_net_delay_0_0_plr_0"), 0.0, foreman_cif.analyzer = {GetTestName("foreman_cif_net_delay_0_0_plr_0"), 0.0,
0.0, kFullStackTestDurationSecs}; 0.0, kFullStackTestDurationSecs};
foreman_cif.call.generic_descriptor = GenericDescriptorEnabled(); foreman_cif.call.generic_descriptor = GenericDescriptorEnabled();
@ -238,9 +236,9 @@ TEST_P(GenericDescriptorTest, ForemanCif30kbpsWithoutPacketLoss) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 10, 30000, foreman_cif.video[0] = {true, 352, 288, 10, 30000, 30000, 30000,
30000, 30000, false, "VP8", 1, false, "VP8", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {GetTestName("foreman_cif_30kbps_net_delay_0_0_plr_0"), foreman_cif.analyzer = {GetTestName("foreman_cif_30kbps_net_delay_0_0_plr_0"),
0.0, 0.0, kFullStackTestDurationSecs}; 0.0, 0.0, kFullStackTestDurationSecs};
foreman_cif.call.generic_descriptor = GenericDescriptorEnabled(); foreman_cif.call.generic_descriptor = GenericDescriptorEnabled();
@ -258,7 +256,7 @@ TEST_P(GenericDescriptorTest,
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 10, 30000, 30000, 30000, foreman_cif.video[0] = {true, 352, 288, 10, 30000, 30000, 30000,
false, "VP8", 1, 0, 0, false, false, false, "VP8", 1, 0, 0, false, false,
false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = { foreman_cif.analyzer = {
GetTestName("foreman_cif_30kbps_net_delay_0_0_plr_0_trusted_rate_ctrl"), GetTestName("foreman_cif_30kbps_net_delay_0_0_plr_0_trusted_rate_ctrl"),
0.0, 0.0, kFullStackTestDurationSecs}; 0.0, 0.0, kFullStackTestDurationSecs};
@ -266,7 +264,7 @@ TEST_P(GenericDescriptorTest,
fixture->RunWithAnalyzer(foreman_cif); fixture->RunWithAnalyzer(foreman_cif);
} }
// Link capacity below default start rate. Automatic down scaling enabled. // Link capacity below default start rate.
TEST(FullStackTest, ForemanCifLink150kbpsWithoutPacketLoss) { TEST(FullStackTest, ForemanCifLink150kbpsWithoutPacketLoss) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
@ -285,9 +283,9 @@ TEST_P(GenericDescriptorTest, ForemanCifPlr5) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "VP8", 1, false, "VP8", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {GetTestName("foreman_cif_delay_50_0_plr_5"), 0.0, 0.0, foreman_cif.analyzer = {GetTestName("foreman_cif_delay_50_0_plr_5"), 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
foreman_cif.config->loss_percent = 5; foreman_cif.config->loss_percent = 5;
@ -300,9 +298,9 @@ TEST_P(GenericDescriptorTest, ForemanCifPlr5Ulpfec) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "VP8", 1, false, "VP8", 1, 0, 0, true, false,
0, 0, true, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {GetTestName("foreman_cif_delay_50_0_plr_5_ulpfec"), foreman_cif.analyzer = {GetTestName("foreman_cif_delay_50_0_plr_5_ulpfec"),
0.0, 0.0, kFullStackTestDurationSecs}; 0.0, 0.0, kFullStackTestDurationSecs};
foreman_cif.config->loss_percent = 5; foreman_cif.config->loss_percent = 5;
@ -315,9 +313,9 @@ TEST(FullStackTest, ForemanCifPlr5Flexfec) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "VP8", 1, false, "VP8", 1, 0, 0, false, true,
0, 0, false, true, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_flexfec", 0.0, 0.0, foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_flexfec", 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
foreman_cif.config->loss_percent = 5; foreman_cif.config->loss_percent = 5;
@ -329,9 +327,9 @@ TEST(FullStackTest, ForemanCif500kbpsPlr3Flexfec) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "VP8", 1, false, "VP8", 1, 0, 0, false, true,
0, 0, false, true, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_500kbps_delay_50_0_plr_3_flexfec", 0.0, foreman_cif.analyzer = {"foreman_cif_500kbps_delay_50_0_plr_3_flexfec", 0.0,
0.0, kFullStackTestDurationSecs}; 0.0, kFullStackTestDurationSecs};
foreman_cif.config->loss_percent = 3; foreman_cif.config->loss_percent = 3;
@ -344,9 +342,9 @@ TEST(FullStackTest, ForemanCif500kbpsPlr3Ulpfec) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "VP8", 1, false, "VP8", 1, 0, 0, true, false,
0, 0, true, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_500kbps_delay_50_0_plr_3_ulpfec", 0.0, foreman_cif.analyzer = {"foreman_cif_500kbps_delay_50_0_plr_3_ulpfec", 0.0,
0.0, kFullStackTestDurationSecs}; 0.0, kFullStackTestDurationSecs};
foreman_cif.config->loss_percent = 3; foreman_cif.config->loss_percent = 3;
@ -361,9 +359,9 @@ TEST(FullStackTest, ForemanCifWithoutPacketlossH264) {
// TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif. // TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif.
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 700000, foreman_cif.video[0] = {true, 352, 288, 30, 700000, 700000, 700000,
700000, 700000, false, "H264", 1, false, "H264", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_net_delay_0_0_plr_0_H264", 0.0, 0.0, foreman_cif.analyzer = {"foreman_cif_net_delay_0_0_plr_0_H264", 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
fixture->RunWithAnalyzer(foreman_cif); fixture->RunWithAnalyzer(foreman_cif);
@ -373,9 +371,9 @@ TEST(FullStackTest, ForemanCif30kbpsWithoutPacketlossH264) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 10, 30000, foreman_cif.video[0] = {true, 352, 288, 10, 30000, 30000, 30000,
30000, 30000, false, "H264", 1, false, "H264", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_30kbps_net_delay_0_0_plr_0_H264", 0.0, foreman_cif.analyzer = {"foreman_cif_30kbps_net_delay_0_0_plr_0_H264", 0.0,
0.0, kFullStackTestDurationSecs}; 0.0, kFullStackTestDurationSecs};
fixture->RunWithAnalyzer(foreman_cif); fixture->RunWithAnalyzer(foreman_cif);
@ -385,9 +383,9 @@ TEST_P(GenericDescriptorTest, ForemanCifPlr5H264) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "H264", 1, false, "H264", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {GetTestName("foreman_cif_delay_50_0_plr_5_H264"), 0.0, foreman_cif.analyzer = {GetTestName("foreman_cif_delay_50_0_plr_5_H264"), 0.0,
0.0, kFullStackTestDurationSecs}; 0.0, kFullStackTestDurationSecs};
foreman_cif.config->loss_percent = 5; foreman_cif.config->loss_percent = 5;
@ -403,9 +401,9 @@ TEST(FullStackTest, ForemanCifPlr5H264SpsPpsIdrIsKeyframe) {
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "H264", 1, false, "H264", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_H264_sps_pps_idr", 0.0, foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_H264_sps_pps_idr", 0.0,
0.0, kFullStackTestDurationSecs}; 0.0, kFullStackTestDurationSecs};
foreman_cif.config->loss_percent = 5; foreman_cif.config->loss_percent = 5;
@ -418,9 +416,9 @@ TEST(FullStackTest, ForemanCifPlr5H264Flexfec) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "H264", 1, false, "H264", 1, 0, 0, false, true,
0, 0, false, true, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_H264_flexfec", 0.0, 0.0, foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_H264_flexfec", 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
foreman_cif.config->loss_percent = 5; foreman_cif.config->loss_percent = 5;
@ -434,9 +432,9 @@ TEST(FullStackTest, DISABLED_ForemanCifPlr5H264Ulpfec) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "H264", 1, false, "H264", 1, 0, 0, true, false,
0, 0, true, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_H264_ulpfec", 0.0, 0.0, foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_H264_ulpfec", 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
foreman_cif.config->loss_percent = 5; foreman_cif.config->loss_percent = 5;
@ -449,9 +447,9 @@ TEST(FullStackTest, ForemanCif500kbps) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "VP8", 1, false, "VP8", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_500kbps", 0.0, 0.0, foreman_cif.analyzer = {"foreman_cif_500kbps", 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
foreman_cif.config->queue_length_packets = 0; foreman_cif.config->queue_length_packets = 0;
@ -464,9 +462,9 @@ TEST(FullStackTest, ForemanCif500kbpsLimitedQueue) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "VP8", 1, false, "VP8", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_500kbps_32pkts_queue", 0.0, 0.0, foreman_cif.analyzer = {"foreman_cif_500kbps_32pkts_queue", 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
foreman_cif.config->queue_length_packets = 32; foreman_cif.config->queue_length_packets = 32;
@ -479,9 +477,9 @@ TEST(FullStackTest, ForemanCif500kbps100ms) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "VP8", 1, false, "VP8", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_500kbps_100ms", 0.0, 0.0, foreman_cif.analyzer = {"foreman_cif_500kbps_100ms", 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
foreman_cif.config->queue_length_packets = 0; foreman_cif.config->queue_length_packets = 0;
@ -494,9 +492,9 @@ TEST_P(GenericDescriptorTest, ForemanCif500kbps100msLimitedQueue) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "VP8", 1, false, "VP8", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {GetTestName("foreman_cif_500kbps_100ms_32pkts_queue"), foreman_cif.analyzer = {GetTestName("foreman_cif_500kbps_100ms_32pkts_queue"),
0.0, 0.0, kFullStackTestDurationSecs}; 0.0, 0.0, kFullStackTestDurationSecs};
foreman_cif.config->queue_length_packets = 32; foreman_cif.config->queue_length_packets = 32;
@ -510,9 +508,9 @@ TEST(FullStackTest, ForemanCif500kbps100msLimitedQueueRecvBwe) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = false; foreman_cif.call.send_side_bwe = false;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 500000, 2000000,
500000, 2000000, false, "VP8", 1, false, "VP8", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_500kbps_100ms_32pkts_queue_recv_bwe", foreman_cif.analyzer = {"foreman_cif_500kbps_100ms_32pkts_queue_recv_bwe",
0.0, 0.0, kFullStackTestDurationSecs}; 0.0, 0.0, kFullStackTestDurationSecs};
foreman_cif.config->queue_length_packets = 32; foreman_cif.config->queue_length_packets = 32;
@ -525,9 +523,9 @@ TEST(FullStackTest, ForemanCif1000kbps100msLimitedQueue) {
auto fixture = CreateVideoQualityTestFixture(); auto fixture = CreateVideoQualityTestFixture();
ParamsWithLogging foreman_cif; ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true; foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {true, 352, 288, 30, 30000, foreman_cif.video[0] = {true, 352, 288, 30, 30000, 2000000, 2000000,
2000000, 2000000, false, "VP8", 1, false, "VP8", 1, 0, 0, false, false,
0, 0, false, false, false, "foreman_cif"}; true, "foreman_cif"};
foreman_cif.analyzer = {"foreman_cif_1000kbps_100ms_32pkts_queue", 0.0, 0.0, foreman_cif.analyzer = {"foreman_cif_1000kbps_100ms_32pkts_queue", 0.0, 0.0,
kFullStackTestDurationSecs}; kFullStackTestDurationSecs};
foreman_cif.config->queue_length_packets = 32; foreman_cif.config->queue_length_packets = 32;

4
video/video_quality_test.cc
View File

@ -705,6 +705,8 @@ void VideoQualityTest::SetupVideo(Transport* send_transport,
video_encoder_configs_[video_idx].encoder_specific_settings = video_encoder_configs_[video_idx].encoder_specific_settings =
new rtc::RefCountedObject< new rtc::RefCountedObject<
VideoEncoderConfig::Vp9EncoderSpecificSettings>(vp9_settings); VideoEncoderConfig::Vp9EncoderSpecificSettings>(vp9_settings);
} else if (params_.video[video_idx].codec == "H264") {
// Quality scaling is always on for H.264.
} else { } else {
RTC_NOTREACHED() << "Automatic scaling not supported for codec " RTC_NOTREACHED() << "Automatic scaling not supported for codec "
<< params_.video[video_idx].codec << ", stream " << params_.video[video_idx].codec << ", stream "
@ -1099,7 +1101,7 @@ void VideoQualityTest::RunWithAnalyzer(const Params& params) {
CreateCapturers(); CreateCapturers();
analyzer_->SetSource(video_sources_[0].get(), params_.ss[0].infer_streams); analyzer_->SetSource(video_sources_[0].get(), true);
for (size_t video_idx = 1; video_idx < num_video_streams_; ++video_idx) { for (size_t video_idx = 1; video_idx < num_video_streams_; ++video_idx) {
video_send_streams_[video_idx]->SetSource(video_sources_[video_idx].get(), video_send_streams_[video_idx]->SetSource(video_sources_[video_idx].get(),