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.
  */
 
@@ skipping 89 matching lines @@
   // 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.VP9.numberOfTemporalLayers

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

This "int numLayers = ..." was written before VP9.numberOfTemporalLayers
existed. I assume 1 should be replaced now by this.

[pbos-webrtc, 2015/09/22 11:23:54]

Check if codecType is kVideoCodecVP9 before using it.

[ivica, 2015/09/22 11:58:09]

Done.

                       : sendCodec->codecSpecific.VP8.numberOfTemporalLayers;
   // 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) ||
+      sendCodec->forceDisableWrapperFrameDropper;
   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 263 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