Title: [223353] releases/WebKitGTK/webkit-2.18/Source/WebCore
- Revision
- 223353
- Author
- [email protected]
- Date
- 2017-10-16 02:32:11 -0700 (Mon, 16 Oct 2017)
Log Message
Merge r221815 - [GStreamer] Missing GRefPtr adoptions in MediaPlayerPrivateGStreamerBase, PlaybackPipeline
https://bugs.webkit.org/show_bug.cgi?id=176646
Reviewed by Carlos Garcia Campos.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::registerWebKitGStreamerElements): Adopt the return value
of gst_element_factory_find(), which is transferred in full.
* platform/graphics/gstreamer/mse/PlaybackPipeline.cpp:
(WebCore::PlaybackPipeline::flush): Adopt the return values
of gst_element_get_static_pad() and gst_pad_get_peer(), both being
transferred in full.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (223352 => 223353)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-10-16 09:31:04 UTC (rev 223352)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-10-16 09:32:11 UTC (rev 223353)
@@ -1,3 +1,18 @@
+2017-09-09 Zan Dobersek <[email protected]>
+
+ [GStreamer] Missing GRefPtr adoptions in MediaPlayerPrivateGStreamerBase, PlaybackPipeline
+ https://bugs.webkit.org/show_bug.cgi?id=176646
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::registerWebKitGStreamerElements): Adopt the return value
+ of gst_element_factory_find(), which is transferred in full.
+ * platform/graphics/gstreamer/mse/PlaybackPipeline.cpp:
+ (WebCore::PlaybackPipeline::flush): Adopt the return values
+ of gst_element_get_static_pad() and gst_pad_get_peer(), both being
+ transferred in full.
+
2017-09-08 Zan Dobersek <[email protected]>
[GStreamer] Add GRefPtr specializations for GstGLDisplay, GstGLContext
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (223352 => 223353)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2017-10-16 09:31:04 UTC (rev 223352)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2017-10-16 09:32:11 UTC (rev 223353)
@@ -128,7 +128,7 @@
if (!webkitGstCheckVersion(1, 6, 1))
return;
- GRefPtr<GstElementFactory> clearKeyDecryptorFactory = gst_element_factory_find("webkitclearkey");
+ GRefPtr<GstElementFactory> clearKeyDecryptorFactory = adoptGRef(gst_element_factory_find("webkitclearkey"));
if (!clearKeyDecryptorFactory)
gst_element_register(nullptr, "webkitclearkey", GST_RANK_PRIMARY + 100, WEBKIT_TYPE_MEDIA_CK_DECRYPT);
#endif
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.cpp (223352 => 223353)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.cpp 2017-10-16 09:31:04 UTC (rev 223352)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.cpp 2017-10-16 09:32:11 UTC (rev 223353)
@@ -460,8 +460,8 @@
gst_segment_do_seek(segment.get(), rate, GST_FORMAT_TIME, GST_SEEK_FLAG_NONE,
GST_SEEK_TYPE_SET, position, GST_SEEK_TYPE_SET, stop, nullptr);
- GRefPtr<GstPad> sinkPad = gst_element_get_static_pad(appsrc, "src");
- GRefPtr<GstPad> srcPad = sinkPad ? gst_pad_get_peer(sinkPad.get()) : nullptr;
+ GRefPtr<GstPad> sinkPad = adoptGRef(gst_element_get_static_pad(appsrc, "src"));
+ GRefPtr<GstPad> srcPad = sinkPad ? adoptGRef(gst_pad_get_peer(sinkPad.get())) : nullptr;
if (srcPad)
gst_pad_add_probe(srcPad.get(), GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, segmentFixerProbe, nullptr, nullptr);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
