Changeset 293319 in webkit

Timestamp:

Apr 25, 2022, 2:20:22 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[GStreamer] Disable new demuxers based on adaptivedemux2
​https://bugs.webkit.org/show_bug.cgi?id=239701

Patch by Philippe Normand <​pnormand@igalia.com> on 2022-04-25
Reviewed by Xabier Rodriguez-Calvar.

The new demuxers based on adaptivedemux2 cannot be used in WebKit yet because this new base
class does not abstract away network access. They can't work in a sandboxed media process,
so demote their rank in order to prevent decodebin3 from auto-plugging them.

• platform/graphics/gstreamer/GStreamerCommon.cpp:

(WebCore::registerWebKitGStreamerElements):

Canonical link: ​https://commits.webkit.org/249942@main

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-24  Philippe Normand  <philn@igalia.com>
+
+        [GStreamer] Disable new demuxers based on adaptivedemux2
+        https://bugs.webkit.org/show_bug.cgi?id=239701
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        The new demuxers based on adaptivedemux2 cannot be used in WebKit yet because this new base
+        class does not abstract away network access. They can't work in a sandboxed media process,
+        so demote their rank in order to prevent decodebin3 from auto-plugging them.
+
+        * platform/graphics/gstreamer/GStreamerCommon.cpp:
+        (WebCore::registerWebKitGStreamerElements):
+
 2022-04-24  Youenn Fablet  <youenn@apple.com>
 

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

@@ -373 +373 @@
             }
         }
+
+        // The new demuxers based on adaptivedemux2 cannot be used in WebKit yet because this new
+        // base class does not abstract away network access. They can't work in a sandboxed
+        // media process, so demote their rank in order to prevent decodebin3 from auto-plugging them.
+        if (webkitGstCheckVersion(1, 21, 0)) {
+            const char* const elementNames[] = { "dashdemux2", "hlsdemux2", "mssdemux2" };
+            for (unsigned i = 0; i < G_N_ELEMENTS(elementNames); i++) {
+                if (auto factory = adoptGRef(gst_element_factory_find(elementNames[i])))
+                    gst_plugin_feature_set_rank(GST_PLUGIN_FEATURE_CAST(factory.get()), GST_RANK_NONE);
+            }
+        }
     });
 }