Bug 1367930: adjust ssrc's and encondings as simulcast answerer. r?bwc
MozReview-Commit-ID: EPdIWF5nn7u
new file mode 100644
--- /dev/null
+++ b/dom/media/tests/crashtests/1367930_1.html
@@ -0,0 +1,39 @@
+<html>
+<body>
+ <script>
+var offer= "v=0\r\no=- 6276735615230473072 2 IN IP4 127.0.0.1\r\ns=-\r\nt=0 0\r\na=group:BUNDLE video\r\na=msid-semantic:WMS *\r\na=ice-ufrag:XoEUdw==\r\na=ice-pwd:hfNjAs9TU4NNuumB50mGfJwkqIEN8A==\r\na=ice-lite\r\na=setup:actpass\r\na=fingerprint:sha-256 0D:54:F2:D9:F3:10:00:2D:CD:14:C6:AC:CB:5D:E7:34:5E:6F:A8:BF:25:96:48:40:0B:C7:F9:18:6A:A6:73:3F\r\nm=video 9 UDP/TLS/RTP/SAVPF 100\r\nc=IN IP4 0.0.0.0\r\na=rtcp:9 IN IP4 0.0.0.0\r\na=mid:video\r\na=recvonly\r\na=rtcp-rsize\r\na=rtcp-mux\r\na=rtpmap:100 VP8/90000\r\na=rtcp-fb:100 ccm fir\r\na=rtcp-fb:100 nack\r\na=rtcp-fb:100 nack pli\r\na=rtcp-fb:100 goog-remb\r\na=extmap:2 urn:ietf:params:rtp-hdrext:toffset\r\na=extmap:3 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time\r\na=extmap:4 urn:3gpp:video-orientation\r\na=extmap:5 urn:ietf:params:rtp-hdrext:sdes:rtp-stream-id\r\na=rid:hi recv\r\na=rid:mid recv\r\na=rid:lo recv\r\na=simulcast: recv rid=hi,mid,lo\r\na=candidate:1796272311 1 UDP 2130706431 192.168.10.146 55984 typ host\r\na=end-of-candidates\r\n"
+
+var data = {};
+data.sdp = offer;
+data.type = "offer";
+
+console.log('OFFER', JSON.stringify(data.sdp));
+
+var pc = new RTCPeerConnection();
+
+navigator.mediaDevices.getUserMedia({video: true, fake: true})
+ .then((stream) => {
+ return pc.addStream(stream);
+ })
+ .then(() => {
+ return pc.setRemoteDescription(new RTCSessionDescription(data));
+ })
+ .then(function() {
+ var sender = pc.getSenders()[0];
+ console.log('setting parameters');
+ return sender.setParameters({encodings: [
+ {rid: "hi", maxBitrate: 800000},
+ {rid: "mid", maxBitrate: 400000, scaleDownResolutionBy: 2},
+ {rid: "lo", maxBitrate: 150000, scaleDownResolutionBy: 4}
+ ]});
+ })
+ .then(function() {
+ return pc.createAnswer();
+ })
+ .then(function(answer) {
+ console.log('answer', JSON.stringify(answer.sdp));
+ return pc.setLocalDescription(answer);
+ });
+ </script>
+</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/dom/media/tests/crashtests/1367930_2.html
@@ -0,0 +1,25 @@
+<html>
+ <body>
+ <script>
+const sdp = {"type":"offer","sdp":"v=0\r\no=- 6276735615230473072 2 IN IP4 127.0.0.1\r\ns=-\r\nt=0 0\r\na=group:BUNDLE video\r\na=msid-semantic:WMS *\r\na=ice-ufrag:XpXW4g==\r\na=ice-pwd:hjagMNwFF/kMOmWoULEFptwuQXkMVQ==\r\na=ice-lite\r\na=setup:actpass\r\na=fingerprint:sha-256 DC:FC:25:56:2B:88:77:2F:E4:FA:97:4E:2E:F1:D6:34:A6:A0:11:E2:E4:38:B3:98:08:D2:F7:9D:F5:E2:C1:15\r\nm=video 9 UDP/TLS/RTP/SAVPF 100\r\nc=IN IP4 0.0.0.0\r\na=rtcp:9 IN IP4 0.0.0.0\r\na=mid:video\r\na=recvonly\r\na=rtcp-rsize\r\na=rtcp-mux\r\na=rtpmap:100 VP8/90000\r\na=rtcp-fb:100 ccm fir\r\na=rtcp-fb:100 nack\r\na=rtcp-fb:100 nack pli\r\na=rtcp-fb:100 goog-remb\r\na=extmap:2 urn:ietf:params:rtp-hdrext:toffset\r\na=extmap:3 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time\r\na=extmap:4 urn:3gpp:video-orientation\r\na=extmap:5 urn:ietf:params:rtp-hdrext:sdes:rtp-stream-id\r\na=rid:hi recv\r\na=rid:mid recv\r\na=rid:lo recv\r\na=simulcast: recv rid=hi;mid;lo\r\na=candidate:1796272311 1 UDP 2130706431 127.0.0.1 33584 typ host\r\na=end-of-candidates\r\n"};
+
+var pc = new RTCPeerConnection();
+
+navigator.mediaDevices.getUserMedia({video: true, fake: true})
+.then(stream => pc.addStream(stream))
+.then(() => {
+ console.log('hum');
+ pc.setRemoteDescription(sdp)
+ .then(function() {
+ return pc.createAnswer();
+ })
+ .then(function(answer) {
+ console.log(answer.sdp);
+ return pc.setLocalDescription(answer);
+ })
+ .then(console.log('yay'))
+ .catch(e => console.error(e));
+})
+ </script>
+ </body>
+</html>
--- a/dom/media/tests/crashtests/crashtests.list
+++ b/dom/media/tests/crashtests/crashtests.list
@@ -10,8 +10,10 @@ load 812785.html
load 834100.html
load 836349.html
load 837324.html
load 855796.html
load 860143.html
load 861958.html
load 863929.html
load 1348381.html
+load 1367930_1.html
+load 1367930_2.html
--- a/media/webrtc/signaling/src/jsep/JsepTrack.cpp
+++ b/media/webrtc/signaling/src/jsep/JsepTrack.cpp
@@ -270,19 +270,29 @@ JsepTrack::CreateEncodings(
GetRids(remote, sdp::kRecv, &rids); // Get rids we will send
NegotiateRids(rids, &mJsEncodeConstraints);
if (rids.empty()) {
// Add dummy value with an empty id to make sure we get a single unicast
// stream.
rids.push_back(SdpRidAttributeList::Rid());
}
- // For each rid in the remote, make sure we have an encoding, and configure
+ size_t max_streams = 1;
+
+ if (mJsEncodeConstraints.size()) {
+ max_streams = std::min(rids.size(), mJsEncodeConstraints.size());
+ }
+ // Drop SSRCs if less RIDs were offered than we have encoding constraints
+ if (mSsrcs.size() > max_streams) {
+ mSsrcs.resize(max_streams);
+ }
+
+ // For each stream make sure we have an encoding, and configure
// that encoding appropriately.
- for (size_t i = 0; i < rids.size(); ++i) {
+ for (size_t i = 0; i < max_streams; ++i) {
if (i == negotiatedDetails->mEncodings.values.size()) {
negotiatedDetails->mEncodings.values.push_back(new JsepTrackEncoding);
}
JsepTrackEncoding* encoding = negotiatedDetails->mEncodings.values[i];
for (const JsepCodecDescription* codec : negotiatedCodecs) {
if (rids[i].HasFormat(codec->mDefaultPt)) {