mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 14:36:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: If upstream has no max latency but the subclass has, take the subclass max latency

Browse source
This commit is contained in:
Sebastian Dröge 2015-02-06 10:36:28 +01:00
parent ea50bc1917
commit 65b1db2aa2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1163,8 +1163,8 @@ gst_aggregator_get_latency_unlocked (GstAggregator * self, gboolean * live,
max += self->priv->sub_latency_max; max += self->priv->sub_latency_max;
our_latency = self->priv->latency; our_latency = self->priv->latency;
if (GST_CLOCK_TIME_IS_VALID (our_latency)) else if (GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_max))
min += our_latency; max = self->priv->sub_latency_max;
if (live) if (live)
*live = self->priv->latency_live; *live = self->priv->latency_live;
@ -1221,6 +1221,8 @@ gst_aggregator_query_latency (GstAggregator * self, GstQuery * query)
if (GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_max) if (GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_max)
&& GST_CLOCK_TIME_IS_VALID (data.max)) && GST_CLOCK_TIME_IS_VALID (data.max))
data.max += self->priv->sub_latency_max; data.max += self->priv->sub_latency_max;
else if (GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_max))
data.max = self->priv->sub_latency_max;
if (data.live && GST_CLOCK_TIME_IS_VALID (our_latency) && data.min > data.max) { if (data.live && GST_CLOCK_TIME_IS_VALID (our_latency) && data.min > data.max) {
GST_ELEMENT_WARNING (self, CORE, NEGOTIATION, GST_ELEMENT_WARNING (self, CORE, NEGOTIATION,