mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11converter: Fix deadlock on taking property mutex

Browse source 
SRWLOCK should be zero initialized, but since we changed the private
struct to C++, use C++ mutex instead.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5498>
This commit is contained in:
Seungha Yang 2023-10-17 21:07:39 +09:00 committed by GStreamer Marge Bot
parent 0b6268393c
commit 269ab85881
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
subprojects/gst-plugins-bad/gst-libs/gst/d3d11/gstd3d11converter.cpp
View file

@ -304,7 +304,7 @@ struct _GstD3D11ConverterPrivate
GstVideoOrientationMethod video_direction; GstVideoOrientationMethod video_direction;
SRWLOCK prop_lock; std::mutex prop_lock;
/* properties */ /* properties */
gint src_x = 0; gint src_x = 0;
@ -504,7 +504,7 @@ gst_d3d11_converter_set_property (GObject * object, guint prop_id,
GstD3D11Converter *self = GST_D3D11_CONVERTER (object); GstD3D11Converter *self = GST_D3D11_CONVERTER (object);
GstD3D11ConverterPrivate *priv = self->priv; GstD3D11ConverterPrivate *priv = self->priv;
GstD3D11SRWLockGuard (&priv->prop_lock); std::lock_guard < std::mutex > lk (priv->prop_lock);
switch (prop_id) { switch (prop_id) {
case PROP_SRC_X: case PROP_SRC_X:
update_src_rect (self, &priv->src_x, value); update_src_rect (self, &priv->src_x, value);
@ -618,7 +618,7 @@ gst_d3d11_converter_get_property (GObject * object, guint prop_id,
GstD3D11Converter *self = GST_D3D11_CONVERTER (object); GstD3D11Converter *self = GST_D3D11_CONVERTER (object);
GstD3D11ConverterPrivate *priv = self->priv; GstD3D11ConverterPrivate *priv = self->priv;
GstD3D11SRWLockGuard (&priv->prop_lock); std::lock_guard < std::mutex > lk (priv->prop_lock);
switch (prop_id) { switch (prop_id) {
case PROP_SRC_X: case PROP_SRC_X:
g_value_set_int (value, priv->src_x); g_value_set_int (value, priv->src_x);
@ -2912,7 +2912,7 @@ gst_d3d11_converter_convert_buffer_internal (GstD3D11Converter * self,
gboolean ret = FALSE; gboolean ret = FALSE;
gboolean in_d3d11; gboolean in_d3d11;
GstD3D11SRWLockGuard (&priv->prop_lock); std::lock_guard < std::mutex > lk (priv->prop_lock);
/* Output buffer must be valid D3D11 buffer */ /* Output buffer must be valid D3D11 buffer */
if (!gst_d3d11_converter_is_d3d11_buffer (self, out_buf)) { if (!gst_d3d11_converter_is_d3d11_buffer (self, out_buf)) {