Read the number of TLs for VP9 too + cleanup

webrtc/modules/video_coding/main/source/video_sender.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 "webrtc/common_types.h"
 
 #include <algorithm>  // std::max
 
 #include "webrtc/base/checks.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
 #include "webrtc/modules/video_coding/main/source/encoded_frame.h"
 #include "webrtc/modules/video_coding/main/source/video_coding_impl.h"
 #include "webrtc/modules/video_coding/utility/include/quality_scaler.h"
 #include "webrtc/system_wrappers/interface/clock.h"
+#include "webrtc/system_wrappers/interface/field_trial.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 namespace vcm {
 
 VideoSender::VideoSender(Clock* clock,
                          EncodedImageCallback* post_encode_callback,
                          VideoEncoderRateObserver* encoder_rate_observer,
                          VCMQMSettingsCallback* qm_settings_callback)
     : clock_(clock),
@@ skipping 67 matching lines @@
   // Cache the current codec here so they can be fetched from this thread
   // without requiring the _sendCritSect lock.
   current_codec_ = *sendCodec;
 
   if (!ret) {
     LOG(LS_ERROR) << "Failed to initialize set encoder with payload name '"
                   << sendCodec->plName << "'.";
     return VCM_CODEC_ERROR;
   }
 
-  int numLayers = (sendCodec->codecType != kVideoCodecVP8)
-                      ? 1
-                      : sendCodec->codecSpecific.VP8.numberOfTemporalLayers;
+  int numLayers;
+  if (sendCodec->codecType == kVideoCodecVP8) {
+    numLayers = sendCodec->codecSpecific.VP8.numberOfTemporalLayers;
+  } else if (sendCodec->codecType == kVideoCodecVP9) {
+    numLayers = sendCodec->codecSpecific.VP9.numberOfTemporalLayers;
+  } else {
+    numLayers = 1;
+  }
+
   // If we have screensharing and we have layers, we disable frame dropper.
   bool disable_frame_dropper =
-      numLayers > 1 && sendCodec->mode == kScreensharing;
+      (numLayers > 1 && sendCodec->mode == kScreensharing) ||
+      (field_trial::FindFullName("WebRTC-DisableGenericBitrateFrameDropper")

[pbos-webrtc, 2015/10/07 11:27:55]

Can we call this WebRTC-Test- or so? I'd like to distinguish between things that
we test with and things that we intend to launch. WDYT?

[ivica, 2015/10/07 11:32:52]

Now when it's so simple, I'm not sure if it's necessary to commit it. Still, for
the same reason it's not a big deal.
I was asked to generate stats and graphs with the frame dropper disabled, and
the good thing of keeping it here is that the script I used to generate all the
graphs will work without modifying the code (script is not in the repository).
I don't know what's best.

+          == "Enabled");
   if (disable_frame_dropper) {
     _mediaOpt.EnableFrameDropper(false);
   } else if (frame_dropper_enabled_) {
     _mediaOpt.EnableFrameDropper(true);
   }
   _nextFrameTypes.clear();
   _nextFrameTypes.resize(VCM_MAX(sendCodec->numberOfSimulcastStreams, 1),
                          kVideoFrameDelta);
 
   _mediaOpt.SetEncodingData(sendCodec->codecType,
@@ skipping 256 matching lines @@
   int window_bps = std::max(threshold_bps / 10, 10000);
   _mediaOpt.SuspendBelowMinBitrate(threshold_bps, window_bps);
 }
 
 bool VideoSender::VideoSuspended() const {
   rtc::CritScope lock(&send_crit_);
   return _mediaOpt.IsVideoSuspended();
 }
 }  // namespace vcm
 }  // namespace webrtc