mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-04 01:32:42 +00:00
aggregator: Make sure that the minimum latencies are never GST_CLOCK_TIME_NONE
This commit is contained in:
parent
4846f06b41
commit
8da3d1e596
1 changed files with 3 additions and 1 deletions
|
@ -1013,7 +1013,7 @@ _latency_query (GstAggregator * self, GstPad * pad, gpointer user_data)
|
||||||
" max:%" G_GINT64_FORMAT, GST_PAD_NAME (pad),
|
" max:%" G_GINT64_FORMAT, GST_PAD_NAME (pad),
|
||||||
live ? "true" : "false", min, max);
|
live ? "true" : "false", min, max);
|
||||||
|
|
||||||
if (min > data->min)
|
if (min != GST_CLOCK_TIME_NONE && min > data->min)
|
||||||
data->min = min;
|
data->min = min;
|
||||||
|
|
||||||
if (max != GST_CLOCK_TIME_NONE &&
|
if (max != GST_CLOCK_TIME_NONE &&
|
||||||
|
@ -1049,6 +1049,7 @@ gst_aggregator_get_latency (GstAggregator * self, gboolean * live,
|
||||||
|
|
||||||
g_return_if_fail (GST_IS_AGGREGATOR (self));
|
g_return_if_fail (GST_IS_AGGREGATOR (self));
|
||||||
|
|
||||||
|
/* latency_min is never GST_CLOCK_TIME_NONE by construction */
|
||||||
min = self->priv->latency_min;
|
min = self->priv->latency_min;
|
||||||
max = self->priv->latency_max;
|
max = self->priv->latency_max;
|
||||||
|
|
||||||
|
@ -1990,6 +1991,7 @@ gst_aggregator_set_latency (GstAggregator * self,
|
||||||
GstClockTime min_latency, GstClockTime max_latency)
|
GstClockTime min_latency, GstClockTime max_latency)
|
||||||
{
|
{
|
||||||
g_return_if_fail (GST_IS_AGGREGATOR (self));
|
g_return_if_fail (GST_IS_AGGREGATOR (self));
|
||||||
|
g_return_if_fail (GST_CLOCK_TIME_IS_VALID (min_latency));
|
||||||
g_return_if_fail (max_latency >= min_latency);
|
g_return_if_fail (max_latency >= min_latency);
|
||||||
|
|
||||||
GST_OBJECT_LOCK (self);
|
GST_OBJECT_LOCK (self);
|
||||||
|
|
Loading…
Reference in a new issue