Bug 1254187 - fix sender.setParameters maxBitrate. draft
authorJan-Ivar Bruaroey <jib@mozilla.com>
Mon, 07 Mar 2016 12:34:59 -0500
changeset 340723 b3612eb14d1f18b347916fb71013b8e5b0e5e4d5
parent 338591 af7c0cb0798f5425d5d344cbaf0ac0ecb1a72a86
child 340724 b59023ac345564efb47ae073840e5990dd68c1e5
push id13044
push userjbruaroey@mozilla.com
push dateTue, 15 Mar 2016 22:14:02 +0000
bugs1254187
milestone48.0a1
Bug 1254187 - fix sender.setParameters maxBitrate. MozReview-Commit-ID: 47D2WhPOfD7
media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -1310,19 +1310,19 @@ WebrtcVideoConduit::ReconfigureSendCodec
     // Give each layer default appropriate bandwidth limits based on the
     // resolution/framerate of that layer
     SelectBitrates(stream.width, stream.height, stream.jsMaxBitrate,
                    mLastFramerateTenths,
                    stream.minBitrate,
                    stream.targetBitrate,
                    stream.maxBitrate);
 
-    vie_codec.minBitrate = std::min(stream.minBitrate, vie_codec.minBitrate);
+    vie_codec.minBitrate = std::max(stream.minBitrate, vie_codec.minBitrate);
     vie_codec.startBitrate += stream.targetBitrate;
-    vie_codec.maxBitrate = std::max(stream.maxBitrate, vie_codec.maxBitrate);
+    vie_codec.maxBitrate = std::min(stream.maxBitrate, vie_codec.maxBitrate);
 
     // webrtc.org expects the last, highest fidelity, simulcast stream to
     // always have the same resolution as vie_codec
     if (i == vie_codec.numberOfSimulcastStreams) {
       vie_codec.width = stream.width;
       vie_codec.height = stream.height;
     }
   }