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

aggregator: Some minor cleanup

Browse source
This commit is contained in:
Sebastian Dröge 2014-12-16 17:33:01 +01:00 committed by Tim-Philipp Müller
parent f4b86a6d8c
commit bf5652f84a
1 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,14 +166,13 @@ GST_DEBUG_CATEGORY_STATIC (aggregator_debug);
g_thread_self()); \ g_thread_self()); \
} G_STMT_END } G_STMT_END
#define SRC_STREAM_BROADCAST(self) { \ #define SRC_STREAM_BROADCAST(self) G_STMT_START { \
GST_LOG_OBJECT (self, "Signaling src STREAM from thread %p", \ GST_LOG_OBJECT (self, "Signaling src STREAM from thread %p", \
g_thread_self()); \ g_thread_self()); \
g_cond_broadcast(&(self->priv->src_cond)); \ g_cond_broadcast(&(self->priv->src_cond)); \
} } G_STMT_END
#define KICK_SRC_THREAD(self) \ #define KICK_SRC_THREAD(self) G_STMT_START { \
do { \
SRC_STREAM_LOCK (self); \ SRC_STREAM_LOCK (self); \
GST_LOG_OBJECT (self, "kicking src STREAM from thread %p", \ GST_LOG_OBJECT (self, "kicking src STREAM from thread %p", \
g_thread_self ()); \ g_thread_self ()); \
@ -182,7 +181,7 @@ GST_DEBUG_CATEGORY_STATIC (aggregator_debug);
self->priv->n_kicks++; \ self->priv->n_kicks++; \
SRC_STREAM_BROADCAST (self); \ SRC_STREAM_BROADCAST (self); \
SRC_STREAM_UNLOCK (self); \ SRC_STREAM_UNLOCK (self); \
} while (0) } G_STMT_END
struct _GstAggregatorPadPrivate struct _GstAggregatorPadPrivate
{ {
@ -511,13 +510,21 @@ _wait_and_check (GstAggregator * self)
SRC_STREAM_WAIT (self); SRC_STREAM_WAIT (self);
self->priv->n_kicks--; self->priv->n_kicks--;
} else { } else {
GstClockTime time; GstClockTime base_time, time;
GstClock *clock;
GstClockReturn status; GstClockReturn status;
GST_DEBUG_OBJECT (self, "got subclass start time: %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (self, "got subclass start time: %" GST_TIME_FORMAT,
GST_TIME_ARGS (start)); GST_TIME_ARGS (start));
time = GST_ELEMENT_CAST (self)->base_time + start; GST_OBJECT_LOCK (self);
base_time = GST_ELEMENT_CAST (self)->base_time;
clock = GST_ELEMENT_CLOCK (self);
if (clock)
gst_object_ref (clock);
GST_OBJECT_UNLOCK (self);
time = base_time + start;
if (GST_CLOCK_TIME_IS_VALID (latency_max)) { if (GST_CLOCK_TIME_IS_VALID (latency_max)) {
time += latency_max; time += latency_max;
@ -534,10 +541,10 @@ _wait_and_check (GstAggregator * self)
GST_TIME_ARGS (GST_ELEMENT_CAST (self)->base_time), GST_TIME_ARGS (GST_ELEMENT_CAST (self)->base_time),
GST_TIME_ARGS (start), GST_TIME_ARGS (latency_max), GST_TIME_ARGS (start), GST_TIME_ARGS (latency_max),
GST_TIME_ARGS (latency_min), GST_TIME_ARGS (latency_min),
GST_TIME_ARGS (gst_clock_get_time (GST_ELEMENT_CLOCK (self)))); GST_TIME_ARGS (gst_clock_get_time (clock)));
self->priv->aggregate_id = self->priv->aggregate_id = gst_clock_new_single_shot_id (clock, time);
gst_clock_new_single_shot_id (GST_ELEMENT_CLOCK (self), time); gst_object_unref (clock);
SRC_STREAM_UNLOCK (self); SRC_STREAM_UNLOCK (self);
status = gst_clock_id_wait (self->priv->aggregate_id, NULL); status = gst_clock_id_wait (self->priv->aggregate_id, NULL);
@ -1030,7 +1037,6 @@ gst_aggregator_get_latency (GstAggregator * self, gboolean * live,
max = self->priv->latency_max; max = self->priv->latency_max;
if (GST_CLOCK_TIME_IS_VALID (self->latency)) { if (GST_CLOCK_TIME_IS_VALID (self->latency)) {
if (GST_CLOCK_TIME_IS_VALID (min))
min += self->latency; min += self->latency;
if (GST_CLOCK_TIME_IS_VALID (max)) if (GST_CLOCK_TIME_IS_VALID (max))
max += self->latency; max += self->latency;
@ -1066,6 +1072,11 @@ gst_aggregator_query_latency (GstAggregator * self, GstQuery * query)
self->latency = data.max; self->latency = data.max;
} }
if (G_UNLIKELY (!GST_CLOCK_TIME_IS_VALID (data.min))) {
GST_WARNING_OBJECT (self, "Invalid minimum latency, using 0");
data.min = 0;
}
self->priv->latency_live = data.live; self->priv->latency_live = data.live;
self->priv->latency_min = data.min; self->priv->latency_min = data.min;
self->priv->latency_max = data.max; self->priv->latency_max = data.max;