Changeset 101082 in webkit

Timestamp:

Nov 23, 2011 7:33:19 AM (12 years ago)

Author:

Philippe Normand

Message:

[GStreamer] improper usage of gst_object_ref_sink
​https://bugs.webkit.org/show_bug.cgi?id=73014

Reviewed by Martin Robinson.

No new tests. Existing tests cover this already.

• platform/graphics/gstreamer/GRefPtrGStreamer.cpp:

(WTF::adoptGRef): Ensure this is called with non-floating GstObjects.
(WTF::GstElement): Replace gst_object_ref_sink with
gst_object_ref+gst_object_sink like advised in the GstObject documentation.
(WTF::GstPad): Ditto.

• platform/graphics/gstreamer/GRefPtrGStreamer.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/GRefPtrGStreamer.cpp (modified) (2 diffs)
• platform/graphics/gstreamer/GRefPtrGStreamer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-23  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] improper usage of gst_object_ref_sink
+        https://bugs.webkit.org/show_bug.cgi?id=73014
+
+        Reviewed by Martin Robinson.
+
+        No new tests. Existing tests cover this already.
+
+        * platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
+        (WTF::adoptGRef): Ensure this is called with non-floating GstObjects.
+        (WTF::GstElement): Replace gst_object_ref_sink with
+        gst_object_ref+gst_object_sink like advised in the GstObject documentation.
+        (WTF::GstPad): Ditto.
+        * platform/graphics/gstreamer/GRefPtrGStreamer.h:
+
 2011-11-23  Yury Semikhatsky  <yurys@chromium.org>
 

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

@@ -26 +26 @@
 namespace WTF {
 
+template <> GRefPtr<GstElement> adoptGRef(GstElement* ptr)
+{
+    ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
+    return GRefPtr<GstElement>(ptr, GRefPtrAdopt);
+}
+
 template <> GstElement* refGPtr<GstElement>(GstElement* ptr)
 {
-    if (ptr)
-        gst_object_ref_sink(ptr);
+    if (ptr) {
+        gst_object_ref(GST_OBJECT(ptr));
+        gst_object_sink(GST_OBJECT(ptr));
+    }
+
     return ptr;
 }
@@ -39 +48 @@
 }
 
+template <> GRefPtr<GstPad> adoptGRef(GstPad* ptr)
+{
+    ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
+    return GRefPtr<GstPad>(ptr, GRefPtrAdopt);
+}
+
 template <> GstPad* refGPtr<GstPad>(GstPad* ptr)
 {
-    if (ptr)
-        gst_object_ref_sink(GST_OBJECT(ptr));
+    if (ptr) {
+        gst_object_ref(GST_OBJECT(ptr));
+        gst_object_sink(GST_OBJECT(ptr));
+    }
     return ptr;
 }

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

@@ -30 +30 @@
 namespace WTF {
 
+template<> GRefPtr<GstElement> adoptGRef(GstElement* ptr);
 template<> GstElement* refGPtr<GstElement>(GstElement* ptr);
 template<> void derefGPtr<GstElement>(GstElement* ptr);
 
+template<> GRefPtr<GstPad> adoptGRef(GstPad* ptr);
 template<> GstPad* refGPtr<GstPad>(GstPad* ptr);
 template<> void derefGPtr<GstPad>(GstPad* ptr);