Quirks: Address review feedback

Backport of https://commits.webkit.org/276450@main keeping old ifdefs
compatibility, so the GStreamerQuirksManager::getAdditionalPlaybinFlags()
implementation diverges from upstream version.

Author: philn

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

@@ -2894,19 +2894,11 @@ void MediaPlayerPrivateGStreamer::setPlaybackFlags(bool isMediaStream)
     if (isMediaStream)
         flags = flags & ~getGstPlayFlag("buffering");
 
-#if !USE(GSTREAMER_TEXT_SINK)
-    hasText = 0x0;
-#endif
-
-#if USE(GSTREAMER_NATIVE_VIDEO)
-    hasSoftwareColorBalance = 0x0;
-#else
-    hasNativeVideo = 0x0;
-#endif
-
-#if !USE(GSTREAMER_NATIVE_AUDIO)
-    hasNativeAudio = 0x0;
-#endif
+    unsigned additionalFlags = GStreamerQuirksManager::singleton().getAdditionalPlaybinFlags();
+    hasText &= additionalFlags;
+    hasSoftwareColorBalance &= additionalFlags;
+    hasNativeVideo &= additionalFlags;
+    hasNativeAudio &= additionalFlags;
 
     GST_INFO_OBJECT(pipeline(), "text %s, audio %s (native %s), video %s (native %s, software color balance %s)", boolForPrinting(hasText),
         boolForPrinting(hasAudio), boolForPrinting(hasNativeAudio), boolForPrinting(hasVideo), boolForPrinting(hasNativeVideo),
@@ -4145,10 +4137,9 @@ GstElement* MediaPlayerPrivateGStreamer::createVideoSink()
 
     if (isHolePunchRenderingEnabled()) {
         m_videoSink = createHolePunchVideoSink();
-        if (m_videoSink) {
-            pushNextHolePunchBuffer();
-            return m_videoSink.get();
-        }
+        // Do not check the m_videoSink value. The nullptr case will trigger auto-plugging in playbin.
+        pushNextHolePunchBuffer();
+        return m_videoSink.get();
     }
 
 #if USE(TEXTURE_MAPPER_DMABUF)

Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h

@@ -197,6 +197,8 @@ class MediaPlayerPrivateGStreamer : public MediaPlayerPrivateInterface
     void acceleratedRenderingStateChanged() final;
     bool performTaskAtMediaTime(Function<void()>&&, const MediaTime&) override;
 
+    GstElement* pipeline() const { return m_pipeline.get(); }
+
 #if USE(TEXTURE_MAPPER_GL)
     PlatformLayer* platformLayer() const override;
 #if PLATFORM(WIN_CAIRO)
@@ -342,8 +344,6 @@ class MediaPlayerPrivateGStreamer : public MediaPlayerPrivateInterface
 
     void setStreamVolumeElement(GstStreamVolume*);
 
-    GstElement* pipeline() const { return m_pipeline.get(); }
-
     void repaint();
     void cancelRepaint(bool destroying = false);
 

Source/WebCore/platform/gstreamer/GStreamerHolePunchQuirkWesteros.cpp

@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "GStreamerHolePunchQuirkWesteros.h"
+#include "MediaPlayerPrivateGStreamer.h"
 
 #if USE(GSTREAMER)
 
@@ -37,8 +38,15 @@ GstElement* GStreamerHolePunchQuirkWesteros::createHolePunchVideoSink(bool isLeg
     // Westeros using holepunch.
     GstElement* videoSink = makeGStreamerElement("westerossink", "WesterosVideoSink");
     g_object_set(videoSink, "zorder", 0.0f, nullptr);
-    if (isPIPRequested)
+    if (isPIPRequested) {
         g_object_set(videoSink, "res-usage", 0u, nullptr);
+        // Set context for pipelines that use ERM in decoder elements.
+        auto context = adoptGRef(gst_context_new("erm", FALSE));
+        auto contextStructure = gst_context_writable_structure(context.get());
+        gst_structure_set(contextStructure, "res-usage", G_TYPE_UINT, 0x0u, nullptr);
+        auto playerPrivate = reinterpret_cast<const MediaPlayerPrivateGStreamer*>(player->playerPrivate());
+        gst_element_set_context(playerPrivate->pipeline(), context.get());
+    }
     return videoSink;
 }
 

Source/WebCore/platform/gstreamer/GStreamerQuirkAmLogic.cpp

@@ -50,10 +50,17 @@ GstElement* GStreamerQuirkAmLogic::createWebAudioSink()
 
 bool GStreamerQuirkAmLogic::configureElement(GstElement* element, const OptionSet<ElementRuntimeCharacteristics>& characteristics)
 {
-    GST_INFO("Set property disable-xrun to TRUE");
-    g_object_set(element, "disable-xrun", TRUE, nullptr);
-    if (characteristics.contains(ElementRuntimeCharacteristics::HasVideo))
+    if (gstObjectHasProperty(element, "disable-xrun")) {
+        GST_INFO("Set property disable-xrun to TRUE");
+        g_object_set(element, "disable-xrun", TRUE, nullptr);
+    } else
+        return false;
+
+    if (characteristics.contains(ElementRuntimeCharacteristics::HasVideo) && gstObjectHasProperty(element, "wait-video")) {
+        GST_INFO("Set property wait-video to TRUE");
         g_object_set(element, "wait-video", TRUE, nullptr);
+    } else
+        return false;
 
     return true;
 }

Source/WebCore/platform/gstreamer/GStreamerQuirkBroadcom.h

@@ -22,6 +22,7 @@
 
 #if USE(GSTREAMER)
 
+#include "GStreamerCommon.h"
 #include "GStreamerQuirks.h"
 
 namespace WebCore {
@@ -35,6 +36,7 @@ class GStreamerQuirkBroadcom final : public GStreamerQuirk {
     std::optional<bool> isHardwareAccelerated(GstElementFactory*) final;
     std::optional<GstElementFactoryListType> audioVideoDecoderFactoryListType() const final { return GST_ELEMENT_FACTORY_TYPE_PARSER; }
     Vector<String> disallowedWebAudioDecoders() const final { return m_disallowedWebAudioDecoders; }
+    unsigned getAdditionalPlaybinFlags() const final { return getGstPlayFlag("text") | getGstPlayFlag("native-audio"); }
 
 private:
     Vector<String> m_disallowedWebAudioDecoders;

Source/WebCore/platform/gstreamer/GStreamerQuirks.cpp

@@ -259,6 +259,30 @@ void GStreamerQuirksManager::setHolePunchEnabledForTesting(bool enabled)
         m_holePunchQuirk = nullptr;
 }
 
+unsigned GStreamerQuirksManager::getAdditionalPlaybinFlags() const
+{
+    unsigned flags = 0;
+#if USE(GSTREAMER_NATIVE_VIDEO)
+    flags |= getGstPlayFlag("native-video");
+#else
+    flags |= getGstPlayFlag("soft-colorbalance");
+#endif
+#if USE(GSTREAMER_NATIVE_AUDIO)
+    flags |= getGstPlayFlag("native-audio");
+#endif
+#if USE(GSTREAMER_TEXT_SINK)
+    flags |= getGstPlayFlag("text");
+#endif
+    for (const auto& quirk : m_quirks) {
+        if (auto additionalFlags = quirk->getAdditionalPlaybinFlags()) {
+            GST_DEBUG("Quirk %s requests these playbin flags: %u", quirk->identifier(), additionalFlags);
+            flags |= additionalFlags;
+        }
+    }
+
+    return flags;
+}
+
 #undef GST_CAT_DEFAULT
 
 } // namespace WebCore

Source/WebCore/platform/gstreamer/GStreamerQuirks.h

@@ -22,7 +22,7 @@
 
 #if USE(GSTREAMER)
 
-#include "GRefPtrGStreamer.h"
+#include "GStreamerCommon.h"
 #include "MediaPlayer.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
@@ -59,6 +59,7 @@ class GStreamerQuirk : public GStreamerQuirkBase {
     virtual std::optional<bool> isHardwareAccelerated(GstElementFactory*) { return std::nullopt; }
     virtual std::optional<GstElementFactoryListType> audioVideoDecoderFactoryListType() const { return std::nullopt; }
     virtual Vector<String> disallowedWebAudioDecoders() const { return { }; }
+    virtual unsigned getAdditionalPlaybinFlags() const { return 0; }
 };
 
 class GStreamerHolePunchQuirk : public GStreamerQuirkBase {
@@ -99,6 +100,8 @@ class GStreamerQuirksManager : public RefCounted<GStreamerQuirksManager> {
 
     void setHolePunchEnabledForTesting(bool);
 
+    unsigned getAdditionalPlaybinFlags() const;
+
 private:
     GStreamerQuirksManager(bool, bool);