<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[277589] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/277589">277589</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2021-05-17 11:19:42 -0700 (Mon, 17 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ BigSur Debug wk2 ARM64 ] imported/w3c/web-platform-tests/webrtc-encoded-transform/sframe-transform-readable.html is flaky crashing
https://bugs.webkit.org/show_bug.cgi?id=225534
<rdar://problem/77679466>

Reviewed by Eric Carlson.

Source/WebCore:

In case the transform is stopped, the pipeTo operation will propagate the error/closure to the ReadableStream.
In that case, we need to stop enqueuing or we end up hitting the assert.
Handle this by adding a boolean which is set to true when SimpleReadableStreamSource::doCancel is called.
Make close and enqueue as no-op if that boolean is true.
Covered by test no longer crashing.

In addition, make sure to skip frames for which the array buffer is null as it might trigger debug asserts in libwebrtc.
Add a test to cover that case.

Test: http/wpt/webrtc/video-script-transform-keyframe-only.html

* Modules/mediastream/RTCRtpScriptTransformer.cpp:
(WebCore::RTCRtpScriptTransformer::writable):
* Modules/streams/ReadableStreamSource.cpp:
(WebCore::SimpleReadableStreamSource::doCancel):
(WebCore::SimpleReadableStreamSource::close):
(WebCore::SimpleReadableStreamSource::enqueue):
* Modules/streams/ReadableStreamSource.h:

LayoutTests:

* http/wpt/webrtc/video-script-transform-keyframe-only-expected.txt: Added.
* http/wpt/webrtc/video-script-transform-keyframe-only-worker.js: Added.
* http/wpt/webrtc/video-script-transform-keyframe-only.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpScriptTransformercpp">trunk/Source/WebCore/Modules/mediastream/RTCRtpScriptTransformer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamSourcecpp">trunk/Source/WebCore/Modules/streams/ReadableStreamSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamSourceh">trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttpwptwebrtcvideoscripttransformkeyframeonlyexpectedtxt">trunk/LayoutTests/http/wpt/webrtc/video-script-transform-keyframe-only-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttpwptwebrtcvideoscripttransformkeyframeonlyworkerjs">trunk/LayoutTests/http/wpt/webrtc/video-script-transform-keyframe-only-worker.js</a></li>
<li><a href="#trunkLayoutTestshttpwptwebrtcvideoscripttransformkeyframeonlyhtml">trunk/LayoutTests/http/wpt/webrtc/video-script-transform-keyframe-only.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (277588 => 277589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-05-17 18:12:36 UTC (rev 277588)
+++ trunk/LayoutTests/ChangeLog 2021-05-17 18:19:42 UTC (rev 277589)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-05-17  Youenn Fablet  <youenn@apple.com>
+
+        [ BigSur Debug wk2 ARM64 ] imported/w3c/web-platform-tests/webrtc-encoded-transform/sframe-transform-readable.html is flaky crashing
+        https://bugs.webkit.org/show_bug.cgi?id=225534
+        <rdar://problem/77679466>
+
+        Reviewed by Eric Carlson.
+
+        * http/wpt/webrtc/video-script-transform-keyframe-only-expected.txt: Added.
+        * http/wpt/webrtc/video-script-transform-keyframe-only-worker.js: Added.
+        * http/wpt/webrtc/video-script-transform-keyframe-only.html: Added.
+
</ins><span class="cx"> 2021-05-17  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         MediaSession action handlers aren't treated as having a user gesture
</span></span></pre></div>
<a id="trunkLayoutTestshttpwptwebrtcvideoscripttransformkeyframeonlyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/wpt/webrtc/video-script-transform-keyframe-only-expected.txt (0 => 277589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/wpt/webrtc/video-script-transform-keyframe-only-expected.txt                              (rev 0)
+++ trunk/LayoutTests/http/wpt/webrtc/video-script-transform-keyframe-only-expected.txt 2021-05-17 18:19:42 UTC (rev 277589)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+
+PASS enqueue video frames with empty buffer
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttpwptwebrtcvideoscripttransformkeyframeonlyworkerjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/wpt/webrtc/video-script-transform-keyframe-only-worker.js (0 => 277589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/wpt/webrtc/video-script-transform-keyframe-only-worker.js                         (rev 0)
+++ trunk/LayoutTests/http/wpt/webrtc/video-script-transform-keyframe-only-worker.js    2021-05-17 18:19:42 UTC (rev 277589)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+class MockRTCRtpTransformer {
+    constructor(transformer) {
+        this.context = transformer;
+        this.start();
+    }
+    start()
+    {
+        this.reader = this.context.readable.getReader();
+        this.writer = this.context.writable.getWriter();
+        this.process();
+    }
+
+    process()
+    {
+        this.reader.read().then(chunk => {
+            if (chunk.done)
+                return;
+
+            if (chunk.value.type === "delta")
+                chunk.value = new ArrayBuffer();
+
+            this.writer.write(chunk.value);
+            this.process();
+        });
+    }
+};
+
+onrtctransform = (event) => {
+    new MockRTCRtpTransformer(event.transformer);
+};
+
+self.postMessage("registered");
</ins></span></pre></div>
<a id="trunkLayoutTestshttpwptwebrtcvideoscripttransformkeyframeonlyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/wpt/webrtc/video-script-transform-keyframe-only.html (0 => 277589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/wpt/webrtc/video-script-transform-keyframe-only.html                              (rev 0)
+++ trunk/LayoutTests/http/wpt/webrtc/video-script-transform-keyframe-only.html 2021-05-17 18:19:42 UTC (rev 277589)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!doctype html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body>
+        <video id="video" autoplay playsInline></video>
+        <script src="routines.js"></script>
+        <script>
+function setH264BaselineCodec(sdp)
+{
+    const lines = sdp.split('\r\n');
+    const h264Lines = lines.filter(line => line.indexOf("a=fmtp") === 0 && line.indexOf("42e01f") !== -1);
+    const baselineNumber = h264Lines[0].substring(6).split(' ')[0];
+    return lines.filter(line => {
+        return (line.indexOf('a=fmtp') === -1 && line.indexOf('a=rtcp-fb') === -1 && line.indexOf('a=rtpmap') === -1) || line.indexOf(baselineNumber) !== -1;
+    }).join('\r\n');
+}
+
+let pc2;
+promise_test(async (test) => {
+    worker = new Worker('video-script-transform-keyframe-only-worker.js');
+    const data = await new Promise(resolve => worker.onmessage = (event) => resolve(event.data));
+    assert_equals(data, "registered");
+
+    const localStream = await navigator.mediaDevices.getUserMedia({video: true});
+
+    const senderTransform = new RTCRtpScriptTransform(worker, {name:'MockRTCRtpTransform', mediaType:'video', side:'sender'});
+    const receiverTransform = new RTCRtpScriptTransform(worker, {name:'MockRTCRtpTransform', mediaType:'video', side:'receiver'});
+
+    video.srcObject = await new Promise((resolve, reject) => {
+        createConnections((firstConnection) => {
+            const sender = firstConnection.addTrack(localStream.getVideoTracks()[0], localStream);
+            sender.transform = senderTransform;
+        }, (secondConnection) => {
+            pc2 = secondConnection;
+            secondConnection.ontrack = (trackEvent) => {
+                const receiver = trackEvent.receiver;
+                receiver.transform = receiverTransform;
+                resolve(trackEvent.streams[0]);
+            };
+        }, { observeOffer : (offer) => {
+            offer.sdp = setH264BaselineCodec(offer.sdp);
+            return offer;
+        }});
+        setTimeout(() => reject("Test timed out"), 5000);
+    });
+
+    await video.play();
+    await waitFor(50);
+}, "enqueue video frames with empty buffer");
+        </script>
+    </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (277588 => 277589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-05-17 18:12:36 UTC (rev 277588)
+++ trunk/Source/WebCore/ChangeLog      2021-05-17 18:19:42 UTC (rev 277589)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2021-05-17  Youenn Fablet  <youenn@apple.com>
+
+        [ BigSur Debug wk2 ARM64 ] imported/w3c/web-platform-tests/webrtc-encoded-transform/sframe-transform-readable.html is flaky crashing
+        https://bugs.webkit.org/show_bug.cgi?id=225534
+        <rdar://problem/77679466>
+
+        Reviewed by Eric Carlson.
+
+        In case the transform is stopped, the pipeTo operation will propagate the error/closure to the ReadableStream.
+        In that case, we need to stop enqueuing or we end up hitting the assert.
+        Handle this by adding a boolean which is set to true when SimpleReadableStreamSource::doCancel is called.
+        Make close and enqueue as no-op if that boolean is true.
+        Covered by test no longer crashing.
+
+        In addition, make sure to skip frames for which the array buffer is null as it might trigger debug asserts in libwebrtc.
+        Add a test to cover that case.
+
+        Test: http/wpt/webrtc/video-script-transform-keyframe-only.html
+
+        * Modules/mediastream/RTCRtpScriptTransformer.cpp:
+        (WebCore::RTCRtpScriptTransformer::writable):
+        * Modules/streams/ReadableStreamSource.cpp:
+        (WebCore::SimpleReadableStreamSource::doCancel):
+        (WebCore::SimpleReadableStreamSource::close):
+        (WebCore::SimpleReadableStreamSource::enqueue):
+        * Modules/streams/ReadableStreamSource.h:
+
</ins><span class="cx"> 2021-05-17  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         MediaSession action handlers aren't treated as having a user gesture
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpScriptTransformercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpScriptTransformer.cpp (277588 => 277589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpScriptTransformer.cpp     2021-05-17 18:12:36 UTC (rev 277588)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpScriptTransformer.cpp        2021-05-17 18:19:42 UTC (rev 277589)
</span><span class="lines">@@ -104,7 +104,10 @@
</span><span class="cx">             }, [&](RefPtr<RTCEncodedVideoFrame>& value) {
</span><span class="cx">                 return makeRef(value->rtcFrame());
</span><span class="cx">             });
</span><del>-            transformer->m_backend->processTransformedFrame(rtcFrame.get());
</del><ins>+
+            // If no data, skip the frame since there is nothing to packetize or decode.
+            if (rtcFrame->data().data)
+                transformer->m_backend->processTransformedFrame(rtcFrame.get());
</ins><span class="cx">             return { };
</span><span class="cx">         }));
</span><span class="cx">         if (writableOrException.hasException())
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamSource.cpp (277588 => 277589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamSource.cpp    2021-05-17 18:12:36 UTC (rev 277588)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamSource.cpp       2021-05-17 18:19:42 UTC (rev 277589)
</span><span class="lines">@@ -82,4 +82,21 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void SimpleReadableStreamSource::doCancel()
+{
+    m_isCancelled = true;
+}
+
+void SimpleReadableStreamSource::close()
+{
+    if (!m_isCancelled)
+        controller().close();
+}
+
+void SimpleReadableStreamSource::enqueue(JSC::JSValue value)
+{
+    if (!m_isCancelled)
+        controller().enqueue(value);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h (277588 => 277589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h      2021-05-17 18:12:36 UTC (rev 277588)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamSource.h 2021-05-17 18:19:42 UTC (rev 277589)
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx"> public:
</span><span class="cx">     static Ref<SimpleReadableStreamSource> create() { return adoptRef(*new SimpleReadableStreamSource); }
</span><span class="cx"> 
</span><del>-    void close() { controller().close(); }
-    void enqueue(JSC::JSValue value) { controller().enqueue(value); }
</del><ins>+    void close();
+    void enqueue(JSC::JSValue);
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     SimpleReadableStreamSource() = default;
</span><span class="lines">@@ -83,7 +83,9 @@
</span><span class="cx">     void setInactive() final { }
</span><span class="cx">     void doStart() final { }
</span><span class="cx">     void doPull() final { }
</span><del>-    void doCancel() final { }
</del><ins>+    void doCancel() final;
+
+    bool m_isCancelled { false };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>

</body>
</html>