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

Unified Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 2651883010: Adding C++ versions of currently spec'd "RtpParameters" structs. (Closed)
Patch Set: Fixing typo in test. Created 3 years, 11 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
Index: webrtc/media/engine/webrtcvideoengine2.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
index 9e7f5c4bd45fdb49a2493d94a6a83600073d88b2..9da57af9a2c3eacd715ff6ccc552d34d7565ba41 100644
--- a/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/webrtc/media/engine/webrtcvideoengine2.cc
@@ -1864,9 +1864,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)) {

Powered by Google App Engine
This is Rietveld 408576698