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..fa506a97af8a0fdb2564921e490795ed0466e675 100644
--- a/webrtc/modules/video_coding/main/source/video_sender.cc
+++ b/webrtc/modules/video_coding/main/source/video_sender.cc
@@ -106,12 +106,18 @@ int32_t VideoSender::RegisterSendCodec(const VideoCodec* sendCodec,
     return VCM_CODEC_ERROR;
   }
 
-  int numLayers = (sendCodec->codecType != kVideoCodecVP8)
-                      ? 1
-                      : sendCodec->codecSpecific.VP8.numberOfTemporalLayers;
+  int numLayers;
+  if (sendCodec->codecType == kVideoCodecVP8)

[stefan-webrtc, 2015/10/01 09:58:04]

{} on all if/else/else ifs since when it's multiple lines.

[ivica, 2015/10/01 11:17:51]

Done.

+    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) ||
+      sendCodec->disableGenericBitrateFrameDropper;
   if (disable_frame_dropper) {
     _mediaOpt.EnableFrameDropper(false);
   } else if (frame_dropper_enabled_) {