Changeset 226769 in webkit

Timestamp:

Jan 11, 2018 1:24:50 AM (6 years ago)

Author:

Philippe Normand

Message:

[GTK] media/muted-video-is-playing-audio.html is timing out
​https://bugs.webkit.org/show_bug.cgi?id=163781

Reviewed by Carlos Garcia Campos.

Source/WebCore:

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo): Sprinkle some debugging.
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio): Ditto.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

(WebCore::MediaPlayerPrivateGStreamerBase::setMuted): Ditto.

LayoutTests:

The test should un-mute the page because the IsPlayingAudio flag indirectly depends on this.

• media/muted-video-is-playing-audio.html: Un-mute the page.
• platform/gtk/TestExpectations: Unflag now-passing test.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/muted-video-is-playing-audio.html (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-01-11  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] media/muted-video-is-playing-audio.html is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=163781
+
+        Reviewed by Carlos Garcia Campos.
+
+        The test should un-mute the page because the IsPlayingAudio flag indirectly depends on this.
+
+        * media/muted-video-is-playing-audio.html: Un-mute the page.
+        * platform/gtk/TestExpectations: Unflag now-passing test.
+
 2018-01-10  Andy Estes  <aestes@apple.com>
 

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

@@ -12 +12 @@
 
             jsTestIsAsync = true;
+
+            // Un-mute audio on the page before starting the test.
+            if (window.internals)
+                internals.setPageMuted("");
 
             function testUnmutingVideo()

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -2183 +2183 @@
 webkit.org/b/163780 media/media-controls-drag-timeline-set-controls-property.html [ Timeout ]
 
-webkit.org/b/163781 media/muted-video-is-playing-audio.html [ Timeout ]
-
 webkit.org/b/168373 http/tests/media/track-in-band-hls-metadata-crash.html [ Timeout ]
 webkit.org/b/168373 media/media-fullscreen-loop-inline.html [ Timeout ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-11  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] media/muted-video-is-playing-audio.html is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=163781
+
+        Reviewed by Carlos Garcia Campos.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo): Sprinkle some debugging.
+        (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio): Ditto.
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::setMuted): Ditto.
+
 2018-01-10  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -614 +614 @@
     g_object_get(element, "n-video", &numTracks, nullptr);
 
+    GST_INFO("Media has %d video tracks", numTracks);
+
     bool oldHasVideo = m_hasVideo;
     m_hasVideo = numTracks > 0;
@@ -683 +685 @@
     g_object_get(element, "n-audio", &numTracks, nullptr);
 
+    GST_INFO("Media has %d audio tracks", numTracks);
     bool oldHasAudio = m_hasAudio;
     m_hasAudio = numTracks > 0;

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

@@ -615 +615 @@
         return;
 
+    GST_INFO("Set muted to %d", muted);
     g_object_set(m_volumeElement.get(), "mute", muted, nullptr);
 }