Changeset 268592 in webkit

Timestamp:

Oct 16, 2020 8:38:29 AM (4 years ago)

Author:

youenn@apple.com

Message:

sdpFmtLine should be missing from RTCRtpCodecCapability instead of being an empty string
​https://bugs.webkit.org/show_bug.cgi?id=217818

Reviewed by Eric Carlson.

Source/WebCore:

Covered by updated test.

• platform/mediastream/libwebrtc/LibWebRTCProvider.cpp:

(WebCore::toRTCRtpCapabilities):
If line is empty, make sure to return a null string instead.

LayoutTests:

• webrtc/video-mute-vp8.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webrtc/video-mute-vp8.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-16  Youenn Fablet  <youenn@apple.com>
+
+        sdpFmtLine should be missing from RTCRtpCodecCapability instead of being an empty string
+        https://bugs.webkit.org/show_bug.cgi?id=217818
+
+        Reviewed by Eric Carlson.
+
+        * webrtc/video-mute-vp8.html:
+
 2020-10-16  Sam Sneddon  <gsnedders@apple.com>
 

trunk/LayoutTests/webrtc/video-mute-vp8.html

@@ -21 +21 @@
 
     const codecs = RTCRtpSender.getCapabilities("video").codecs;
-    assert_true(codecs.some((codec) => { return codec.mimeType.indexOf("VP8") }), "VP8 is listed as a codec");
+    assert_true(codecs.some((codec) => { return codec.mimeType.indexOf("VP8") >= 0 }), "VP8 is listed as a codec");
+
+    codecs.forEach((codec) => {
+       if (codec.mimeType.indexOf("VP8") >=0)
+           assert_equals(codec.sdpFmtpLine, undefined, "VP8 codec.sdpFmtpLine is undefined");
+    });
 
     const pc = new RTCPeerConnection();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-16  Youenn Fablet  <youenn@apple.com>
+
+        sdpFmtLine should be missing from RTCRtpCodecCapability instead of being an empty string
+        https://bugs.webkit.org/show_bug.cgi?id=217818
+
+        Reviewed by Eric Carlson.
+
+        Covered by updated test.
+
+        * platform/mediastream/libwebrtc/LibWebRTCProvider.cpp:
+        (WebCore::toRTCRtpCapabilities):
+        If line is empty, make sure to return a null string instead.
+
 2020-10-16  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp

@@ -405 +405 @@
     capabilities.codecs.reserveInitialCapacity(rtpCapabilities.codecs.size());
     for (auto& codec : rtpCapabilities.codecs) {
-        StringBuilder sdpFmtpLine;
+        StringBuilder sdpFmtpLineBuilder;
         bool hasParameter = false;
         for (auto& parameter : codec.parameters) {
-            sdpFmtpLine.append(hasParameter ? ";" : "", StringView(parameter.first.data(), parameter.first.length()), '=', StringView(parameter.second.data(), parameter.second.length()));
+            sdpFmtpLineBuilder.append(hasParameter ? ";" : "", StringView(parameter.first.data(), parameter.first.length()), '=', StringView(parameter.second.data(), parameter.second.length()));
             hasParameter = true;
         }
-        capabilities.codecs.uncheckedAppend(RTCRtpCodecCapability { fromStdString(codec.mime_type()), static_cast<uint32_t>(codec.clock_rate ? *codec.clock_rate : 0), toChannels(codec.num_channels), sdpFmtpLine.toString() });
+        String sdpFmtpLine;
+        if (sdpFmtpLineBuilder.length())
+            sdpFmtpLine = sdpFmtpLineBuilder.toString();
+        capabilities.codecs.uncheckedAppend(RTCRtpCodecCapability { fromStdString(codec.mime_type()), static_cast<uint32_t>(codec.clock_rate ? *codec.clock_rate : 0), toChannels(codec.num_channels), WTFMove(sdpFmtpLine) });
     }