webrtc/modules/congestion_controller/congestion_controller.cc - Issue 1922483002: De-flake VideoSendStreamTest.ReconfigureBitratesSetsEncoderBitratesCorrectly

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/congestion_controller/congestion_controller.cc

Issue 1922483002: De-flake VideoSendStreamTest.ReconfigureBitratesSetsEncoderBitratesCorrectly (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Feedback fixes Created 4 years, 8 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

« webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h ('K') | « webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc ('k') | webrtc/video/video_send_stream_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/congestion_controller/congestion_controller.cc

diff --git a/webrtc/modules/congestion_controller/congestion_controller.cc b/webrtc/modules/congestion_controller/congestion_controller.cc

index caf39f07d25716457aa7e7a20544b083adf06225..0c40c4a9ed23d120270a62f8068a4a9522897509 100644

--- a/webrtc/modules/congestion_controller/congestion_controller.cc

+++ b/webrtc/modules/congestion_controller/congestion_controller.cc

@@ -176,11 +176,13 @@ void CongestionController::SetBweBitrates(int min_bitrate_bps,

min_bitrate_bps = kMinBitrateBps;

if (max_bitrate_bps > 0)

max_bitrate_bps = std::max(min_bitrate_bps, max_bitrate_bps);

- if (start_bitrate_bps > 0) {

+ if (start_bitrate_bps > 0)

start_bitrate_bps = std::max(min_bitrate_bps, start_bitrate_bps);

- bitrate_controller_->SetStartBitrate(start_bitrate_bps);

- }

- bitrate_controller_->SetMinMaxBitrate(min_bitrate_bps, max_bitrate_bps);

+ bitrate_controller_->SetBitrates(start_bitrate_bps,

+ min_bitrate_bps,

+ max_bitrate_bps);

if (remote_bitrate_estimator_)

remote_bitrate_estimator_->SetMinBitrate(min_bitrate_bps);

min_bitrate_bps_ = min_bitrate_bps;