webrtc/media/engine/webrtcvideoengine2.cc - Issue 2651883010: Adding C++ versions of currently spec'd "RtpParameters" structs.

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/media/engine/webrtcvideoengine2.cc

Issue 2651883010: Adding C++ versions of currently spec'd "RtpParameters" structs. (Closed)

Patch Set: Update unit tests (due to switch from special-case values to rtc::Optional) Created 3 years, 10 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:

Index: webrtc/media/engine/webrtcvideoengine2.cc

diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc

index 4301bd0a9369634604331c1dc307ff049f06495b..f3d207d0ba07b30e7cef4948950566623e40059a 100644

--- a/webrtc/media/engine/webrtcvideoengine2.cc

+++ b/webrtc/media/engine/webrtcvideoengine2.cc

@@ -1859,9 +1859,12 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::CreateVideoEncoderConfig(

encoder_config.number_of_streams = 1;

}

- int stream_max_bitrate =

- MinPositive(rtp_parameters_.encodings[0].max_bitrate_bps,

- parameters_.max_bitrate_bps);

+ int stream_max_bitrate = parameters_.max_bitrate_bps;

+ if (rtp_parameters_.encodings[0].max_bitrate_bps) {

+ stream_max_bitrate =

+ MinPositive(*(rtp_parameters_.encodings[0].max_bitrate_bps),

+ parameters_.max_bitrate_bps);

+ }

int codec_max_bitrate_kbps;

if (codec.GetParam(kCodecParamMaxBitrate, &codec_max_bitrate_kbps)) {