WebPlatformForEmbedded · thiblahute · Jan 18, 2019 · Jan 23, 2019 · Dec 1, 2018 · Sep 20, 2018
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,42 @@
+2018-11-16  Thibault Saunier  <[email protected]>
+
+        [GStreamer][MediaStream] Handle track addition and removal
+        https://bugs.webkit.org/show_bug.cgi?id=191599
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        * fast/mediastream/MediaStream-video-element-remove-track-expected.txt: Added.
+        * fast/mediastream/MediaStream-video-element-remove-track.html: Added.
+
+2018-10-11  Alejandro G. Castro  <[email protected]>
+
+        [GTK][WPE] Add mediaDevices.enumerateDevices support
+        https://bugs.webkit.org/show_bug.cgi?id=185761
+
+        Reviewed by Youenn Fablet.
+
+        Remove the failure expectation for the test
+        media-devices-enumerate-devices.html. Just for the record we have
+        also checked the following tests.
+
+        fast/mediastream/media-devices-enumerate-devices.html
+        fast/mediastream/resources/enumerate-devices-frame.html
+        http/tests/media/media-stream/enumerate-devices-source-id.html
+        http/tests/media/media-stream/enumerate-devices-source-id-persistent.html
+        http/tests/media/media-stream/resources/enumerate-devices-source-id-frame.html
+
+        * platform/gtk/TestExpectations:
+
+2018-10-02  Thibault Saunier  <[email protected]>
+
+        [GTK][WPE] Blacklist more tests that are requiring webrtc <-> webaudio bridging
+        https://bugs.webkit.org/show_bug.cgi?id=189829
+
+        Reviewed by Alejandro G. Castro.
+
+        * platform/gtk/TestExpectations:
+        * platform/wpe/TestExpectations:
+
 2018-10-01  Alicia Boya García  <[email protected]>
 
         [MSE][GStreamer] Reset running time in PlaybackPipeline::flush()

diff --git a/LayoutTests/fast/mediastream/MediaStream-video-element-remove-track-expected.txt b/LayoutTests/fast/mediastream/MediaStream-video-element-remove-track-expected.txt
@@ -0,0 +1,47 @@
+Tests checking removing MediaStream track applies to the video element.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+
+
+**** calling mediaDevices.getUserMedia() ****
+PASS mediaDevices.getUserMedia succeeded.
+
+**** setup video element ****
+video.srcObject = mediaStream
+Event 'canplay'
+
+*** start playback ****
+video.play()
+video.pause()
+
+**** check video element ****
+
+**** check video tracks ****
+PASS video.videoTracks.length is 1
+PASS video.videoTracks[0].id is mediaStream.getVideoTracks()[0].id
+
+**** check audio tracks ****
+PASS video.audioTracks.length is 1
+PASS video.audioTracks[0].id is mediaStream.getAudioTracks()[0].id
+
+**** removing audio track ****
+
+**** check video element ****
+PASS video.videoWidth is mediaStream.getVideoTracks()[0].getSettings().width
+PASS video.videoHeight is mediaStream.getVideoTracks()[0].getSettings().height
+
+**** check video tracks ****
+PASS video.videoTracks.length is 1
+PASS video.videoTracks[0].id is mediaStream.getVideoTracks()[0].id
+PASS video.videoTracks[0].language is ""
+PASS video.videoTracks[0].kind is "main"
+
+**** check no audio track ****
+PASS video.audioTracks.length is 0
+PASS mediaStream.getAudioTracks().length is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/mediastream/MediaStream-video-element-remove-track.html b/LayoutTests/fast/mediastream/MediaStream-video-element-remove-track.html
@@ -0,0 +1,112 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+    <head>
+        <script src="../../resources/js-test-pre.js"></script>
+        <script>
+            var video;
+            var mediaStream;
+
+            function logEvent(element, eventName, func)
+            {
+                function _eventCallback(evt)
+                {
+                    if (window.wasFinishJSTestCalled)
+                        return;
+
+                    debug(`Event <em>'${evt.type}'</em>`);
+                    if (func)
+                        func(evt);
+                }
+                element.addEventListener(eventName, _eventCallback, true);
+            }
+
+            function checkVideoElement()
+            {
+                evalAndLog("video.pause()");
+
+                debug("<br>**** check video element ****");
+                debug("<br>**** check video tracks ****");
+                shouldBe('video.videoTracks.length', '1');
+                shouldBe('video.videoTracks[0].id', 'mediaStream.getVideoTracks()[0].id');
+
+                debug("<br>**** check audio tracks ****");
+                shouldBe('video.audioTracks.length', '1');
+                shouldBe('video.audioTracks[0].id', 'mediaStream.getAudioTracks()[0].id');
+
+                setTimeout(removeAudioTrack, 100);
+            }
+
+            function checkVideoElement2()
+            {
+                debug("<br>**** check video element ****");
+                shouldBe('video.videoWidth', 'mediaStream.getVideoTracks()[0].getSettings().width');
+                shouldBe('video.videoHeight', 'mediaStream.getVideoTracks()[0].getSettings().height');
+
+                debug("<br>**** check video tracks ****");
+                shouldBe('video.videoTracks.length', '1');
+                shouldBe('video.videoTracks[0].id', 'mediaStream.getVideoTracks()[0].id');
+                shouldBeEqualToString('video.videoTracks[0].language', '');
+                shouldBeEqualToString('video.videoTracks[0].kind', 'main');
+
+                debug("<br>**** check no audio track ****");
+                shouldBe('video.audioTracks.length', '0');
+                shouldBe('mediaStream.getAudioTracks().length', '0');
+
+                finishJSTest();
+            }
+
+            function canplay()
+            {
+                debug("<br>*** start playback ****");
+                evalAndLog("video.play()");
+                setTimeout(checkVideoElement, 100);
+            }
+
+            function removeAudioTrack() {
+                track = mediaStream.getAudioTracks()[0];
+                debug("<br>**** removing audio track ****");
+                try {
+                    mediaStream.removeTrack(track);
+                } catch (exception) {
+                    testFailed("removeTrack threw an exception.");
+                    finishJSTest();
+                }
+                setTimeout(checkVideoElement2, 100);
+            }
+
+            function setupStream(stream)
+            {
+                mediaStream = stream;
+                testPassed('mediaDevices.getUserMedia succeeded.');
+
+                debug("<br>**** setup video element ****");
+                evalAndLog("video.srcObject = mediaStream");
+            }
+
+            function start()
+            {
+                description("Tests checking removing MediaStream track applies to the video element.");
+                video = document.querySelector('video');
+                logEvent(video, 'canplay', canplay)
+
+                debug("<br>**** calling mediaDevices.getUserMedia() ****");
+                if (window.testRunner)
+                    testRunner.setUserMediaPermission(true);
+                navigator.mediaDevices.getUserMedia( {video: true, audio: true} )
+                    .then(setupStream)
+                    .catch(function(reason) {
+                        debug(`Stream generation failed with error: ${reason}`);
+                    });
+            }
+
+            window.jsTestIsAsync = true;
+            window.successfullyParsed = true;
+        </script>
+    </head>
+    <body onload="start()">
+        <p id="description"></p>
+        <video controls  width="680" height="360"></video>
+        <div id="console"></div>
+        <script src="../../resources/js-test-post.js"></script>
+    </body>
+</html>
diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
@@ -603,6 +603,7 @@ webkit.org/b/186933 webrtc/clone-audio-track.html
 webkit.org/b/186933 webrtc/audio-replace-track.html
 webkit.org/b/186933 webrtc/audio-peer-connection-webaudio.html
 webkit.org/b/186933 webrtc/audio-muted-stats.html
+webkit.org/b/186933 webrtc/getUserMedia-webaudio-autoplay.html
 
 imported/w3c/web-platform-tests/webrtc/ [ Skip ]
 http/tests/webrtc [ Skip ]
@@ -635,7 +636,6 @@ webkit.org/b/79203 imported/w3c/web-platform-tests/mediacapture-streams/MediaStr
 webkit.org/b/151344 fast/mediastream/MediaStream-add-ended-tracks.html [ Timeout ]
 # Crash is bug #176801
 webkit.org/b/160996 fast/mediastream/MediaStream-video-element-video-tracks-disabled.html [ ImageOnlyFailure Crash ]
-webkit.org/b/172269 fast/mediastream/media-devices-enumerate-devices.html [ Failure ]
 webkit.org/b/173257 fast/mediastream/getUserMedia-grant-persistency3.html [ Pass Failure ]
 webkit.org/b/176801 fast/mediastream/argument-types.html [ Crash Pass ]
 

diff --git a/LayoutTests/platform/wpe/TestExpectations b/LayoutTests/platform/wpe/TestExpectations
@@ -76,10 +76,11 @@ webkit.org/b/186933 webrtc/clone-audio-track.html
 webkit.org/b/186933 webrtc/audio-replace-track.html
 webkit.org/b/186933 webrtc/audio-peer-connection-webaudio.html
 webkit.org/b/186933 webrtc/audio-muted-stats.html
+webkit.org/b/186933 webrtc/getUserMedia-webaudio-autoplay.html
 
 # The MediaStream implementation is still not completed
 webkit.org/b/79203 fast/mediastream/mock-media-source-webaudio.html [ Timeout ]
-webkit.org/b/79203 fast/mediastream/getUserMedia-webaudio.html [ Failure ]
+webkit.org/b/79203 fast/mediastream/getUserMedia-webaudio.html [ Failure Crash ]
 webkit.org/b/79203 fast/mediastream/MediaStream-video-element-track-stop.html [ Timeout ]
 webkit.org/b/79203 fast/mediastream/RTCPeerConnection-dtmf.html [ Timeout ]
 webkit.org/b/79203 fast/mediastream/RTCPeerConnection-icecandidate-event.html [ Pass Failure Crash ]