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

aggregator: Reset upstream latency on first buffer

Browse source 
In the case an aggregator is created and pads are requested but only
linked later, we end up never updating the upstream latency.
This was because latency queries on pads that are not linked succeed,
so we never did a new query once a live source has been linked, so the
thread was never started.

https://bugzilla.gnome.org/show_bug.cgi?id=757548
This commit is contained in:
Nicolas Dufresne 2017-05-20 13:10:53 +02:00 committed by Olivier Crête
parent 39d2526c34
commit ed8512c53e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1390,7 +1390,6 @@ gst_aggregator_request_new_pad (GstElement * element,
} }
GST_DEBUG_OBJECT (element, "Adding pad %s", GST_PAD_NAME (agg_pad)); GST_DEBUG_OBJECT (element, "Adding pad %s", GST_PAD_NAME (agg_pad));
self->priv->has_peer_latency = FALSE;
if (priv->running) if (priv->running)
gst_pad_set_active (GST_PAD (agg_pad), TRUE); gst_pad_set_active (GST_PAD (agg_pad), TRUE);
@ -2165,12 +2164,16 @@ gst_aggregator_pad_chain_internal (GstAggregator * self,
buf_pts = GST_BUFFER_PTS (buffer); buf_pts = GST_BUFFER_PTS (buffer);
aggpad->priv->first_buffer = FALSE;
for (;;) { for (;;) {
SRC_LOCK (self); SRC_LOCK (self);
GST_OBJECT_LOCK (self); GST_OBJECT_LOCK (self);
PAD_LOCK (aggpad); PAD_LOCK (aggpad);
if (aggpad->priv->first_buffer) {
self->priv->has_peer_latency = FALSE;
aggpad->priv->first_buffer = FALSE;
}
if (gst_aggregator_pad_has_space (self, aggpad) if (gst_aggregator_pad_has_space (self, aggpad)
&& aggpad->priv->flow_return == GST_FLOW_OK) { && aggpad->priv->flow_return == GST_FLOW_OK) {
if (head) if (head)