Reduce number of FlexFEC VideoSendStreamTests and lower packet loss.

webrtc/video/video_send_stream_tests.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 <algorithm>  // max
@@ skipping 578 matching lines @@
     }
 
     return SEND_PACKET;
   }
 
   test::PacketTransport* CreateSendTransport(Call* sender_call) override {
     // At low RTT (< kLowRttNackMs) -> NACK only, no FEC.
     // Therefore we need some network delay.
     const int kNetworkDelayMs = 100;
     FakeNetworkPipe::Config config;
-    config.loss_percent = 50;
+    config.loss_percent = 5;
     config.queue_delay_ms = kNetworkDelayMs;
     return new test::PacketTransport(sender_call, this,
                                      test::PacketTransport::kSender, config);
   }
 
   void ModifyVideoConfigs(
       VideoSendStream::Config* send_config,
       std::vector<VideoReceiveStream::Config>* receive_configs,
       VideoEncoderConfig* encoder_config) override {
     transport_adapter_.reset(
@@ skipping 24 matching lines @@
 
   std::unique_ptr<internal::TransportAdapter> transport_adapter_;
   std::unique_ptr<VideoEncoder> encoder_;
   const std::string payload_name_;
   const bool use_nack_;
   bool sent_media_;
   bool sent_flexfec_;
   bool header_extensions_enabled_;
 };
 
+TEST_F(VideoSendStreamTest, SupportsFlexfecVp8) {
+  FlexfecObserver test(false, false, "VP8");
+  RunBaseTest(&test);
+}
+
+TEST_F(VideoSendStreamTest, SupportsFlexfecWithNackVp8) {
+  FlexfecObserver test(false, true, "VP8");
+  RunBaseTest(&test);
+}
+
 TEST_F(VideoSendStreamTest, SupportsFlexfecWithRtpExtensionsVp8) {
   FlexfecObserver test(true, false, "VP8");
   RunBaseTest(&test);
 }
 
-TEST_F(VideoSendStreamTest, SupportsFlexfecWithoutRtpExtensionsVp8) {
-  FlexfecObserver test(false, false, "VP8");
-  RunBaseTest(&test);
-}
-
-TEST_F(VideoSendStreamTest, SupportsFlexfecWithRtpExtensionsAndNackVp8) {
-  FlexfecObserver test(true, true, "VP8");
-  RunBaseTest(&test);
-}
-
-TEST_F(VideoSendStreamTest, SupportsFlexfecWithoutRtpExtensionsAndNackVp8) {
-  FlexfecObserver test(false, true, "VP8");
-  RunBaseTest(&test);
-}
-
 #if !defined(RTC_DISABLE_VP9)
-TEST_F(VideoSendStreamTest, SupportsFlexfecWithRtpExtensionsVp9) {
-  FlexfecObserver test(true, false, "VP9");
-  RunBaseTest(&test);
-}
-
-TEST_F(VideoSendStreamTest, SupportsFlexfecWithoutRtpExtensionsVp9) {
+TEST_F(VideoSendStreamTest, SupportsFlexfecVp9) {
   FlexfecObserver test(false, false, "VP9");
   RunBaseTest(&test);
 }
 
-TEST_F(VideoSendStreamTest, SupportsFlexfecWithRtpExtensionsAndNackVp9) {
-  FlexfecObserver test(true, true, "VP9");
-  RunBaseTest(&test);
-}
-
-TEST_F(VideoSendStreamTest, SupportsFlexfecWithoutRtpExtensionsAndNackVp9) {
+TEST_F(VideoSendStreamTest, SupportsFlexfecWithNackVp9) {
   FlexfecObserver test(false, true, "VP9");
   RunBaseTest(&test);
 }
 #endif  // defined(RTC_DISABLE_VP9)
 
-TEST_F(VideoSendStreamTest, SupportsFlexfecWithRtpExtensionsH264) {
-  FlexfecObserver test(true, false, "H264");
-  RunBaseTest(&test);
-}
-
-TEST_F(VideoSendStreamTest, SupportsFlexfecWithoutRtpExtensionsH264) {
+TEST_F(VideoSendStreamTest, SupportsFlexfecH264) {
   FlexfecObserver test(false, false, "H264");
   RunBaseTest(&test);
 }
 
-TEST_F(VideoSendStreamTest, SupportsFlexfecWithRtpExtensionsAndNackH264) {
-  FlexfecObserver test(true, true, "H264");
-  RunBaseTest(&test);
-}
-
-TEST_F(VideoSendStreamTest, SupportsFlexfecWithoutRtpExtensionsAndNackH264) {
+TEST_F(VideoSendStreamTest, SupportsFlexfecWithNackH264) {
   FlexfecObserver test(false, true, "H264");
   RunBaseTest(&test);
 }
 
 void VideoSendStreamTest::TestNackRetransmission(
     uint32_t retransmit_ssrc,
     uint8_t retransmit_payload_type) {
   class NackObserver : public test::SendTest {
    public:
     explicit NackObserver(uint32_t retransmit_ssrc,
@@ skipping 2527 matching lines @@
    private:
     Call* call_;
     rtc::CriticalSection crit_;
     uint32_t max_bitrate_kbps_ GUARDED_BY(&crit_);
   } test;
 
   RunBaseTest(&test);
 }
 
 }  // namespace webrtc