Fix SetRates for encoders with internal sources.

webrtc/modules/video_coding/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 184 matching lines @@
 
 int32_t VideoSender::SetChannelParameters(uint32_t target_bitrate,
                                           uint8_t lossRate,
                                           int64_t rtt) {
   uint32_t target_rate =
       _mediaOpt.SetTargetRates(target_bitrate, lossRate, rtt,
                                protection_callback_, qm_settings_callback_);
 
   uint32_t input_frame_rate = _mediaOpt.InputFrameRate();
 
-  rtc::CritScope cs(&params_crit_);
-  encoder_params_ = {target_rate, lossRate, rtt, input_frame_rate};
+  EncoderParameters encoder_params = {target_rate, lossRate, rtt,
+                                      input_frame_rate};
+  {
+    rtc::CritScope cs(&params_crit_);
+    encoder_params_ = encoder_params;
+  }
+
+  // For encoders with internal sources, we need to tell the encoder directly,
+  // instead of waiting for an AddVideoFrame that will never come (internal
+  // source encoders don't get input frames).
+  {
+    rtc::CritScope cs(&encoder_crit_);

[pbos-webrtc, 2016/02/11 10:17:00]

I believe that this lock could block (the network thread, perhaps?) during
encoder use. Can you see if we can cache _encoder->InteralSource() under the
params_crit_ so that we don't have to acquire this lock for non-internal-source?

+    if (_encoder && _encoder->InternalSource()) {
+      SetEncoderParameters(encoder_params);
+    }
+  }
 
   return VCM_OK;
 }
 
 void VideoSender::SetEncoderParameters(EncoderParameters params) {
   if (params.target_bitrate == 0)
     return;
 
   if (params.input_frame_rate == 0) {
     // No frame rate estimate available, use default.
@@ skipping 156 matching lines @@
   // 10 kbps.
   int window_bps = std::max(threshold_bps / 10, 10000);
   _mediaOpt.SuspendBelowMinBitrate(threshold_bps, window_bps);
 }
 
 bool VideoSender::VideoSuspended() const {
   return _mediaOpt.IsVideoSuspended();
 }
 }  // namespace vcm
 }  // namespace webrtc