Title: [259290] trunk
- Revision
- 259290
- Author
- [email protected]
- Date
- 2020-03-31 08:01:15 -0700 (Tue, 31 Mar 2020)
Log Message
Fix SDP filtering after https://trac.webkit.org/changeset/258545
https://bugs.webkit.org/show_bug.cgi?id=209799
Reviewed by Eric Carlson.
Source/WebCore:
Covered by updated test.
* Modules/mediastream/PeerConnectionBackend.cpp:
(WebCore::PeerConnectionBackend::filterSDP const):
Do not return early in case of filtering of mDNS candidate inlined in SDP description.
LayoutTests:
* webrtc/datachannel/mdns-ice-candidates-expected.txt:
* webrtc/datachannel/mdns-ice-candidates.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (259289 => 259290)
--- trunk/LayoutTests/ChangeLog 2020-03-31 14:53:03 UTC (rev 259289)
+++ trunk/LayoutTests/ChangeLog 2020-03-31 15:01:15 UTC (rev 259290)
@@ -1,3 +1,13 @@
+2020-03-31 youenn fablet <[email protected]>
+
+ Fix SDP filtering after https://trac.webkit.org/changeset/258545
+ https://bugs.webkit.org/show_bug.cgi?id=209799
+
+ Reviewed by Eric Carlson.
+
+ * webrtc/datachannel/mdns-ice-candidates-expected.txt:
+ * webrtc/datachannel/mdns-ice-candidates.html:
+
2020-03-31 Antti Koivisto <[email protected]>
Nullptr crash in InlineTextBox::emphasisMarkExistsAndIsAbove
Modified: trunk/LayoutTests/webrtc/datachannel/mdns-ice-candidates-expected.txt (259289 => 259290)
--- trunk/LayoutTests/webrtc/datachannel/mdns-ice-candidates-expected.txt 2020-03-31 14:53:03 UTC (rev 259289)
+++ trunk/LayoutTests/webrtc/datachannel/mdns-ice-candidates-expected.txt 2020-03-31 15:01:15 UTC (rev 259290)
@@ -4,4 +4,5 @@
PASS Basic data channel exchange from receiver to offerer
PASS Basic data channel exchange from offerer to receiver using UDP only
PASS Basic data channel exchange from offerer to receiver 2
+PASS Ensure that local description SDP filtering is correctly filtering mDNS local candidates
Modified: trunk/LayoutTests/webrtc/datachannel/mdns-ice-candidates.html (259289 => 259290)
--- trunk/LayoutTests/webrtc/datachannel/mdns-ice-candidates.html 2020-03-31 14:53:03 UTC (rev 259289)
+++ trunk/LayoutTests/webrtc/datachannel/mdns-ice-candidates.html 2020-03-31 15:01:15 UTC (rev 259290)
@@ -153,6 +153,29 @@
});
}, "Basic data channel exchange from offerer to receiver 2");
+promise_test(async (test) => {
+ const pc = new RTCPeerConnection();
+ const channel = pc.createDataChannel('sendDataChannel');
+ const offer = await pc.createOffer();
+ await pc.setLocalDescription(offer);
+ await new Promise(resolve => setTimeout(resolve, 200));
+
+ const channel2 = pc.createDataChannel('sendDataChannel2');
+ const offer2 = await pc.createOffer();
+ const description = pc.localDescription;
+
+ // Make sure we can apply the filtered description.
+ await pc.setLocalDescription(description);
+
+ const lines = description.sdp.split('\r\n').filter(line => {
+ return line.indexOf('a=candidate') === 0;
+ });
+
+ assert_true(lines.length > 0, "candidates are gathered");
+ assert_true(lines[0].includes(' host '), "candidate is host");
+ assert_true(lines[0].includes('.local '), "candidate is mDNS");
+}, "Ensure that local description SDP filtering is correctly filtering mDNS local candidates");
+
</script>
</body>
</html>
Modified: trunk/Source/WebCore/ChangeLog (259289 => 259290)
--- trunk/Source/WebCore/ChangeLog 2020-03-31 14:53:03 UTC (rev 259289)
+++ trunk/Source/WebCore/ChangeLog 2020-03-31 15:01:15 UTC (rev 259290)
@@ -1,5 +1,18 @@
2020-03-31 youenn fablet <[email protected]>
+ Fix SDP filtering after https://trac.webkit.org/changeset/258545
+ https://bugs.webkit.org/show_bug.cgi?id=209799
+
+ Reviewed by Eric Carlson.
+
+ Covered by updated test.
+
+ * Modules/mediastream/PeerConnectionBackend.cpp:
+ (WebCore::PeerConnectionBackend::filterSDP const):
+ Do not return early in case of filtering of mDNS candidate inlined in SDP description.
+
+2020-03-31 youenn fablet <[email protected]>
+
Ensure that RealtimeMediaSource::setShouldApplyRotation is called on the main thread
https://bugs.webkit.org/show_bug.cgi?id=209797
Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (259289 => 259290)
--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2020-03-31 14:53:03 UTC (rev 259289)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2020-03-31 15:01:15 UTC (rev 259290)
@@ -455,7 +455,6 @@
sdp.replace(ipAddress, mdnsName);
filteredSDP.append(sdp);
}
- return;
}
filteredSDP.append('\n');
});
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
