Title: [226769] trunk
Revision
226769
Author
ph...@webkit.org
Date
2018-01-11 01:24:50 -0800 (Thu, 11 Jan 2018)

Log 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.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (226768 => 226769)


--- trunk/LayoutTests/ChangeLog	2018-01-11 08:19:08 UTC (rev 226768)
+++ trunk/LayoutTests/ChangeLog	2018-01-11 09:24:50 UTC (rev 226769)
@@ -1,3 +1,15 @@
+2018-01-11  Philippe Normand  <pnorm...@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  <aes...@apple.com>
 
         [Payment Request] Rename ApplePayMerchantValidationEvent to MerchantValidationEvent

Modified: trunk/LayoutTests/media/muted-video-is-playing-audio.html (226768 => 226769)


--- trunk/LayoutTests/media/muted-video-is-playing-audio.html	2018-01-11 08:19:08 UTC (rev 226768)
+++ trunk/LayoutTests/media/muted-video-is-playing-audio.html	2018-01-11 09:24:50 UTC (rev 226769)
@@ -12,6 +12,10 @@
 
             jsTestIsAsync = true;
 
+            // Un-mute audio on the page before starting the test.
+            if (window.internals)
+                internals.setPageMuted("");
+
             function testUnmutingVideo()
             {
                 run("video.muted = false");

Modified: trunk/LayoutTests/platform/gtk/TestExpectations (226768 => 226769)


--- trunk/LayoutTests/platform/gtk/TestExpectations	2018-01-11 08:19:08 UTC (rev 226768)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2018-01-11 09:24:50 UTC (rev 226769)
@@ -2182,8 +2182,6 @@
 
 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 ]
 webkit.org/b/168373 media/media-source/media-source-error-crash.html [ Timeout ]

Modified: trunk/Source/WebCore/ChangeLog (226768 => 226769)


--- trunk/Source/WebCore/ChangeLog	2018-01-11 08:19:08 UTC (rev 226768)
+++ trunk/Source/WebCore/ChangeLog	2018-01-11 09:24:50 UTC (rev 226769)
@@ -1,3 +1,16 @@
+2018-01-11  Philippe Normand  <pnorm...@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  <aes...@apple.com>
 
         [Payment Request] Rename ApplePayMerchantValidationEvent to MerchantValidationEvent

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (226768 => 226769)


--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2018-01-11 08:19:08 UTC (rev 226768)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2018-01-11 09:24:50 UTC (rev 226769)
@@ -613,6 +613,8 @@
     GstElement* element = useMediaSource ? m_source.get() : m_pipeline.get();
     g_object_get(element, "n-video", &numTracks, nullptr);
 
+    GST_INFO("Media has %d video tracks", numTracks);
+
     bool oldHasVideo = m_hasVideo;
     m_hasVideo = numTracks > 0;
     if (oldHasVideo != m_hasVideo)
@@ -682,6 +684,7 @@
     GstElement* element = useMediaSource ? m_source.get() : m_pipeline.get();
     g_object_get(element, "n-audio", &numTracks, nullptr);
 
+    GST_INFO("Media has %d audio tracks", numTracks);
     bool oldHasAudio = m_hasAudio;
     m_hasAudio = numTracks > 0;
     if (oldHasAudio != m_hasAudio)

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (226768 => 226769)


--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2018-01-11 08:19:08 UTC (rev 226768)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2018-01-11 09:24:50 UTC (rev 226769)
@@ -614,6 +614,7 @@
     if (!m_volumeElement)
         return;
 
+    GST_INFO("Set muted to %d", muted);
     g_object_set(m_volumeElement.get(), "mute", muted, nullptr);
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to