Changeset 290658 in webkit

Timestamp:

Mar 1, 2022, 10:34:58 AM (5 years ago)

Author:

youenn@apple.com

Message:

fast/mediastream/getUserMedia-to-canvas-1.html and fast/mediastream/getUserMedia-to-canvas-2.html are failing on MacOS when remote video frame flag is enabled
​https://bugs.webkit.org/show_bug.cgi?id=237042
<rdar://problem/89298601>

Reviewed by Eric Carlson.

Video element videoWidth/videoHeight are updated when track settings are changed,
and not when video frames being received.

This does not guarantee that videoWidth/videoHeight (main thread) are fully in sync
with the actual video frames (background thread) when there is a change of size.

We might be able to tighten this in MediaPlayerPrivateMediaStreamAVFObjC by only resorting on video frames.
In the meantime, we update the test to set the orientation before creating the source.
This makes sure the video frames have the expected size and rotation.

• fast/mediastream/getUserMedia-to-canvas-1.html:
• fast/mediastream/getUserMedia-to-canvas-2.html:
• fast/mediastream/resources/getUserMedia-to-canvas.js:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/mediastream/getUserMedia-to-canvas-1.html (modified) (1 diff)
• fast/mediastream/getUserMedia-to-canvas-2.html (modified) (1 diff)
• fast/mediastream/resources/getUserMedia-to-canvas.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-03-01  Youenn Fablet  <youenn@apple.com>
+
+        fast/mediastream/getUserMedia-to-canvas-1.html and fast/mediastream/getUserMedia-to-canvas-2.html are failing on MacOS when remote video frame flag is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=237042
+        <rdar://problem/89298601>
+
+        Reviewed by Eric Carlson.
+
+        Video element videoWidth/videoHeight are updated when track settings are changed,
+        and not when video frames being received.
+
+        This does not guarantee that videoWidth/videoHeight (main thread) are fully in sync
+        with the actual video frames (background thread) when there is a change of size.
+
+        We might be able to tighten this in MediaPlayerPrivateMediaStreamAVFObjC by only resorting on video frames.
+        In the meantime, we update the test to set the orientation before creating the source.
+        This makes sure the video frames have the expected size and rotation.
+
+        * fast/mediastream/getUserMedia-to-canvas-1.html:
+        * fast/mediastream/getUserMedia-to-canvas-2.html:
+        * fast/mediastream/resources/getUserMedia-to-canvas.js:
+
 2022-03-01  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/fast/mediastream/getUserMedia-to-canvas-1.html

@@ -1 @@
-<!doctype html><!-- webkit-test-runner [ WebRTCRemoteVideoFrameEnabled=false ] -->
+<!doctype html>
 <html>
 <head>

trunk/LayoutTests/fast/mediastream/getUserMedia-to-canvas-2.html

@@ -1 @@
-<!doctype html><!-- webkit-test-runner [ WebRTCRemoteVideoFrameEnabled=false ] -->
+<!doctype html>
 <html>
 <head>

trunk/LayoutTests/fast/mediastream/resources/getUserMedia-to-canvas.js

@@ -11 +11 @@
     video.srcObject = await navigator.mediaDevices.getUserMedia({ video: { width: { exact: width } } });
     await video.play();
-    assert_equals(video.videoWidth, width);
+    assert_true(video.videoWidth === width || video.videoHeight === width);
     return video;
 }
@@ -128 +128 @@
 async function testUserMediaToCanvas(t, subcase) {
     const desc = testDescription(subcase);
+    const [angle] = setMockCameraImageOrientation(subcase.angle);
     const video = await createSourceVideo();
     const debuge = document.getElementById("debuge");
     debuge.append(video);
-    const realVideoSize = [video.videoWidth, video.videoHeight];
+    const videoSize = [video.videoWidth, video.videoHeight];
     t.add_cleanup(async () => {
-        // Reset orientation for the next test by going to 0.
-        if (subcase.angle == 180) {
-            // 180 -> 0 cannot detect rotation via video size change. Go via 90.
-            const [angle, videoSize] = setMockCameraImageOrientation(90, realVideoSize);
-            await waitForVideoSize(video, videoSize[0], videoSize[1]);
-        }
         setMockCameraImageOrientation(0);
-        await waitForVideoSize(video, realVideoSize[0], realVideoSize[1]);
         debuge.removeChild(video);
     });
-
-    if (subcase.angle == 180) {
-        // 0 -> 180 cannot detect rotation via video size change. Go via 90.
-        const [angle, videoSize] = setMockCameraImageOrientation(90, realVideoSize);
-        await waitForVideoSize(video, videoSize[0], videoSize[1]);
-    }
-    const [angle, videoSize] = setMockCameraImageOrientation(subcase.angle, realVideoSize);
-    await waitForVideoSize(video, videoSize[0], videoSize[1]);
 
     const canvas = createVerifyCanvas(video);