mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/base/gstbasesink.c: Release the object lock before calling the query convert pad functions to avoid deadlocks.

Browse source 
Original commit message from CVS:
* libs/gst/base/gstbasesink.c: (gst_base_sink_get_position_last),
(gst_base_sink_get_position_paused), (gst_base_sink_get_position):
Release the object lock before calling the query convert pad functions
to avoid deadlocks.
This commit is contained in:
Wim Taymans 2009-01-05 15:42:53 +00:00
parent 6766b6a4a2
commit b2052bb385
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2009-01-05 Wim Taymans <wim.taymans@collabora.co.uk>
* libs/gst/base/gstbasesink.c: (gst_base_sink_get_position_last),
(gst_base_sink_get_position_paused), (gst_base_sink_get_position):
Release the object lock before calling the query convert pad functions
to avoid deadlocks.
2009-01-05 Wim Taymans <wim.taymans@collabora.co.uk> 2009-01-05 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/gstbus.c: (gst_bus_wakeup_main_context): * gst/gstbus.c: (gst_bus_wakeup_main_context):

20
libs/gst/base/gstbasesink.c
View file

@ -3629,7 +3629,7 @@ gst_base_sink_peer_query (GstBaseSink * sink, GstQuery * query)
/* get the end position of the last seen object, this is used /* get the end position of the last seen object, this is used
* for EOS and for making sure that we don't report a position we * for EOS and for making sure that we don't report a position we
* have not reached yet. */ * have not reached yet. With LOCK. */
static gboolean static gboolean
gst_base_sink_get_position_last (GstBaseSink * basesink, GstFormat format, gst_base_sink_get_position_last (GstBaseSink * basesink, GstFormat format,
gint64 * cur) gint64 * cur)
@ -3651,9 +3651,13 @@ gst_base_sink_get_position_last (GstBaseSink * basesink, GstFormat format,
} }
if (*cur != -1 && oformat != format) { if (*cur != -1 && oformat != format) {
/* convert to the target format if we need to */ GST_OBJECT_UNLOCK (basesink);
/* convert to the target format if we need to, release lock first */
ret = ret =
gst_pad_query_convert (basesink->sinkpad, oformat, *cur, &format, cur); gst_pad_query_convert (basesink->sinkpad, oformat, *cur, &format, cur);
if (!ret)
*cur = -1;
GST_OBJECT_LOCK (basesink);
} }
GST_DEBUG_OBJECT (basesink, "POSITION: %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (basesink, "POSITION: %" GST_TIME_FORMAT,
@ -3664,7 +3668,7 @@ gst_base_sink_get_position_last (GstBaseSink * basesink, GstFormat format,
/* get the position when we are PAUSED, this is the stream time of the buffer /* get the position when we are PAUSED, this is the stream time of the buffer
* that prerolled. If no buffer is prerolled (we are still flushing), this * that prerolled. If no buffer is prerolled (we are still flushing), this
* value will be -1. */ * value will be -1. With LOCK. */
static gboolean static gboolean
gst_base_sink_get_position_paused (GstBaseSink * basesink, GstFormat format, gst_base_sink_get_position_paused (GstBaseSink * basesink, GstFormat format,
gint64 * cur) gint64 * cur)
@ -3710,10 +3714,15 @@ gst_base_sink_get_position_paused (GstBaseSink * basesink, GstFormat format,
GST_TIME_ARGS (*cur)); GST_TIME_ARGS (*cur));
} }
} }
res = (*cur != -1); res = (*cur != -1);
if (res && oformat != format) { if (res && oformat != format) {
GST_OBJECT_UNLOCK (basesink);
res = res =
gst_pad_query_convert (basesink->sinkpad, oformat, *cur, &format, cur); gst_pad_query_convert (basesink->sinkpad, oformat, *cur, &format, cur);
if (!res)
*cur = -1;
GST_OBJECT_LOCK (basesink);
} }
return res; return res;
@ -3774,10 +3783,13 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
base = GST_ELEMENT_CAST (basesink)->base_time; base = GST_ELEMENT_CAST (basesink)->base_time;
accum = basesink->segment.accum; accum = basesink->segment.accum;
rate = basesink->segment.rate * basesink->segment.applied_rate; rate = basesink->segment.rate * basesink->segment.applied_rate;
gst_base_sink_get_position_last (basesink, format, &last);
latency = basesink->priv->latency; latency = basesink->priv->latency;
gst_object_ref (clock); gst_object_ref (clock);
/* this function might release the LOCK */
gst_base_sink_get_position_last (basesink, format, &last);
/* need to release the object lock before we can get the time, /* need to release the object lock before we can get the time,
* a clock might take the LOCK of the provider, which could be * a clock might take the LOCK of the provider, which could be
* a basesink subclass. */ * a basesink subclass. */