Bug 1320101 - mNegotiatedMaxBitrate should be able to cap the max bitrate. r?bwc
MozReview-Commit-ID: 9WRUa0SKuM2
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -1182,19 +1182,18 @@ WebrtcVideoConduit::SelectBitrates(unsig
}
out_start = std::max(out_start, out_min);
// Note: mNegotiatedMaxBitrate is the max transport bitrate - it applies to
// a single codec encoding, but should also apply to the sum of all
// simulcast layers in this encoding! So sum(layers.maxBitrate) <=
// mNegotiatedMaxBitrate
// Note that out_max already has had mPrefMaxBitrate applied to it
- if (mNegotiatedMaxBitrate != 0 && mNegotiatedMaxBitrate > out_max) {
- out_max = mNegotiatedMaxBitrate;
- }
+ out_max = MinIgnoreZero(mNegotiatedMaxBitrate, out_max);
+
MOZ_ASSERT(mPrefMaxBitrate == 0 || out_max <= mPrefMaxBitrate);
}
static void ConstrainPreservingAspectRatioExact(uint32_t max_fs,
unsigned short* width,
unsigned short* height)
{
// We could try to pick a better starting divisor, but it won't make any real