diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2018-08-31 11:41:47 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2018-08-31 11:41:47 +0300 |
commit | 5182b18912fe5a185ba587b12389447cb8e0944d (patch) | |
tree | 19a1b433644ba9447e41e0291b91fb2a88ad80d1 | |
parent | a42ab58588991b7f592d4732a9176f51c7708c4e (diff) |
pad: Accumulate live/non-live latency values separately
And only ever use the non-live values if all pads are non-live,
otherwise only use the results of all live pads.
It's unclear what one would use the values for in the non-live case, but
by this we at least pass them through correctly then.
This is a follow-up for 794944f779f954375fc74a3fffcc2067bba6a3e5, which
causes wrong latency calculations if the first pad is non-live but a
later pad is actually live. In that case the live values would be
accumulated together with the values of the non-live first pad,
generally causing wrong min/max latencies to be calculated.
-rw-r--r-- | gst/gstpad.c | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/gst/gstpad.c b/gst/gstpad.c index bb9e95ba05..0bce4a1da1 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -3246,9 +3246,9 @@ done: /* Default latency implementation */ typedef struct { - guint count; gboolean live; - GstClockTime min, max; + GstClockTime live_min, live_max; + GstClockTime non_live_min, non_live_max; } LatencyFoldData; static gboolean @@ -3272,25 +3272,29 @@ 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); GST_LOG_OBJECT (pad, "got latency live:%s min:%" G_GINT64_FORMAT " max:%" G_GINT64_FORMAT, live ? "true" : "false", min, max); - /* FIXME : Why do we only take values into account if it's live ? */ - if (live || fold_data->count == 0) { - 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; - + if (live) { + min_store = &fold_data->live_min; + max_store = &fold_data->live_max; fold_data->live = live; + } else { + min_store = &fold_data->non_live_min; + max_store = &fold_data->non_live_max; } - fold_data->count += 1; + + 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); @@ -3321,10 +3325,9 @@ gst_pad_query_latency_default (GstPad * pad, GstQuery * query) g_value_init (&ret, G_TYPE_BOOLEAN); retry: - fold_data.count = 0; fold_data.live = FALSE; - fold_data.min = 0; - fold_data.max = GST_CLOCK_TIME_NONE; + fold_data.live_min = fold_data.non_live_min = 0; + fold_data.live_max = fold_data.non_live_max = GST_CLOCK_TIME_NONE; g_value_set_boolean (&ret, TRUE); res = gst_iterator_fold (it, query_latency_default_fold, &ret, &fold_data); @@ -3348,15 +3351,24 @@ 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", - fold_data.min, fold_data.max); + " max:%" G_GINT64_FORMAT, fold_data.live ? "true" : "false", min, max); - if (fold_data.min > fold_data.max) { + if (min > max) { GST_ERROR_OBJECT (pad, "minimum latency bigger than maximum latency"); } - gst_query_set_latency (query, fold_data.live, fold_data.min, fold_data.max); + gst_query_set_latency (query, fold_data.live, min, max); } else { GST_LOG_OBJECT (pad, "latency query failed"); } |