[webkit-changes] [275874] trunk

Tue, 13 Apr 2021 02:28:05 -0700

Title: [275874] trunk
Revision
275874
Author
[email protected]
Date
2021-04-13 02:26:22 -0700 (Tue, 13 Apr 2021)

Log Message

SFrameTransform should be able to take array buffer views as input
https://bugs.webkit.org/show_bug.cgi?id=224437

Reviewed by Eric Carlson.

Source/WebCore:

Add support for processing ArrayBufferView.
We still output ArrayBuffer as output.

Test: webrtc/sframe-transform-buffer-source.html

* Modules/mediastream/RTCRtpSFrameTransform.cpp:
(WebCore::transformFrame):
(WebCore::RTCRtpSFrameTransform::createStreams):

LayoutTests:

* webrtc/sframe-transform-buffer-source-expected.txt: Added.
* webrtc/sframe-transform-buffer-source.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (275873 => 275874)


--- trunk/LayoutTests/ChangeLog	2021-04-13 09:14:23 UTC (rev 275873)
+++ trunk/LayoutTests/ChangeLog	2021-04-13 09:26:22 UTC (rev 275874)
@@ -1,3 +1,13 @@
+2021-04-13  Youenn Fablet  <[email protected]>
+
+        SFrameTransform should be able to take array buffer views as input
+        https://bugs.webkit.org/show_bug.cgi?id=224437
+
+        Reviewed by Eric Carlson.
+
+        * webrtc/sframe-transform-buffer-source-expected.txt: Added.
+        * webrtc/sframe-transform-buffer-source.html: Added.
+
 2021-04-12  Sergio Villar Senin  <[email protected]>
 
         [css-flexbox] CDC COVID Vaccine Tracker: Safari garbles data table

Added: trunk/LayoutTests/webrtc/sframe-transform-buffer-source-expected.txt (0 => 275874)


--- trunk/LayoutTests/webrtc/sframe-transform-buffer-source-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/webrtc/sframe-transform-buffer-source-expected.txt	2021-04-13 09:26:22 UTC (rev 275874)
@@ -0,0 +1,3 @@
+
+PASS Uint8Array as input to SFrameTransform
+

Added: trunk/LayoutTests/webrtc/sframe-transform-buffer-source.html (0 => 275874)


--- trunk/LayoutTests/webrtc/sframe-transform-buffer-source.html	                        (rev 0)
+++ trunk/LayoutTests/webrtc/sframe-transform-buffer-source.html	2021-04-13 09:26:22 UTC (rev 275874)
@@ -0,0 +1,50 @@
+<!doctype html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <script src=""
+        <script src=""
+    </head>
+    <body>
+        <script>
+
+async function getEncryptedData(transform)
+{
+    const chunk = await transform.readable.getReader().read();
+    const value = new Uint8Array(chunk.value);
+    return [...value];
+}
+
+promise_test(async (test) => {
+    const key = await crypto.subtle.importKey("raw", new Uint8Array([143, 77, 43, 10, 72, 19, 37, 67, 236, 219, 24, 93, 26, 165, 91, 178]), "HKDF", false, ["deriveBits", "deriveKey"]);
+    const transform1 = new SFrameTransform;
+    const transform2 = new SFrameTransform;
+    const transform3 = new SFrameTransform;
+
+    await transform1.setEncryptionKey(key);
+    await transform2.setEncryptionKey(key);
+    await transform3.setEncryptionKey(key);
+
+    const buffer1 = new ArrayBuffer(10);
+    const buffer2 = new ArrayBuffer(11);
+    const view1 = new Uint8Array(buffer1);
+    const view2 = new Uint8Array(buffer2, 1);
+    for (let i = 0 ; i < buffer1.byteLength; ++i) {
+        view1[i] = i;
+        view2[i] = i;
+    }
+
+    transform1.writable.getWriter().write(buffer1);
+    transform2.writable.getWriter().write(view1);
+    transform3.writable.getWriter().write(view2);
+
+    const result1 = await getEncryptedData(transform1);
+    const result2 = await getEncryptedData(transform2);
+    const result3 = await getEncryptedData(transform3);
+
+    assert_array_equals(result1, result2, "result2");
+    assert_array_equals(result1, result3, "result3");
+}, "Uint8Array as input to SFrameTransform");
+        </script>
+    </body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (275873 => 275874)


--- trunk/Source/WebCore/ChangeLog	2021-04-13 09:14:23 UTC (rev 275873)
+++ trunk/Source/WebCore/ChangeLog	2021-04-13 09:26:22 UTC (rev 275874)
@@ -1,3 +1,19 @@
+2021-04-13  Youenn Fablet  <[email protected]>
+
+        SFrameTransform should be able to take array buffer views as input
+        https://bugs.webkit.org/show_bug.cgi?id=224437
+
+        Reviewed by Eric Carlson.
+
+        Add support for processing ArrayBufferView.
+        We still output ArrayBuffer as output.
+
+        Test: webrtc/sframe-transform-buffer-source.html
+
+        * Modules/mediastream/RTCRtpSFrameTransform.cpp:
+        (WebCore::transformFrame):
+        (WebCore::RTCRtpSFrameTransform::createStreams):
+
 2021-04-12  Sergio Villar Senin  <[email protected]>
 
         [css-flexbox] CDC COVID Vaccine Tracker: Safari garbles data table

Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp (275873 => 275874)


--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp	2021-04-13 09:14:23 UTC (rev 275873)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp	2021-04-13 09:26:22 UTC (rev 275874)
@@ -154,10 +154,9 @@
     source.enqueue(toJS(&globalObject, &globalObject, frame));
 }
 
-template<>
-void transformFrame(JSC::ArrayBuffer& value, JSDOMGlobalObject& globalObject, RTCRtpSFrameTransformer& transformer, SimpleReadableStreamSource& source)
+static void transformFrame(const uint8_t* data, size_t size, JSDOMGlobalObject& globalObject, RTCRtpSFrameTransformer& transformer, SimpleReadableStreamSource& source)
 {
-    auto result = transformer.transform(static_cast<const uint8_t*>(value.data()), value.byteLength());
+    auto result = transformer.transform(data, size);
     RELEASE_LOG_ERROR_IF(result.hasException(), WebRTC, "RTCRtpSFrameTransform failed transforming a frame");
 
     auto buffer = result.hasException() ? SharedBuffer::create() : SharedBuffer::create(result.returnValue().data(), result.returnValue().size());
@@ -175,7 +174,7 @@
         auto& globalObject = *JSC::jsCast<JSDOMGlobalObject*>(context.globalObject());
         auto scope = DECLARE_THROW_SCOPE(globalObject.vm());
 
-        auto frame = convert<IDLUnion<IDLArrayBuffer, IDLInterface<RTCEncodedAudioFrame>, IDLInterface<RTCEncodedVideoFrame>>>(globalObject, value);
+        auto frame = convert<IDLUnion<IDLArrayBuffer, IDLArrayBufferView, IDLInterface<RTCEncodedAudioFrame>, IDLInterface<RTCEncodedVideoFrame>>>(globalObject, value);
         if (scope.exception())
             return Exception { ExistingExceptionError };
 
@@ -185,7 +184,9 @@
         }, [&](RefPtr<RTCEncodedVideoFrame>& value) {
             transformFrame(*value, globalObject, transformer.get(), *readableStreamSource);
         }, [&](RefPtr<ArrayBuffer>& value) {
-            transformFrame(*value, globalObject, transformer.get(), *readableStreamSource);
+            transformFrame(static_cast<const uint8_t*>(value->data()), value->byteLength(), globalObject, transformer.get(), *readableStreamSource);
+        }, [&](RefPtr<ArrayBufferView>& value) {
+            transformFrame(static_cast<const uint8_t*>(value->data()), value->byteLength(), globalObject, transformer.get(), *readableStreamSource);
         });
         return { };
     }));

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to