Changeset 271181 in webkit

Timestamp:

Jan 5, 2021, 4:33:17 PM (6 years ago)

Author:

Peng Liu

Message:

media-source-webm.html: Handle frame size in HAVE_METADATA
​https://bugs.webkit.org/show_bug.cgi?id=220046

Reviewed by Daniel Bates.

A follow-up patch to fix a failure on Big Sur. A 'resize' event can be fired before or
after the 'update' event. The test needs to support both cases.

• media/media-source/media-source-webm-expected.txt:
• media/media-source/media-source-webm.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• media/media-source/media-source-webm-expected.txt (modified) (1 diff)
• media/media-source/media-source-webm.html (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-05  Peng Liu  <peng.liu6@apple.com>
+
+        media-source-webm.html: Handle frame size in HAVE_METADATA
+        https://bugs.webkit.org/show_bug.cgi?id=220046
+
+        Reviewed by Daniel Bates.
+
+        A follow-up patch to fix a failure on Big Sur. A 'resize' event can be fired before or
+        after the 'update' event. The test needs to support both cases.
+
+        * media/media-source/media-source-webm-expected.txt:
+        * media/media-source/media-source-webm.html:
+
 2021-01-05  Peng Liu  <peng.liu6@apple.com>
 

trunk/LayoutTests/media/media-source/media-source-webm-expected.txt

@@ -6 +6 @@
 RUN(sourceBuffer = source.addSourceBuffer(loader.type()))
 RUN(sourceBuffer.appendBuffer(loader.initSegment()))
-EVENT(resize)
-EXPECTED (video.videoWidth == '320') OK
-EXPECTED (video.videoHeight == '240') OK
 EVENT(update)
 Append a media segment.
 RUN(sourceBuffer.appendBuffer(loader.mediaSegment(0)))
+EXPECTED (resizeEventFired == 'true') OK
+EXPECTED (videoWidth == '320') OK
+EXPECTED (videoHeight == '240') OK
 END OF TEST
 

trunk/LayoutTests/media/media-source/media-source-webm.html

@@ -9 +9 @@
     var source;
     var sourceBuffer;
+    var resizeEventFired = false;
+    var videoWidth = 0;
+    var videoHeight = 0;
 
     function loaderPromise(loader) {
@@ -23 +26 @@
                 if (video.videoWidth == 0 && video.videoHeight == 0)
                     return;
-                consoleWrite(`EVENT(${event.type})`);
-                testExpected('video.videoWidth', width);
-                testExpected('video.videoHeight', height);
+                resizeEventFired = true;
+                videoWidth = video.videoWidth;
+                videoHeight = video.videoHeight;
                 resolve();
             });
@@ -44 +47 @@
             run('source.duration = loader.duration()');
             run('sourceBuffer = source.addSourceBuffer(loader.type())');
-            const resized = resizePromise(video, 320, 240);
+            const resized = resizePromise(video);
             run('sourceBuffer.appendBuffer(loader.initSegment())');
 
@@ -53 +56 @@
 
             await resized;
+            testExpected('resizeEventFired', true);
+            testExpected('videoWidth', 320);
+            testExpected('videoHeight', 240);
             endTest();
         } catch (e) {