mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 21:55:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: move property member into private structure

Browse source 
Our locking (or lack thereof) while accessing this also
looks generally quite dodgy.
This commit is contained in:
Tim-Philipp Müller 2014-12-31 18:16:21 +00:00
parent b813456233
commit c5e3fe807a
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
libs/gst/base/gstaggregator.c
View file

@ -247,6 +247,9 @@ struct _GstAggregatorPrivate
GstClockID aggregate_id; GstClockID aggregate_id;
GMutex src_lock; GMutex src_lock;
GCond src_cond; GCond src_cond;
/* properties */
gint64 latency;
}; };
typedef struct typedef struct
@ -542,7 +545,7 @@ gst_aggregator_wait_and_check (GstAggregator * self, gboolean * timeout)
if (GST_CLOCK_TIME_IS_VALID (latency_min)) { if (GST_CLOCK_TIME_IS_VALID (latency_min)) {
time += latency_min; time += latency_min;
} else { } else {
time += self->latency; time += self->priv->latency;
} }
GST_DEBUG_OBJECT (self, "possibly waiting for clock to reach %" GST_DEBUG_OBJECT (self, "possibly waiting for clock to reach %"
@ -1075,6 +1078,7 @@ void
gst_aggregator_get_latency (GstAggregator * self, gboolean * live, gst_aggregator_get_latency (GstAggregator * self, gboolean * live,
GstClockTime * min_latency, GstClockTime * max_latency) GstClockTime * min_latency, GstClockTime * max_latency)
{ {
GstClockTime our_latency;
GstClockTime min, max; GstClockTime min, max;
g_return_if_fail (GST_IS_AGGREGATOR (self)); g_return_if_fail (GST_IS_AGGREGATOR (self));
@ -1088,10 +1092,11 @@ gst_aggregator_get_latency (GstAggregator * self, gboolean * live,
&& GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_max)) && GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_max))
max += self->priv->sub_latency_max; max += self->priv->sub_latency_max;
if (GST_CLOCK_TIME_IS_VALID (self->latency)) { our_latency = self->priv->latency;
min += self->latency; if (GST_CLOCK_TIME_IS_VALID (our_latency)) {
min += our_latency;
if (GST_CLOCK_TIME_IS_VALID (max)) if (GST_CLOCK_TIME_IS_VALID (max))
max += self->latency; max += our_latency;
} }
if (live) if (live)
@ -1105,6 +1110,7 @@ gst_aggregator_get_latency (GstAggregator * self, gboolean * live,
static gboolean static gboolean
gst_aggregator_query_latency (GstAggregator * self, GstQuery * query) gst_aggregator_query_latency (GstAggregator * self, GstQuery * query)
{ {
GstClockTime our_latency;
LatencyData data; LatencyData data;
data.min = 0; data.min = 0;
@ -1117,13 +1123,16 @@ gst_aggregator_query_latency (GstAggregator * self, GstQuery * query)
gst_aggregator_query_sink_latency_foreach, &data); gst_aggregator_query_sink_latency_foreach, &data);
SRC_STREAM_UNLOCK (self); SRC_STREAM_UNLOCK (self);
if (data.live && GST_CLOCK_TIME_IS_VALID (self->latency) && our_latency = self->priv->latency;
self->latency > data.max) {
if (data.live && GST_CLOCK_TIME_IS_VALID (our_latency) &&
our_latency > data.max) {
GST_ELEMENT_WARNING (self, CORE, NEGOTIATION, GST_ELEMENT_WARNING (self, CORE, NEGOTIATION,
("%s", "Latency too big"), ("%s", "Latency too big"),
("The requested latency value is too big for the current pipeline. " ("The requested latency value is too big for the current pipeline. "
"Limiting to %" G_GINT64_FORMAT, data.max)); "Limiting to %" G_GINT64_FORMAT, data.max));
self->latency = data.max; self->priv->latency = data.max;
/* FIXME: shouldn't we g_object_notify() the change here? */
} }
if (G_UNLIKELY (!GST_CLOCK_TIME_IS_VALID (data.min))) { if (G_UNLIKELY (!GST_CLOCK_TIME_IS_VALID (data.min))) {
@ -1143,11 +1152,11 @@ gst_aggregator_query_latency (GstAggregator * self, GstQuery * query)
self->priv->latency_max = data.max; self->priv->latency_max = data.max;
/* add our own */ /* add our own */
if (GST_CLOCK_TIME_IS_VALID (self->latency)) { if (GST_CLOCK_TIME_IS_VALID (our_latency)) {
if (GST_CLOCK_TIME_IS_VALID (data.min)) if (GST_CLOCK_TIME_IS_VALID (data.min))
data.min += self->latency; data.min += our_latency;
if (GST_CLOCK_TIME_IS_VALID (data.max)) if (GST_CLOCK_TIME_IS_VALID (data.max))
data.max += self->latency; data.max += our_latency;
} }
if (GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_min) if (GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_min)
@ -1500,8 +1509,8 @@ gst_aggregator_set_latency_property (GstAggregator * self, gint64 latency)
latency = self->priv->latency_max; latency = self->priv->latency_max;
} }
changed = self->latency != latency; changed = (self->priv->latency != latency);
self->latency = latency; self->priv->latency = latency;
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
if (changed) if (changed)
@ -1528,7 +1537,7 @@ gst_aggregator_get_latency_property (GstAggregator * agg)
g_return_val_if_fail (GST_IS_AGGREGATOR (agg), -1); g_return_val_if_fail (GST_IS_AGGREGATOR (agg), -1);
GST_OBJECT_LOCK (agg); GST_OBJECT_LOCK (agg);
res = agg->latency; res = agg->priv->latency;
GST_OBJECT_UNLOCK (agg); GST_OBJECT_UNLOCK (agg);
return res; return res;
@ -1645,7 +1654,7 @@ gst_aggregator_init (GstAggregator * self, GstAggregatorClass * klass)
gst_element_add_pad (GST_ELEMENT (self), self->srcpad); gst_element_add_pad (GST_ELEMENT (self), self->srcpad);
self->latency = 0; self->priv->latency = DEFAULT_LATENCY;
g_mutex_init (&self->priv->setcaps_lock); g_mutex_init (&self->priv->setcaps_lock);
g_mutex_init (&self->priv->src_lock); g_mutex_init (&self->priv->src_lock);

3
libs/gst/base/gstaggregator.h
View file

@ -138,9 +138,6 @@ struct _GstAggregator
/*< private >*/ /*< private >*/
GstAggregatorPrivate * priv; GstAggregatorPrivate * priv;
/* properties */
gint64 latency;
gpointer _gst_reserved[GST_PADDING_LARGE]; gpointer _gst_reserved[GST_PADDING_LARGE];
}; };