Changeset 135705 in webkit

Timestamp:

Nov 26, 2012 4:10:28 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GStreamer] Floating reference handling fix
​https://bugs.webkit.org/show_bug.cgi?id=101349

Patch by Thiago Santos <​thiago.sousa.santos@collabora.com> on 2012-11-26
Reviewed by Philippe Normand.

GStreamer 0.10 and 1.0 differ when creating GstGhostPad from pad
templates, the 1.0 doesn't take ownership on the passed
GstPadTemplate, while 0.10 does. So this patch adds a
GStreamerVersioning function to handle this different approach
transparently in Webkit gstreamer elements.

Existing media tests cover this change.

• platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:

(webkit_web_audio_src_init):

• platform/graphics/gstreamer/GStreamerVersioning.cpp:

(webkitGstGhostPadFromStaticTemplate):

• platform/graphics/gstreamer/GStreamerVersioning.h:
• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:

(webkit_web_src_init):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp (modified) (2 diffs)
• platform/graphics/gstreamer/GStreamerVersioning.cpp (modified) (1 diff)
• platform/graphics/gstreamer/GStreamerVersioning.h (modified) (1 diff)
• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-26  Thiago Santos  <thiago.sousa.santos@collabora.com>
+
+        [GStreamer] Floating reference handling fix
+        https://bugs.webkit.org/show_bug.cgi?id=101349
+
+        Reviewed by Philippe Normand.
+
+        GStreamer 0.10 and 1.0 differ when creating GstGhostPad from pad
+        templates, the 1.0 doesn't take ownership on the passed
+        GstPadTemplate, while 0.10 does. So this patch adds a
+        GStreamerVersioning function to handle this different approach
+        transparently in Webkit gstreamer elements.
+
+        Existing media tests cover this change.
+
+        * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
+        (webkit_web_audio_src_init):
+        * platform/graphics/gstreamer/GStreamerVersioning.cpp:
+        (webkitGstGhostPadFromStaticTemplate):
+        * platform/graphics/gstreamer/GStreamerVersioning.h:
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webkit_web_src_init):
+
 2012-11-26  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp

@@ -27 +27 @@
 #include <wtf/gobject/GOwnPtr.h>
 #include "GRefPtrGStreamer.h"
+#include "GStreamerVersioning.h"
 #include <gst/audio/multichannel.h>
 #include <gst/pbutils/pbutils.h>
@@ -179 +180 @@
     new (priv) WebKitWebAudioSourcePrivate();
 
-    GRefPtr<GstPadTemplate> padTemplate = adoptGRef(gst_static_pad_template_get(&srcTemplate));
-    priv->sourcePad = gst_ghost_pad_new_no_target_from_template("src", padTemplate.get());
+    priv->sourcePad = webkitGstGhostPadFromStaticTemplate(&srcTemplate, "src", 0);
     gst_element_add_pad(GST_ELEMENT(src), priv->sourcePad);
 

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

@@ -33 +33 @@
     gst_object_sink(gstObject);
 #endif
+}
+
+GstPad* webkitGstGhostPadFromStaticTemplate(GstStaticPadTemplate* staticPadTemplate, const gchar* name, GstPad* target)
+{
+    GstPad* pad;
+    GstPadTemplate* padTemplate = gst_static_pad_template_get(staticPadTemplate);
+
+    if (target)
+        pad = gst_ghost_pad_new_from_template(name, target, padTemplate);
+    else
+        pad = gst_ghost_pad_new_no_target_from_template(name, padTemplate);
+
+#ifdef GST_API_VERSION_1
+    gst_object_unref(padTemplate);
+#endif
+
+    return pad;
 }
 

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

@@ -30 +30 @@
 
 void webkitGstObjectRefSink(GstObject*);
+GstPad* webkitGstGhostPadFromStaticTemplate(GstStaticPadTemplate*, const gchar* name, GstPad* target);
 GRefPtr<GstCaps> webkitGstGetPadCaps(GstPad*);
 bool getVideoSizeAndFormatFromCaps(GstCaps*, WebCore::IntSize&, GstVideoFormat&, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride);

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

@@ -218 +218 @@
 static void webkit_web_src_init(WebKitWebSrc* src)
 {
-    GRefPtr<GstPadTemplate> padTemplate = adoptGRef(gst_static_pad_template_get(&srcTemplate));
     WebKitWebSrcPrivate* priv = WEBKIT_WEB_SRC_GET_PRIVATE(src);
 
@@ -238 +237 @@
 
     GRefPtr<GstPad> targetPad = adoptGRef(gst_element_get_static_pad(GST_ELEMENT(priv->appsrc), "src"));
-    priv->srcpad = gst_ghost_pad_new_from_template("src", targetPad.get(), padTemplate.get());
+    priv->srcpad = webkitGstGhostPadFromStaticTemplate(&srcTemplate, "src", targetPad.get());
 
     gst_element_add_pad(GST_ELEMENT(src), priv->srcpad);