mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-18 05:50:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

dwrite: Fix crash on device update

Browse source 
Selected blend mode should not be cleared on device update

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6508>
This commit is contained in:
Seungha Yang 2024-04-02 18:20:43 +09:00 committed by GStreamer Marge Bot
parent 6ce27e328d
commit 4ede9fef07
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
subprojects/gst-plugins-bad/sys/dwrite/gstdwriteoverlayobject.cpp
View file

@ -46,14 +46,15 @@ struct GstDWriteOverlayObjectPrivate
~GstDWriteOverlayObjectPrivate () ~GstDWriteOverlayObjectPrivate ()
{ {
ClearResource (); ClearResource (true);
gst_clear_caps (&outcaps); gst_clear_caps (&outcaps);
gst_clear_object (&device); gst_clear_object (&device);
} }
void ClearResource (void) void ClearResource (bool hard)
{ {
blend_mode = GstDWriteBlendMode::NOT_SUPPORTED; if (hard)
blend_mode = GstDWriteBlendMode::NOT_SUPPORTED;
g_clear_pointer (&overlay_rect, gst_video_overlay_rectangle_unref); g_clear_pointer (&overlay_rect, gst_video_overlay_rectangle_unref);
gst_clear_buffer (&layout_buf); gst_clear_buffer (&layout_buf);
@ -509,7 +510,7 @@ gst_dwrite_overlay_object_stop (GstDWriteOverlayObject * object)
{ {
GstDWriteOverlayObjectPrivate *priv = object->priv; GstDWriteOverlayObjectPrivate *priv = object->priv;
priv->ClearResource (); priv->ClearResource (true);
priv->dwrite_factory = nullptr; priv->dwrite_factory = nullptr;
priv->d2d_factory = nullptr; priv->d2d_factory = nullptr;
priv->renderer = nullptr; priv->renderer = nullptr;
@ -752,7 +753,7 @@ gst_dwrite_overlay_object_set_caps (GstDWriteOverlayObject * object,
*selected_mode = GstDWriteBlendMode::NOT_SUPPORTED; *selected_mode = GstDWriteBlendMode::NOT_SUPPORTED;
priv->ClearResource (); priv->ClearResource (true);
gst_caps_replace (&priv->outcaps, out_caps); gst_caps_replace (&priv->outcaps, out_caps);
if (!gst_video_info_from_caps (info, in_caps)) { if (!gst_video_info_from_caps (info, in_caps)) {
@ -803,7 +804,7 @@ gst_dwrite_overlay_object_set_caps (GstDWriteOverlayObject * object,
if (!gst_dwrite_overlay_object_prepare_resource (object)) { if (!gst_dwrite_overlay_object_prepare_resource (object)) {
GST_ERROR_OBJECT (elem, "Couldn't prepare resource"); GST_ERROR_OBJECT (elem, "Couldn't prepare resource");
priv->ClearResource (); priv->ClearResource (true);
return FALSE; return FALSE;
} }
@ -834,7 +835,7 @@ gst_dwrite_overlay_object_update_device (GstDWriteOverlayObject * object,
GST_DEBUG_OBJECT (object, "Updating device"); GST_DEBUG_OBJECT (object, "Updating device");
gst_clear_object (&priv->device); gst_clear_object (&priv->device);
priv->device = (GstD3D11Device *) gst_object_ref (dmem->device); priv->device = (GstD3D11Device *) gst_object_ref (dmem->device);
priv->ClearResource (); priv->ClearResource (false);
gst_dwrite_overlay_object_prepare_resource (object); gst_dwrite_overlay_object_prepare_resource (object);
return TRUE; return TRUE;