From 95fcced84d187f6f5d0e386f338f1c020313b796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 31 Aug 2018 12:15:16 +0300 Subject: input-selector: Bring latency handling in sync with GstPad code --- plugins/elements/gstinputselector.c | 45 ++++++++++++------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c index 2266eed0b5..623211efd1 100644 --- a/plugins/elements/gstinputselector.c +++ b/plugins/elements/gstinputselector.c @@ -1587,8 +1587,7 @@ gst_input_selector_event (GstPad * pad, GstObject * parent, GstEvent * event) typedef struct { gboolean live; - GstClockTime live_min, live_max; - GstClockTime non_live_min, non_live_max; + GstClockTime min, max; } LatencyFoldData; static gboolean @@ -1612,7 +1611,6 @@ query_latency_default_fold (const GValue * item, GValue * ret, if (res) { gboolean live; GstClockTime min, max; - GstClockTime *min_store, *max_store; gst_query_parse_latency (query, &live, &min, &max); @@ -1620,21 +1618,15 @@ query_latency_default_fold (const GValue * item, GValue * ret, " max:%" G_GINT64_FORMAT, live ? "true" : "false", min, max); if (live) { - min_store = &fold_data->live_min; - max_store = &fold_data->live_max; + if (min > fold_data->min) + fold_data->min = min; + + if (fold_data->max == GST_CLOCK_TIME_NONE) + fold_data->max = max; + else if (max < fold_data->max) + fold_data->max = max; fold_data->live = live; - } else { - min_store = &fold_data->non_live_min; - max_store = &fold_data->non_live_max; } - - if (min > *min_store) - *min_store = min; - - if (*max_store == GST_CLOCK_TIME_NONE) - *max_store = max; - else if (max < *max_store) - *max_store = max; } else if (peer) { GST_DEBUG_OBJECT (pad, "latency query failed"); g_value_set_boolean (ret, FALSE); @@ -1669,8 +1661,8 @@ gst_input_selector_query_latency (GstInputSelector * sel, GstPad * pad, retry: fold_data.live = FALSE; - fold_data.live_min = fold_data.non_live_min = 0; - fold_data.live_max = fold_data.non_live_max = GST_CLOCK_TIME_NONE; + fold_data.min = 0; + fold_data.max = GST_CLOCK_TIME_NONE; g_value_set_boolean (&ret, TRUE); res = gst_iterator_fold (it, query_latency_default_fold, &ret, &fold_data); @@ -1694,24 +1686,15 @@ retry: query_ret = g_value_get_boolean (&ret); if (query_ret) { - GstClockTime min, max; - - if (fold_data.live) { - min = fold_data.live_min; - max = fold_data.live_max; - } else { - min = fold_data.non_live_min; - max = fold_data.non_live_max; - } - GST_LOG_OBJECT (pad, "got latency live:%s min:%" G_GINT64_FORMAT - " max:%" G_GINT64_FORMAT, fold_data.live ? "true" : "false", min, max); + " max:%" G_GINT64_FORMAT, fold_data.live ? "true" : "false", + fold_data.min, fold_data.max); - if (min > max) { + if (fold_data.min > fold_data.max) { GST_ERROR_OBJECT (pad, "minimum latency bigger than maximum latency"); } - gst_query_set_latency (query, fold_data.live, min, max); + gst_query_set_latency (query, fold_data.live, fold_data.min, fold_data.max); } else { GST_LOG_OBJECT (pad, "latency query failed"); } -- cgit v1.2.1