Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(849)

Unified Diff: media/cast/sender/video_sender.cc

Issue 629493004: [Cast] Clean-up: Move max_unacked_frames into CongestionControl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/sender/video_encoder_impl_unittest.cc ('k') | media/cast/sender/vp8_encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/sender/video_sender.cc
diff --git a/media/cast/sender/video_sender.cc b/media/cast/sender/video_sender.cc
index dd8e7f57356b22db9d061b573d093a3c5d1412d6..16b7159befe1fd001ceb676d9ba1596a1ca90d99 100644
--- a/media/cast/sender/video_sender.cc
+++ b/media/cast/sender/video_sender.cc
@@ -56,18 +56,18 @@ VideoSender::VideoSender(
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(
@@ -79,13 +79,7 @@ VideoSender::VideoSender(
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;
}
« no previous file with comments | « media/cast/sender/video_encoder_impl_unittest.cc ('k') | media/cast/sender/vp8_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698