Changeset 231891 in webkit

Timestamp:

May 17, 2018 1:16:40 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[GStreamer]: Consider GstStream(Collection) as if if was not a GInitiallyUnowned
​https://bugs.webkit.org/show_bug.cgi?id=185657

Patch by Thibault Saunier <​tsaunier@igalia.com> on 2018-05-17
Reviewed by Philippe Normand.

Starting with GStreamer 1.14[1] the reference is sunk at object creation time, making it a normal
GObject in practice, in our GRefPtr template implementation we should just consider GstStream
as if it was a normal GObject and not care about its floating reference state as
the ref is never sunk by anyone before 1.14 though that floating ref is considered
as a hard reference by the GstStreamCollection (leading to assertions/)

The exact same issue happens with GstStreamCollection, so fix it at the same time.

Also do not adoptRef() on the result of gst_stream_collection_get_stream() as this function
is transfer-none.

[1] commit f119e93b47efb06ffc68c01d3e094d5346c30041 gst: Clear floating flag in constructor of all GstObject subclasses that are not owned by any parent

• platform/graphics/gstreamer/GRefPtrGStreamer.cpp:

(WTF::adoptGRef):
(WTF::refGPtr<GstStream>):
(WTF::refGPtr<GstStreamCollection>):

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::handleMessage):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/GRefPtrGStreamer.cpp (modified) (4 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-17  Thibault Saunier  <tsaunier@igalia.com>
+
+        [GStreamer]: Consider GstStream(Collection) as if if was not a GInitiallyUnowned
+        https://bugs.webkit.org/show_bug.cgi?id=185657
+
+        Reviewed by Philippe Normand.
+
+        Starting with GStreamer 1.14[1] the reference is sunk at object creation time, making it a normal
+        GObject in practice, in our GRefPtr template implementation we should just consider GstStream
+        as if it was a normal GObject and not care about its floating reference state as
+        the ref is never sunk by anyone before 1.14 though that floating ref is considered
+        as a hard reference by the GstStreamCollection (leading to assertions/)
+
+        The exact same issue happens with GstStreamCollection, so fix it at the same time.
+
+        Also do not adoptRef() on the result of gst_stream_collection_get_stream() as this function
+        is transfer-none.
+
+        [1] commit f119e93b47efb06ffc68c01d3e094d5346c30041 `gst: Clear floating flag in constructor of all GstObject subclasses that are not owned by any parent`
+
+        * platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
+        (WTF::adoptGRef):
+        (WTF::refGPtr<GstStream>):
+        (WTF::refGPtr<GstStreamCollection>):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::handleMessage):
+
 2018-05-16  Devin Rousso  <webkit@devinrousso.com>
 

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

@@ -357 +357 @@
 template <> GRefPtr<GstStream> adoptGRef(GstStream* ptr)
 {
-    ASSERT(!ptr || !g_object_is_floating(ptr));
     return GRefPtr<GstStream>(ptr, GRefPtrAdopt);
 }
@@ -364 +363 @@
 {
     if (ptr)
-        gst_object_ref_sink(GST_OBJECT_CAST(ptr));
+        gst_object_ref(GST_OBJECT_CAST(ptr));
 
     return ptr;
@@ -377 +376 @@
 template <> GRefPtr<GstStreamCollection> adoptGRef(GstStreamCollection* ptr)
 {
-    ASSERT(!ptr || !g_object_is_floating(ptr));
     return GRefPtr<GstStreamCollection>(ptr, GRefPtrAdopt);
 }
@@ -384 +382 @@
 {
     if (ptr)
-        gst_object_ref_sink(GST_OBJECT_CAST(ptr));
+        gst_object_ref(GST_OBJECT_CAST(ptr));
 
     return ptr;

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

@@ -1324 +1324 @@
         unsigned length = gst_message_streams_selected_get_size(message);
         for (unsigned i = 0; i < length; i++) {
-            GRefPtr<GstStream> stream = adoptGRef(gst_message_streams_selected_get_stream(message, i));
+            GRefPtr<GstStream> stream = gst_message_streams_selected_get_stream(message, i);
             if (!stream)
                 continue;
+
             GstStreamType type = gst_stream_get_stream_type(stream.get());
             String streamId(gst_stream_get_stream_id(stream.get()));