Changeset 268790 in webkit

Timestamp:

Oct 21, 2020, 3:50:48 AM (6 years ago)

Author:

Philippe Normand

Message:

[GStreamer] Create video sink only for video player
​https://bugs.webkit.org/show_bug.cgi?id=217974

Reviewed by Xabier Rodriguez-Calvar.

There's no need for a video sink when the media player is created for an <audio> element.

• platform/graphics/gstreamer/GStreamerCommon.cpp:

(WebCore::initializeGStreamerAndRegisterWebKitElements): Downrank the GL video sink, as we
create it on-demand and not through autovideosink anyway.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): Avoid creating useless video sink.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/GStreamerCommon.cpp (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-21  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] Create video sink only for video player
+        https://bugs.webkit.org/show_bug.cgi?id=217974
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        There's no need for a video sink when the media player is created for an <audio> element.
+
+        * platform/graphics/gstreamer/GStreamerCommon.cpp:
+        (WebCore::initializeGStreamerAndRegisterWebKitElements): Downrank the GL video sink, as we
+        create it on-demand and not through autovideosink anyway.
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): Avoid creating useless video sink.
+
 2020-10-20  Julian Gonzalez  <julian_a_gonzalez@apple.com>
 

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

@@ -318 +318 @@
         gst_element_register(0, "webkitwebsrc", GST_RANK_PRIMARY + 100, WEBKIT_TYPE_WEB_SRC);
 #if USE(GSTREAMER_GL)
-        gst_element_register(0, "webkitglvideosink", GST_RANK_PRIMARY, WEBKIT_TYPE_GL_VIDEO_SINK);
+        gst_element_register(0, "webkitglvideosink", GST_RANK_NONE, WEBKIT_TYPE_GL_VIDEO_SINK);
 #endif
 #endif

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

@@ -2730 +2730 @@
 void MediaPlayerPrivateGStreamer::createGSTPlayBin(const URL& url, const String& pipelineName)
 {
+    GST_INFO("Creating pipeline for %s player", m_player->isVideoPlayer() ? "video" : "audio");
     const char* playbinName = "playbin";
 
@@ -2814 +2815 @@
     g_object_set(m_pipeline.get(), "text-sink", m_textAppSink.get(), nullptr);
 
-    g_object_set(m_pipeline.get(), "video-sink", createVideoSink(), "audio-sink", createAudioSink(), nullptr);
+    g_object_set(m_pipeline.get(), "audio-sink", createAudioSink(), nullptr);
+    if (m_player->isVideoPlayer())
+        g_object_set(m_pipeline.get(), "video-sink", createVideoSink(), nullptr);
 
     configurePlaySink();
@@ -2826 +2829 @@
             g_object_set(m_pipeline.get(), "audio-filter", scale, nullptr);
     }
+
+    if (!m_player->isVideoPlayer())
+        return;
 
     if (!m_canRenderingBeAccelerated) {