Changeset 272911 in webkit

Timestamp:

Feb 16, 2021 9:57:28 AM (17 months ago)

Author:

youenn@apple.com

Message:

MediaRecorder.stop() does not work correctly when recording has been paused.
​https://bugs.webkit.org/show_bug.cgi?id=221916
<rdar://problem/74366154>

Reviewed by Eric Carlson.

LayoutTests/imported/w3c:

• web-platform-tests/mediacapture-record/MediaRecorder-pause-resume-expected.txt:
• web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html:

Source/WebCore:

Proceed with stop steps in case of paused state, and not only in case of recording state.
Covered by added WPT test.

• Modules/mediarecorder/MediaRecorder.cpp:

(WebCore::MediaRecorder::stopRecordingInternal):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediarecorder/MediaRecorder.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-02-16  Youenn Fablet  <youenn@apple.com>
+
+        MediaRecorder.stop() does not work correctly when recording has been paused.
+        https://bugs.webkit.org/show_bug.cgi?id=221916
+        <rdar://problem/74366154>
+
+        Reviewed by Eric Carlson.
+
+        * web-platform-tests/mediacapture-record/MediaRecorder-pause-resume-expected.txt:
+        * web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html:
+
 2021-02-16  Antoine Quint  <graouts@webkit.org>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume-expected.txt

@@ -1 +1 @@
 
 PASS MediaRecorder handles pause() and resume() calls appropriately in state and events
+PASS MediaRecorder handles stop() in paused state appropriately
 

trunk/LayoutTests/imported/w3c/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html

@@ -65 +65 @@
             "Should have gotten expected events");
     }, "MediaRecorder handles pause() and resume() calls appropriately in state and events");
+
+    promise_test(async () => {
+        let video = createVideoStream();
+        let recorder = new MediaRecorder(video);
+        let events = recordEvents(recorder,
+            ["start", "stop", "dataavailable", "pause", "resume", "error"]);
+
+        recorder.start();
+        assert_equals(recorder.state, "recording", "MediaRecorder has been started successfully");
+        await new Promise(r => recorder.onstart = r);
+
+        recorder.pause();
+        assert_equals(recorder.state, "paused", "MediaRecorder should be paused immediately following pause()");
+        let event = await new Promise(r => recorder.onpause = r);
+        assert_equals(event.type, "pause", "the event type should be pause");
+        assert_true(event.isTrusted, "isTrusted should be true when the event is created by C++");
+
+        recorder.stop();
+        assert_equals(recorder.state, "inactive", "MediaRecorder should be inactive after being stopped");
+        await new Promise(r => recorder.onstop = r);
+
+        recorder.start();
+        assert_equals(recorder.state, "recording", "MediaRecorder has been started successfully");
+        await new Promise(r => recorder.onstart = r);
+
+        assert_array_equals(events, ["start", "pause", "dataavailable", "stop", "start"],
+            "Should have gotten expected events");
+    }, "MediaRecorder handles stop() in paused state appropriately");
 </script>
 </body>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-16  Youenn Fablet  <youenn@apple.com>
+
+        MediaRecorder.stop() does not work correctly when recording has been paused.
+        https://bugs.webkit.org/show_bug.cgi?id=221916
+        <rdar://problem/74366154>
+
+        Reviewed by Eric Carlson.
+
+        Proceed with stop steps in case of paused state, and not only in case of recording state.
+        Covered by added WPT test.
+
+        * Modules/mediarecorder/MediaRecorder.cpp:
+        (WebCore::MediaRecorder::stopRecordingInternal):
+
 2021-02-16  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/Modules/mediarecorder/MediaRecorder.cpp

@@ -314 +314 @@
 void MediaRecorder::stopRecordingInternal(CompletionHandler<void()>&& completionHandler)
 {
-    if (state() != RecordingState::Recording) {
+    if (state() == RecordingState::Inactive) {
         completionHandler();
         return;