[Cast] Clean-up: Move max_unacked_frames into CongestionControl.

media/cast/sender/video_sender.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/sender/video_sender.h"
 
 #include <algorithm>
 #include <cstring>
 
 #include "base/bind.h"
@@ skipping 38 matching lines @@
     : FrameSender(
         cast_environment,
         false,
         transport_sender,
         base::TimeDelta::FromMilliseconds(video_config.rtcp_interval),
         kVideoFrequency,
         video_config.ssrc,
         video_config.max_frame_rate,
         video_config.min_playout_delay,
         video_config.max_playout_delay,
-        NewFixedCongestionControl(
-            (video_config.min_bitrate + video_config.max_bitrate) / 2)),
+        video_config.use_external_encoder ?
+            NewFixedCongestionControl(
+                (video_config.min_bitrate + video_config.max_bitrate) / 2) :
+            NewAdaptiveCongestionControl(cast_environment->Clock(),
+                                         video_config.max_bitrate,
+                                         video_config.min_bitrate,
+                                         video_config.max_frame_rate)),
       frames_in_encoder_(0),
       last_bitrate_(0),
       playout_delay_change_cb_(playout_delay_change_cb),
       weak_factory_(this) {
   cast_initialization_status_ = STATUS_VIDEO_UNINITIALIZED;
-  VLOG(1) << "max_unacked_frames is " << max_unacked_frames_
-          << " for target_playout_delay="
-          << target_playout_delay_.InMilliseconds() << " ms"
-          << " and max_frame_rate=" << video_config.max_frame_rate;
-  DCHECK_GT(max_unacked_frames_, 0);
 
   if (video_config.use_external_encoder) {
     video_encoder_.reset(new ExternalVideoEncoder(
         cast_environment,
         video_config,
         base::Bind(&VideoSender::OnEncoderInitialized,
                    weak_factory_.GetWeakPtr(), initialization_cb),
         create_vea_cb,
         create_video_encode_mem_cb));
   } else {
     // Software encoder is initialized immediately.
-    congestion_control_.reset(
-        NewAdaptiveCongestionControl(cast_environment->Clock(),
-                                     video_config.max_bitrate,
-                                     video_config.min_bitrate,
-                                     max_unacked_frames_));
-    video_encoder_.reset(new VideoEncoderImpl(
-        cast_environment, video_config, max_unacked_frames_));
+    video_encoder_.reset(new VideoEncoderImpl(cast_environment, video_config));
     cast_initialization_status_ = STATUS_VIDEO_INITIALIZED;
   }
 
   if (cast_initialization_status_ == STATUS_VIDEO_INITIALIZED) {
     cast_environment->PostTask(
         CastEnvironment::MAIN,
         FROM_HERE,
         base::Bind(initialization_cb, cast_initialization_status_));
   }
 
@@ skipping 134 matching lines @@
   DCHECK_GE(frames_in_encoder_, 0);
 
   duration_in_encoder_ =
       last_enqueued_frame_reference_time_ - encoded_frame->reference_time;
 
   SendEncodedFrame(encoder_bitrate, encoded_frame.Pass());
 }
 
 }  // namespace cast
 }  // namespace media