Refactor before implementing per stream suspension.

webrtc/video/video_send_stream.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 544 matching lines @@
       rtc::CritScope lock(&encoder_settings_crit_);
       if (pending_encoder_settings_) {
         encoder_settings = pending_encoder_settings_;
         pending_encoder_settings_ = rtc::Optional<EncoderSettings>();
       }
     }
     if (encoder_settings) {
       encoder_settings->video_codec.startBitrate =
           bitrate_allocator_->AddObserver(
               this, encoder_settings->video_codec.minBitrate * 1000,
-              encoder_settings->video_codec.maxBitrate * 1000) /
+              encoder_settings->video_codec.maxBitrate * 1000,
+              !config_.suspend_below_min_bitrate) /
           1000;
 
       payload_router_.SetSendStreams(encoder_settings->streams);
       vie_encoder_.SetEncoder(encoder_settings->video_codec,
                               encoder_settings->min_transmit_bitrate_bps,
                               payload_router_.MaxPayloadLength(), this);
 
+      // vie_encoder_.SetEncoder must be called before this.
+      if (config_.suspend_below_min_bitrate)
+        video_sender_->SuspendBelowMinBitrate();
+
       // Clear stats for disabled layers.
       for (size_t i = encoder_settings->streams.size();
            i < config_.rtp.ssrcs.size(); ++i) {
         stats_proxy_.OnInactiveSsrc(config_.rtp.ssrcs[i]);
       }
 
-      if (config_.suspend_below_min_bitrate) {
-        video_sender_->SuspendBelowMinBitrate();
-        bitrate_allocator_->EnforceMinBitrate(false);
-      }
       // We might've gotten new settings while configuring the encoder settings,
       // restart from the top to see if that's the case before trying to encode
       // a frame (which might correspond to the last frame size).
       encoder_wakeup_event_.Set();
       continue;
     }
 
     VideoFrame frame;
     if (input_.GetVideoFrame(&frame)) {
       // TODO(perkj): |pre_encode_callback| is only used by tests. Tests should
@@ skipping 215 matching lines @@
                           &module_nack_rate);
     *sent_video_rate_bps += module_video_rate;
     *sent_nack_rate_bps += module_nack_rate;
     *sent_fec_rate_bps += module_fec_rate;
   }
   return 0;
 }
 
 }  // namespace internal
 }  // namespace webrtc