Changeset 207827 in webkit

Timestamp:

Oct 25, 2016 10:34:07 AM (7 years ago)

Author:

eric.carlson@apple.com

Message:

[MediaStream] Add "has capture device" bit to media state flags
​https://bugs.webkit.org/show_bug.cgi?id=163952

Reviewed by Jer Noble.

Source/WebCore:

No new tests, updated fast/mediastream/MediaStream-page-muted.html and media/muted-video-is-playing-audio.html.

• Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::mediaState): Set HasMediaCaptureDevice, only set HasActiveMediaCaptureDevice when

actually producing data.

• page/MediaProducer.h: Add HasMediaCaptureDevice bit.

• testing/Internals.cpp:

(WebCore::Internals::pageMediaState): Return a string representing MediaStateFlags.
(WebCore::Internals::isPagePlayingAudio): Deleted.

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

• fast/mediastream/MediaStream-page-muted-expected.txt:
• fast/mediastream/MediaStream-page-muted.html:
• media/muted-video-is-playing-audio-expected.txt:
• media/muted-video-is-playing-audio.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt (modified) (1 diff)
• LayoutTests/fast/mediastream/MediaStream-page-muted.html (modified) (2 diffs)
• LayoutTests/media/muted-video-is-playing-audio-expected.txt (modified) (1 diff)
• LayoutTests/media/muted-video-is-playing-audio.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaStream.cpp (modified) (1 diff)
• Source/WebCore/page/MediaProducer.h (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-25  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] Add "has capture device" bit to media state flags
+        https://bugs.webkit.org/show_bug.cgi?id=163952
+
+        Reviewed by Jer Noble.
+
+        * fast/mediastream/MediaStream-page-muted-expected.txt:
+        * fast/mediastream/MediaStream-page-muted.html:
+        * media/muted-video-is-playing-audio-expected.txt:
+        * media/muted-video-is-playing-audio.html:
+
 2016-10-25  Brady Eidson  <beidson@apple.com>
 

trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt

@@ -8 +8 @@
 PASS mediaStream is an instance of Object
 PASS mediaStream.getTracks().length is 2
+PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became true
 
 *** Muting capture devices
 EVENT: mute
-PASS event.target.muted is true
+PASS muteChangedEvent.target.muted is true
+PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
+EVENT: mute
+PASS muteChangedEvent.target.muted is true
+PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
 
-EVENT: mute
-PASS event.target.muted is true
-
+PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became false
 
 *** Unmuting capture devices
 EVENT: unmute
-PASS event.target.muted is false
+PASS muteChangedEvent.target.muted is false
+PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
+EVENT: unmute
+PASS muteChangedEvent.target.muted is false
+PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
 
-EVENT: unmute
-PASS event.target.muted is false
-
+PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became true
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html

@@ -6 +6 @@
             let mediaStream;
             let eventCount = 0;
+            let muteChangedEvent;
+
+            function nextStep()
+            {
+                if (muteChangedEvent.type == "unmute") {
+                    finishJSTest();
+                    return;
+                }
+
+                debug("<br>*** Unmuting capture devices");
+                eventCount = 0;
+                internals.setPageMuted("");
+            }
 
             function muteChanged(ev)
             {
-                event = ev;
-                debug(`EVENT: ${ev.type}`);
-                shouldBe('event.target.muted', (ev.type == "mute").toString());
-                debug("");
+                muteChangedEvent = ev;
+                debug(`EVENT: ${muteChangedEvent.type}`);
+                shouldBe('muteChangedEvent.target.muted', (muteChangedEvent.type == "mute").toString());
+                shouldBe("window.internals.pageMediaState().includes('HasMediaCaptureDevice')", "true");
 
                 if (++eventCount == 2) {
-                    eventCount = 0;
-
-                    if (ev.type == "unmute") {
-                        finishJSTest();
-                        return;
-                    }
-
-                    if (window.internals) {
-                        debug("<br>*** Unmuting capture devices");
-                        internals.setPageMuted("");
-                    }
+                    debug("");
+                    let shouldBeActive = muteChangedEvent.type == "mute" ? "false" : "true";
+                    shouldBecomeEqual("window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice')", shouldBeActive, nextStep);
                 }
+            }
+            
+            function muteCaptureDevices()
+            {
+                debug("<br>*** Muting capture devices");
+                internals.setPageMuted("capturedevices");
             }
             
@@ -44 +55 @@
                         }
 
-                        if (window.internals) {
-                            debug("<br>*** Muting capture devices");
-                            internals.setPageMuted("capturedevices");
-                        }
+                        shouldBecomeEqual("window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice')", "true", muteCaptureDevices);
                     })
                     .catch((err) => {

trunk/LayoutTests/media/muted-video-is-playing-audio-expected.txt

@@ -4 +4 @@
 
 
-PASS window.internals.isPagePlayingAudio() became true
-PASS window.internals.isPagePlayingAudio() became false
-PASS window.internals.isPagePlayingAudio() became true
+PASS window.internals.pageMediaState().includes('IsPlayingAudio') became true
+PASS window.internals.pageMediaState().includes('IsPlayingAudio') became false
+PASS window.internals.pageMediaState().includes('IsPlayingAudio') became true
 PASS successfullyParsed is true
 

trunk/LayoutTests/media/muted-video-is-playing-audio.html

@@ -16 +16 @@
             {
                 run("video.muted = false");
-                shouldBecomeEqual("window.internals.isPagePlayingAudio()", "true", finishJSTest);
+                shouldBecomeEqual("window.internals.pageMediaState().includes('IsPlayingAudio')", "true", finishJSTest);
             }
 
@@ -22 +22 @@
             {
                 run("video.muted = true");
-                shouldBecomeEqual("window.internals.isPagePlayingAudio()", "false", testUnmutingVideo);
+                shouldBecomeEqual("window.internals.pageMediaState().includes('IsPlayingAudio')", "false", testUnmutingVideo);
             }
 
-            shouldBecomeEqual("window.internals.isPagePlayingAudio()", "true", testMutingVideo);
+            shouldBecomeEqual("window.internals.pageMediaState().includes('IsPlayingAudio')", "true", testMutingVideo);
         </script>
         <script src="../resources/js-test-post.js"></script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-25  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] Add "has capture device" bit to media state flags
+        https://bugs.webkit.org/show_bug.cgi?id=163952
+
+        Reviewed by Jer Noble.
+
+        No new tests, updated fast/mediastream/MediaStream-page-muted.html and media/muted-video-is-playing-audio.html.
+
+        * Modules/mediastream/MediaStream.cpp:
+        (WebCore::MediaStream::mediaState): Set HasMediaCaptureDevice, only set HasActiveMediaCaptureDevice when
+          actually producing data.
+
+        * page/MediaProducer.h: Add HasMediaCaptureDevice bit.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::pageMediaState): Return a string representing MediaStateFlags.
+        (WebCore::Internals::isPagePlayingAudio): Deleted.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2016-10-25  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

@@ -275 +275 @@
         return state;
 
-    if (m_externallyMuted || m_private->isProducingData())
+    state |= HasMediaCaptureDevice;
+    if (m_private->isProducingData())
         state |= HasActiveMediaCaptureDevice;
 

trunk/Source/WebCore/page/MediaProducer.h

@@ -45 +45 @@
         HasAudioOrVideo = 1 << 10,
         HasActiveMediaCaptureDevice = 1 << 11,
+        HasMediaCaptureDevice = 1 << 12,
     };
     typedef unsigned MediaStateFlags;

trunk/Source/WebCore/testing/Internals.cpp

@@ -2967 +2967 @@
 }
 
-bool Internals::isPagePlayingAudio()
+String Internals::pageMediaState()
 {
     Document* document = contextDocument();
     if (!document || !document->page())
-        return false;
-
-    return !!(document->page()->mediaState() & MediaProducer::IsPlayingAudio);
+        return emptyString();
+
+    WebCore::MediaProducer::MediaStateFlags state = document->page()->mediaState();
+    StringBuilder string;
+    if (state & MediaProducer::IsPlayingAudio)
+        string.append("IsPlayingAudio,");
+    if (state & MediaProducer::IsPlayingVideo)
+        string.append("IsPlayingVideo,");
+    if (state & MediaProducer::IsPlayingToExternalDevice)
+        string.append("IsPlayingToExternalDevice,");
+    if (state & MediaProducer::RequiresPlaybackTargetMonitoring)
+        string.append("RequiresPlaybackTargetMonitoring,");
+    if (state & MediaProducer::ExternalDeviceAutoPlayCandidate)
+        string.append("ExternalDeviceAutoPlayCandidate,");
+    if (state & MediaProducer::DidPlayToEnd)
+        string.append("DidPlayToEnd,");
+    if (state & MediaProducer::IsSourceElementPlaying)
+        string.append("IsSourceElementPlaying,");
+
+    if (state & MediaProducer::IsNextTrackControlEnabled)
+        string.append("IsNextTrackControlEnabled,");
+    if (state & MediaProducer::IsPreviousTrackControlEnabled)
+        string.append("IsPreviousTrackControlEnabled,");
+
+    if (state & MediaProducer::HasPlaybackTargetAvailabilityListener)
+        string.append("HasPlaybackTargetAvailabilityListener,");
+    if (state & MediaProducer::HasAudioOrVideo)
+        string.append("HasAudioOrVideo,");
+    if (state & MediaProducer::HasActiveMediaCaptureDevice)
+        string.append("HasActiveMediaCaptureDevice,");
+    if (state & MediaProducer::HasMediaCaptureDevice)
+        string.append("HasMediaCaptureDevice,");
+
+    if (string.isEmpty())
+        string.append("IsNotPlaying");
+    else
+        string.resize(string.length() - 1);
+
+    return string.toString();
 }
 

trunk/Source/WebCore/testing/Internals.h

@@ -442 +442 @@
 
     void setPageMuted(const String&);
-    bool isPagePlayingAudio();
+    String pageMediaState();
 
     void setPageDefersLoading(bool);

trunk/Source/WebCore/testing/Internals.idl

@@ -419 +419 @@
 
     void setPageMuted(DOMString mutedState);
-    boolean isPagePlayingAudio();
+    DOMString pageMediaState();
 
     void setPageDefersLoading(boolean defersLoading);