Title: [263031] trunk/Source/WebCore
- Revision
- 263031
- Author
- [email protected]
- Date
- 2020-06-15 03:33:58 -0700 (Mon, 15 Jun 2020)
Log Message
[GStreamer] ImageDecoder hits Debug ASSERTs
https://bugs.webkit.org/show_bug.cgi?id=213178
Patch by Philippe Normand <[email protected]> on 2020-06-15
Reviewed by Xabier Rodriguez-Calvar.
Pass a reference of the decoder to its inner implementation instead of a WeakPtr, which
can't be used across multiple threads.
Covered by fast/images/animated-image-mp4{,-crash}.html tests.
* platform/graphics/gstreamer/ImageDecoderGStreamer.cpp:
(WebCore::ImageDecoderGStreamer::InnerDecoder::connectDecoderPad):
* platform/graphics/gstreamer/ImageDecoderGStreamer.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (263030 => 263031)
--- trunk/Source/WebCore/ChangeLog 2020-06-15 10:04:29 UTC (rev 263030)
+++ trunk/Source/WebCore/ChangeLog 2020-06-15 10:33:58 UTC (rev 263031)
@@ -1,3 +1,19 @@
+2020-06-15 Philippe Normand <[email protected]>
+
+ [GStreamer] ImageDecoder hits Debug ASSERTs
+ https://bugs.webkit.org/show_bug.cgi?id=213178
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Pass a reference of the decoder to its inner implementation instead of a WeakPtr, which
+ can't be used across multiple threads.
+
+ Covered by fast/images/animated-image-mp4{,-crash}.html tests.
+
+ * platform/graphics/gstreamer/ImageDecoderGStreamer.cpp:
+ (WebCore::ImageDecoderGStreamer::InnerDecoder::connectDecoderPad):
+ * platform/graphics/gstreamer/ImageDecoderGStreamer.h:
+
2020-06-15 Youenn Fablet <[email protected]>
Simplify MediaRecorderPrivateWriterCocoa threading logic
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp (263030 => 263031)
--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp 2020-06-15 10:04:29 UTC (rev 263030)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp 2020-06-15 10:33:58 UTC (rev 263031)
@@ -238,7 +238,7 @@
},
{ nullptr }
};
- gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, m_decoder.get(), nullptr);
+ gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, &m_decoder, nullptr);
GRefPtr<GstCaps> caps = adoptGRef(gst_caps_from_string("video/x-raw, format=(string)RGBA"));
g_object_set(sink, "sync", false, "caps", caps.get(), nullptr);
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.h (263030 => 263031)
--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.h 2020-06-15 10:04:29 UTC (rev 263030)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.h 2020-06-15 10:33:58 UTC (rev 263031)
@@ -35,7 +35,7 @@
class ContentType;
class ImageDecoderGStreamerSample;
-class ImageDecoderGStreamer final : public ImageDecoder, public CanMakeWeakPtr<ImageDecoderGStreamer> {
+class ImageDecoderGStreamer final : public ImageDecoder {
WTF_MAKE_FAST_ALLOCATED;
WTF_MAKE_NONCOPYABLE(ImageDecoderGStreamer);
public:
@@ -85,7 +85,7 @@
}
InnerDecoder(ImageDecoderGStreamer& decoder, const char* data, gssize size)
- : m_decoder(makeWeakPtr(decoder))
+ : m_decoder(decoder)
, m_runLoop(RunLoop::current())
{
m_memoryStream = adoptGRef(g_memory_input_stream_new_from_data(data, size, nullptr));
@@ -100,7 +100,7 @@
void preparePipeline();
void connectDecoderPad(GstPad*);
- WeakPtr<ImageDecoderGStreamer> m_decoder;
+ ImageDecoderGStreamer& m_decoder;
GRefPtr<GstElement> m_pipeline;
GRefPtr<GInputStream> m_memoryStream;
RunLoop& m_runLoop;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes