Enabling spatial layers in VP9Impl. Filter layers in the loopback test.

webrtc/video/screenshare_loopback.cc

 /*
  *  Copyright (c) 2015 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.
  */
 
@@ skipping 60 matching lines @@
 DEFINE_int32(tl1_bitrate, 2000, "Temporal layer 1 target bitrate.");
 size_t MaxBitrate() {
   return static_cast<size_t>(FLAGS_tl1_bitrate);
 }
 
 DEFINE_int32(num_temporal_layers, 2, "Number of temporal layers to use.");
 int NumTemporalLayers() {
   return static_cast<int>(FLAGS_num_temporal_layers);
 }
 
+DEFINE_int32(num_spatial_layers, 1, "Number of spatial layers to use.");
+int NumSpatialLayers() {
+  return static_cast<int>(FLAGS_num_spatial_layers);
+}
+
+DEFINE_int32(
+    tl_discard_threshold,
+    0,
+    "Discard TLs with id greater or equal the threshold. 0 to disable.");
+int TLDiscardThreshold() {
+  return static_cast<int>(FLAGS_tl_discard_threshold);
+}
+
+DEFINE_int32(
+    sl_discard_threshold,
+    0,
+    "Discard SLs with id greater or equal the threshold. 0 to disable.");
+int SLDiscardThreshold() {
+  return static_cast<int>(FLAGS_sl_discard_threshold);
+}
+
 DEFINE_int32(min_transmit_bitrate, 400, "Min transmit bitrate incl. padding.");
 int MinTransmitBitrate() {
   return FLAGS_min_transmit_bitrate;
 }
 
 DEFINE_string(codec, "VP8", "Video codec to use.");
 std::string Codec() {
   return static_cast<std::string>(FLAGS_codec);
 }
 
@@ skipping 37 matching lines @@
     "E.g. running with --force_fieldtrials=WebRTC-FooFeature/Enable/"
     " will assign the group Enable to field trial WebRTC-FooFeature. Multiple "
     "trials are separated by \"/\"");
 }  // namespace flags
 
 class ScreenshareLoopback : public test::Loopback {
  public:
   explicit ScreenshareLoopback(const Config& config) : Loopback(config) {
     CHECK_GE(config.num_temporal_layers, 1u);
     CHECK_LE(config.num_temporal_layers, 2u);
+    CHECK_GE(config.num_spatial_layers, 1u);
+    CHECK_LE(config.num_spatial_layers, 5u);
+    CHECK(config.num_spatial_layers == 1 || config.codec == "VP9");
+    CHECK(config.num_spatial_layers == 1 || config.num_temporal_layers == 1);
+    CHECK_LT(config.tl_discard_threshold, config.num_temporal_layers);
+    CHECK_LT(config.sl_discard_threshold, config.num_spatial_layers);
 
     vp8_settings_ = VideoEncoder::GetDefaultVp8Settings();
     vp8_settings_.denoisingOn = false;
     vp8_settings_.frameDroppingOn = false;
     vp8_settings_.numberOfTemporalLayers =
         static_cast<unsigned char>(config.num_temporal_layers);
 
     vp9_settings_ = VideoEncoder::GetDefaultVp9Settings();
     vp9_settings_.denoisingOn = false;
     vp9_settings_.frameDroppingOn = false;
     vp9_settings_.numberOfTemporalLayers =
         static_cast<unsigned char>(config.num_temporal_layers);
+    vp9_settings_.numberOfSpatialLayers =
+        static_cast<unsigned char>(config.num_spatial_layers);
   }
   virtual ~ScreenshareLoopback() {}
 
  protected:
   VideoEncoderConfig CreateEncoderConfig() override {
     VideoEncoderConfig encoder_config(test::Loopback::CreateEncoderConfig());
     VideoStream* stream = &encoder_config.streams[0];
     encoder_config.content_type = VideoEncoderConfig::ContentType::kScreen;
     encoder_config.min_transmit_bitrate_bps = flags::MinTransmitBitrate();
     int num_temporal_layers;
@@ skipping 52 matching lines @@
 void Loopback() {
   test::Loopback::Config config{flags::Width(),
                                 flags::Height(),
                                 flags::Fps(),
                                 flags::MinBitrate(),
                                 flags::StartBitrate(),
                                 flags::MaxBitrate(),
                                 flags::MinTransmitBitrate(),
                                 flags::Codec(),
                                 flags::NumTemporalLayers(),
+                                flags::NumSpatialLayers(),
+                                flags::TLDiscardThreshold(),
+                                flags::SLDiscardThreshold(),
                                 flags::LossPercent(),
                                 flags::LinkCapacity(),
                                 flags::QueueSize(),
                                 flags::AvgPropagationDelayMs(),
                                 flags::StdPropagationDelayMs(),
                                 flags::FLAGS_logs};
   ScreenshareLoopback loopback(config);
   loopback.Run();
 }
 }  // namespace webrtc
 
 int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
   google::ParseCommandLineFlags(&argc, &argv, true);
   webrtc::test::InitFieldTrialsFromString(
       webrtc::flags::FLAGS_force_fieldtrials);
   webrtc::test::RunTest(webrtc::Loopback);
   return 0;
 }