diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2018-08-31 12:12:13 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2018-08-31 12:16:43 +0300 |
commit | e6e22af82850242edb8aaf024a44ac7b1af3997f (patch) | |
tree | fe145fb3990220530fe4f3a00b85d9544396f158 | |
parent | 5c4317c399c5a148d5fb93068f55b6bd27060c05 (diff) | |
download | gstreamer-e6e22af82850242edb8aaf024a44ac7b1af3997f.tar.gz |
Revert "pad: Don't drop LATENCY queries with default implementation"
This reverts commit 794944f779f954375fc74a3fffcc2067bba6a3e5.
Accumulating non-live latency values generally makes no sense and often
gives invalid results with min>max
-rw-r--r-- | gst/gstpad.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gst/gstpad.c b/gst/gstpad.c index 3c363ada28..3e177f26e7 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -3242,7 +3242,6 @@ done: /* Default latency implementation */ typedef struct { - guint count; gboolean live; GstClockTime min, max; } LatencyFoldData; @@ -3274,8 +3273,7 @@ query_latency_default_fold (const GValue * item, GValue * ret, 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 (live) { if (min > fold_data->min) fold_data->min = min; @@ -3284,9 +3282,8 @@ query_latency_default_fold (const GValue * item, GValue * ret, else if (max < fold_data->max) fold_data->max = max; - fold_data->live = live; + fold_data->live = TRUE; } - fold_data->count += 1; } else if (peer) { GST_DEBUG_OBJECT (pad, "latency query failed"); g_value_set_boolean (ret, FALSE); @@ -3317,7 +3314,6 @@ 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; |