Read the number of TLs for VP9 too + cleanup

webrtc/modules/video_coding/main/source/video_sender.cc

Index: webrtc/modules/video_coding/main/source/video_sender.cc
diff --git a/webrtc/modules/video_coding/main/source/video_sender.cc b/webrtc/modules/video_coding/main/source/video_sender.cc
index c59d05afcd84501c5bed9523a95fa7394c593df7..c10c7943731a084a993daf22d2cc3b1661c197f9 100644
--- a/webrtc/modules/video_coding/main/source/video_sender.cc
+++ b/webrtc/modules/video_coding/main/source/video_sender.cc
@@ -107,11 +107,12 @@ int32_t VideoSender::RegisterSendCodec(const VideoCodec* sendCodec,
   }
 
   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_) {