Refactor before implementing per stream suspension.

webrtc/video/video_send_stream.cc

Index: webrtc/video/video_send_stream.cc
diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index 840991b4baceadf16fe026bd02915d816aa84da8..46e0f524914570503c8630dc1a9d7e94f876b1c6 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -559,10 +559,14 @@ void VideoSendStream::EncoderProcess() {
       }
     }
     if (encoder_settings) {
+      if (config_.suspend_below_min_bitrate)
+        video_sender_->SuspendBelowMinBitrate();
+
       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);
@@ -576,10 +580,6 @@ void VideoSendStream::EncoderProcess() {
         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).