Changeset 278935 in webkit

Timestamp:

Jun 16, 2021, 8:16:40 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[GStreamer] gst_element_get_request_pad deprecated in 1.20
​https://bugs.webkit.org/show_bug.cgi?id=226974

Patch by Philippe Normand <​pnormand@igalia.com> on 2021-06-16
Reviewed by Xabier Rodriguez-Calvar.

In GStreamer 1.20 gst_element_get_request_pad() was renamed to gst_element_request_pad_simple(),
so create an alias for older versions.

• platform/graphics/gstreamer/GStreamerAudioMixer.cpp:

(WebCore::GStreamerAudioMixer::registerProducer):

• platform/graphics/gstreamer/GStreamerCommon.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-16  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] gst_element_get_request_pad deprecated in 1.20
+        https://bugs.webkit.org/show_bug.cgi?id=226974
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        In GStreamer 1.20 gst_element_get_request_pad() was renamed to gst_element_request_pad_simple(),
+        so create an alias for older versions.
+
+        * platform/graphics/gstreamer/GStreamerAudioMixer.cpp:
+        (WebCore::GStreamerAudioMixer::registerProducer):
+        * platform/graphics/gstreamer/GStreamerCommon.h:
+
 2021-06-16  Tim Nguyen  <ntim@apple.com>
 

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

@@ -96 +96 @@
     bool shouldStart = !m_mixer->numsinkpads;
 
-    auto mixerPad = adoptGRef(gst_element_get_request_pad(m_mixer.get(), "sink_%u"));
+    auto mixerPad = adoptGRef(gst_element_request_pad_simple(m_mixer.get(), "sink_%u"));
     auto srcPad = adoptGRef(gst_element_get_static_pad(audioResample, "src"));
     gst_pad_link(srcPad.get(), mixerPad.get());

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

@@ -321 +321 @@
 #endif
 
+// In GStreamer 1.20 gst_element_get_request_pad() was renamed to gst_element_request_pad_simple(),
+// so create an alias for older versions.
+#if !GST_CHECK_VERSION(1, 19, 0)
+#define gst_element_request_pad_simple gst_element_get_request_pad
+#endif
+
 // We can't pass macros as template parameters, so we need to wrap them in inline functions.
 inline void gstObjectLock(void* object) { GST_OBJECT_LOCK(object); }