Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1320101 - Default to 2Mbps when no max bitrate is set. r=bwc,jesup

Browse Source 
webrtc.org is in kbps and our constraints are in bps.
2000U is already in kbps however.

MozReview-Commit-ID: 2Y4z2CIO6jE

--HG--
extra : rebase_source : 5fac9331637a1c07ca2c897e444a6ca392e7b4f2
This commit is contained in:
Andreas Pehrson 2016-11-25 23:00:11 +01:00
parent 079365ac41
commit 836d0a3e98
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
View File

@ -1975,7 +1975,7 @@ WebrtcVideoConduit::CodecConfigToWebRTCCodec(const VideoCodecConfig* codecInfo,
cinst.minBitrate = mMinBitrate ? mMinBitrate : 200;
cinst.startBitrate = mStartBitrate ? mStartBitrate : 300;
cinst.targetBitrate = cinst.startBitrate;
cinst.maxBitrate = MinIgnoreZero(2000U, codecInfo->mEncodingConstraints.maxBr)/1000;
cinst.maxBitrate = MinIgnoreZero(2000U, codecInfo->mEncodingConstraints.maxBr/1000);
// not mNegotiatedMaxBitrate! cinst.maxBitrate is the max for the codec, which will be overridden
cinst.maxBitrate = MinIgnoreZero(cinst.maxBitrate, mPrefMaxBitrate);