Read the number of TLs for VP9 too + cleanup

webrtc/video/video_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.
  */
 
 #include <stdio.h>
 
-#include <map>
-
 #include "gflags/gflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/test/field_trial.h"
 #include "webrtc/test/run_test.h"
-#include "webrtc/typedefs.h"
 #include "webrtc/video/video_quality_test.h"

[ivica, 2015/09/22 11:15:36]

Making the headers look the same as in video/screenshare_loopback.cc

 
 namespace webrtc {
-
 namespace flags {
 
+// Flags common with screenshare loopback, with different default values.
 DEFINE_int32(width, 640, "Video width.");
 size_t Width() {
   return static_cast<size_t>(FLAGS_width);
 }
 
 DEFINE_int32(height, 480, "Video height.");
 size_t Height() {
   return static_cast<size_t>(FLAGS_height);
 }
 
@@ skipping 76 matching lines @@
 }
 
 DEFINE_int32(
     tl_discard_threshold,
     0,
     "Discard TLs with id greater or equal the threshold. 0 to disable.");
 size_t TLDiscardThreshold() {
   return static_cast<size_t>(FLAGS_tl_discard_threshold);
 }
 
+DEFINE_bool(disable_wrapper_frame_dropper,
+            false,
+            "Disable FrameDropper in the wrapper. "
+            "Does not affect drop on capture or PacedSender.");
+
+
 DEFINE_string(clip,
               "",
               "Name of the clip to show. If empty, using chroma generator.");
 std::string Clip() {
   return static_cast<std::string>(FLAGS_clip);
 }
 
 DEFINE_string(
     output_filename,
     "",
@@ skipping 28 matching lines @@
       {
         flags::Width(),
         flags::Height(),
         flags::Fps(),
         flags::MinBitrateKbps() * 1000,
         flags::TargetBitrateKbps() * 1000,
         flags::MaxBitrateKbps() * 1000,
         flags::Codec(),
         flags::NumTemporalLayers(),
         0,  // No min transmit bitrate.
+        flags::FLAGS_disable_wrapper_frame_dropper,
         call_bitrate_config,
         flags::TLDiscardThreshold()
       },
       {clip},
       {},  // Screenshare specific.
       {graph_title, 0.0, 0.0, flags::DurationSecs(), flags::OutputFilename()},
       pipe_config,
       flags::FLAGS_logs};
 
   VideoQualityTest test;
   if (flags::OutputFilename().empty())
     test.RunWithVideoRenderer(params);
   else
     test.RunWithAnalyzer(params);
 }
 }  // 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;
 }