Reduce full stack test time to 45 secs and add H264 and FlexFEC.

webrtc/video/full_stack.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include <stdio.h>
 
 #include "webrtc/test/gtest.h"
 #include "webrtc/video/video_quality_test.h"
 
 namespace webrtc {
 
-static const int kFullStackTestDurationSecs = 60;
+static const int kFullStackTestDurationSecs = 45;
 
 class FullStackTest : public VideoQualityTest {
  public:
   void RunTest(const VideoQualityTest::Params &params) {
     RunWithAnalyzer(params);
   }
 
   void ForemanCifWithoutPacketLoss(const std::string& video_codec) {
     // TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif.
     VideoQualityTest::Params foreman_cif;
     foreman_cif.video = {true, 352, 288, 30, 700000, 700000, 700000, false,
                          video_codec, 1, 0, 0, false, false, "", "foreman_cif"};
     foreman_cif.analyzer = {"foreman_cif_net_delay_0_0_plr_0_" + video_codec,
                             0.0, 0.0, kFullStackTestDurationSecs};
     RunTest(foreman_cif);
   }
 
-  void ForemanCifPlr5(const std::string& video_codec) {
+  void ForemanCifPlr5(const std::string& video_codec,
+                      bool use_ulpfec,
+                      bool use_flexfec) {
     VideoQualityTest::Params foreman_cif;
     foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false,
-                         video_codec, 1, 0, 0, false, false, "", "foreman_cif"};
-    foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_" + video_codec, 0.0,
-                            0.0, kFullStackTestDurationSecs};
+                         video_codec, 1, 0, 0, use_ulpfec, use_flexfec, "",
+                         "foreman_cif"};
+    std::string fec_description;
+    if (use_ulpfec)
+      fec_description += "_ulpfec";
+    if (use_flexfec)
+      fec_description += "_flexfec";
+    foreman_cif.analyzer = {
+        "foreman_cif_delay_50_0_plr_5_" + video_codec + fec_description, 0.0,
+        0.0, kFullStackTestDurationSecs};
     foreman_cif.pipe.loss_percent = 5;
     foreman_cif.pipe.queue_delay_ms = 50;
     RunTest(foreman_cif);
   }
 };
 
 // VideoQualityTest::Params params = {
 //   { ... },      // Common.
 //   { ... },      // Video-specific settings.
 //   { ... },      // Screenshare-specific settings.
 //   { ... },      // Analyzer settings.
 //   pipe,         // FakeNetworkPipe::Config
 //   { ... },      // Spatial scalability.
 //   logs          // bool
 // };
 
 #if !defined(RTC_DISABLE_VP9)
 TEST_F(FullStackTest, ForemanCifWithoutPacketLossVp9) {
   ForemanCifWithoutPacketLoss("VP9");
 }
 
 TEST_F(FullStackTest, ForemanCifPlr5Vp9) {
-  ForemanCifPlr5("VP9");
+  const bool kUlpfec = false;
+  const bool kFlexfec = false;
+  ForemanCifPlr5("VP9", kUlpfec, kFlexfec);
 }
 #endif  // !defined(RTC_DISABLE_VP9)
 
 TEST_F(FullStackTest, ParisQcifWithoutPacketLoss) {
   VideoQualityTest::Params paris_qcif;
   paris_qcif.call.send_side_bwe = true;
   paris_qcif.video = {true, 176, 144, 30, 300000, 300000, 300000, false,
                       "VP8", 1, 0, 0, false, false, "", "paris_qcif"};
   paris_qcif.analyzer = {"net_delay_0_0_plr_0", 36.0, 0.96,
                          kFullStackTestDurationSecs};
@@ skipping 16 matching lines @@
   foreman_cif.call.send_side_bwe = true;
   foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8",
                        1, 0, 0, false, false, "", "foreman_cif"};
   foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   foreman_cif.pipe.loss_percent = 5;
   foreman_cif.pipe.queue_delay_ms = 50;
   RunTest(foreman_cif);
 }
 
+#if defined(WEBRTC_USE_H264)
+TEST_F(FullStackTest, ForemanCifWithoutPacketlossH264) {
+  ForemanCifWithoutPacketLoss("H264");
+}
+
+TEST_F(FullStackTest, ForemanCifPlr5H264) {
+  const bool kUlpfec = false;
+  const bool kFlexfec = false;
+  ForemanCifPlr5("H264", kUlpfec, kFlexfec);
+}
+
+// Verify that this is worth the bot time, before enabling.
+TEST_F(FullStackTest, ForemanCifPlr5H264Flexfec) {
+  const bool kUlpfec = false;
+  const bool kFlexfec = true;
+  ForemanCifPlr5("H264", kUlpfec, kFlexfec);
+}
+
+// Ulpfec with H264 is an unsupported combination, so this test is only useful
+// for debugging. It is therefore disabled by default.
+TEST_F(FullStackTest, DISABLED_ForemanCifPlr5H264Ulpfec) {
+  const bool kUlpfec = true;
+  const bool kFlexfec = false;
+  ForemanCifPlr5("H264", kUlpfec, kFlexfec);
+}
+#endif  // defined(WEBRTC_USE_H264)
+
 TEST_F(FullStackTest, ForemanCif500kbps) {
   VideoQualityTest::Params foreman_cif;
   foreman_cif.call.send_side_bwe = true;
   foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8",
                        1, 0, 0, false, false, "", "foreman_cif"};
   foreman_cif.analyzer = {"foreman_cif_500kbps", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   foreman_cif.pipe.queue_length_packets = 0;
   foreman_cif.pipe.queue_delay_ms = 0;
   foreman_cif.pipe.link_capacity_kbps = 500;
@@ skipping 136 matching lines @@
                        "VP9", 1, 0, 400000, false, false, "", ""};
   screenshare.screenshare = {true, 10};
   screenshare.analyzer = {"screenshare_slides_vp9_2sl", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   screenshare.logs = false;
   screenshare.ss = {std::vector<VideoStream>(), 0, 2, 1};
   RunTest(screenshare);
 }
 #endif  // !defined(RTC_DISABLE_VP9)
 }  // namespace webrtc