Read the number of TLs for VP9 too + cleanup

webrtc/video/video_loopback.cc

Index: webrtc/video/video_loopback.cc
diff --git a/webrtc/video/video_loopback.cc b/webrtc/video/video_loopback.cc
index 0dceea82e6ea45e5f85bbfa7e5844036ac7a9956..60dbe1da131bc16e38c78c1eaede742bf3ba6e12 100644
--- a/webrtc/video/video_loopback.cc
+++ b/webrtc/video/video_loopback.cc
@@ -10,18 +10,14 @@
 
 #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"
 
 namespace webrtc {
-
 namespace flags {
 
 DEFINE_int32(width, 640, "Video width.");
@@ -120,6 +116,11 @@ size_t TLDiscardThreshold() {
   return static_cast<size_t>(FLAGS_tl_discard_threshold);
 }
 
+DEFINE_bool(disable_frame_dropper,
+            false,
+            "Disable generic bitrate frame dropper. "
+            "Does not affect drop on capture or PacedSender.");
+
 DEFINE_string(clip,
               "",
               "Name of the clip to show. If empty, using chroma generator.");
@@ -166,7 +167,7 @@ void Loopback() {
        flags::NumTemporalLayers(),
        0,  // No min transmit bitrate.
        call_bitrate_config, flags::TLDiscardThreshold(),
-       flags::FLAGS_send_side_bwe},
+       flags::FLAGS_send_side_bwe, flags::FLAGS_disable_frame_dropper},
       {clip},
       {},  // Screenshare specific.
       {graph_title, 0.0, 0.0, flags::DurationSecs(), flags::OutputFilename()},