mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: move the comment for the locks to the lock macros

Browse source 
Looks like some code was inserted afterwards.
This commit is contained in:
Stefan Sauer 2017-10-15 12:14:28 +02:00
parent 6deaeec19f
commit 638a4582c2
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst-libs/gst/base/gstaggregator.c
View file

@ -106,6 +106,10 @@ static void gst_aggregator_set_latency_property (GstAggregator * agg,
gint64 latency); gint64 latency);
static gint64 gst_aggregator_get_latency_property (GstAggregator * agg); static gint64 gst_aggregator_get_latency_property (GstAggregator * agg);
static GstClockTime gst_aggregator_get_latency_unlocked (GstAggregator * self);
GST_DEBUG_CATEGORY_STATIC (aggregator_debug);
#define GST_CAT_DEFAULT aggregator_debug
/* Locking order, locks in this element must always be taken in this order /* Locking order, locks in this element must always be taken in this order
* *
@ -119,12 +123,6 @@ static gint64 gst_aggregator_get_latency_property (GstAggregator * agg);
* standard sink pad object lock -> GST_OBJECT_LOCK(aggpad) * standard sink pad object lock -> GST_OBJECT_LOCK(aggpad)
*/ */
static GstClockTime gst_aggregator_get_latency_unlocked (GstAggregator * self);
GST_DEBUG_CATEGORY_STATIC (aggregator_debug);
#define GST_CAT_DEFAULT aggregator_debug
/* GstAggregatorPad definitions */ /* GstAggregatorPad definitions */
#define PAD_LOCK(pad) G_STMT_START { \ #define PAD_LOCK(pad) G_STMT_START { \
GST_TRACE_OBJECT (pad, "Taking PAD lock from thread %p", \ GST_TRACE_OBJECT (pad, "Taking PAD lock from thread %p", \