mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11compositor: Fix composition error on release_pad()

Browse source 
Composition might be still in progress while it's being released

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4169>
This commit is contained in:
Seungha Yang 2023-03-14 22:08:54 +09:00 committed by GStreamer Marge Bot
parent 0269c6cf79
commit a1bd4afb8a
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
subprojects/gst-plugins-bad/sys/d3d11/gstd3d11compositor.cpp
View file

@ -356,6 +356,7 @@ enum
#define DEFAULT_PAD_GAMMA_MODE GST_VIDEO_GAMMA_MODE_NONE #define DEFAULT_PAD_GAMMA_MODE GST_VIDEO_GAMMA_MODE_NONE
#define DEFAULT_PAD_PRIMARIES_MODE GST_VIDEO_PRIMARIES_MODE_NONE #define DEFAULT_PAD_PRIMARIES_MODE GST_VIDEO_PRIMARIES_MODE_NONE
static void gst_d3d11_compositor_pad_dispose (GObject * object);
static void gst_d3d11_compositor_pad_set_property (GObject * object, static void gst_d3d11_compositor_pad_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec); guint prop_id, const GValue * value, GParamSpec * pspec);
static void gst_d3d11_compositor_pad_get_property (GObject * object, static void gst_d3d11_compositor_pad_get_property (GObject * object,
@ -380,6 +381,7 @@ gst_d3d11_compositor_pad_class_init (GstD3D11CompositorPadClass * klass)
GParamFlags param_flags = (GParamFlags) GParamFlags param_flags = (GParamFlags)
(G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS); (G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS);
object_class->dispose = gst_d3d11_compositor_pad_dispose;
object_class->set_property = gst_d3d11_compositor_pad_set_property; object_class->set_property = gst_d3d11_compositor_pad_set_property;
object_class->get_property = gst_d3d11_compositor_pad_get_property; object_class->get_property = gst_d3d11_compositor_pad_get_property;
@ -467,6 +469,17 @@ gst_d3d11_compositor_pad_init (GstD3D11CompositorPad * pad)
pad->primaries_mode = DEFAULT_PAD_PRIMARIES_MODE; pad->primaries_mode = DEFAULT_PAD_PRIMARIES_MODE;
} }
static void
gst_d3d11_compositor_pad_dispose (GObject * object)
{
GstD3D11CompositorPad *self = GST_D3D11_COMPOSITOR_PAD (object);
gst_clear_object (&self->convert);
GST_D3D11_CLEAR_COM (self->blend);
G_OBJECT_CLASS (parent_pad_class)->dispose (object);
}
static void static void
gst_d3d11_compositor_pad_update_position (GstD3D11CompositorPad * self, gst_d3d11_compositor_pad_update_position (GstD3D11CompositorPad * self,
gint * old, const GValue * value) gint * old, const GValue * value)
@ -1208,15 +1221,12 @@ static void
gst_d3d11_compositor_release_pad (GstElement * element, GstPad * pad) gst_d3d11_compositor_release_pad (GstElement * element, GstPad * pad)
{ {
GstD3D11Compositor *self = GST_D3D11_COMPOSITOR (element); GstD3D11Compositor *self = GST_D3D11_COMPOSITOR (element);
GstD3D11CompositorPad *cpad = GST_D3D11_COMPOSITOR_PAD (pad);
GST_DEBUG_OBJECT (self, "Releasing pad %s:%s", GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_OBJECT (self, "Releasing pad %s:%s", GST_DEBUG_PAD_NAME (pad));
gst_child_proxy_child_removed (GST_CHILD_PROXY (self), G_OBJECT (pad), gst_child_proxy_child_removed (GST_CHILD_PROXY (self), G_OBJECT (pad),
GST_OBJECT_NAME (pad)); GST_OBJECT_NAME (pad));
gst_d3d11_compositor_pad_clear_resource (self, cpad, nullptr);
GST_ELEMENT_CLASS (parent_class)->release_pad (element, pad); GST_ELEMENT_CLASS (parent_class)->release_pad (element, pad);
} }