gst/gstbin.c: Also report the live parameter of a latency query.

Original commit message from CVS:
* gst/gstbin.c: (bin_query_min_max_init), (bin_query_latency_fold),
(bin_query_latency_done):
Also report the live parameter of a latency query.

diff --git a/ChangeLog b/ChangeLog
index 49c679139364774e4763eb19867836301be0d603..0279986ba835de051ee1efeefbe692de395cb85b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-28  Wim Taymans  <wim@fluendo.com>
+
+       * gst/gstbin.c: (bin_query_min_max_init), (bin_query_latency_fold),
+       (bin_query_latency_done):
+       Also report the live parameter of a latency query.
+
 2007-02-28  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * tests/check/generic/states.c: (GST_START_TEST), (states_suite):

diff --git a/gst/gstbin.c b/gst/gstbin.c
index 659fd199456efd30c8f43bc2ab89210e88d8cac3..e02d42a0a89eab17999d346b83d81682b508aeab 100644 (file)
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -2330,6 +2330,7 @@ typedef struct
   GstQuery *query;
   gint64 min;
   gint64 max;
+  gboolean live;
 } QueryFold;
 
 typedef void (*QueryInitFunction) (GstBin * bin, QueryFold * fold);
@@ -2342,6 +2343,7 @@ bin_query_min_max_init (GstBin * bin, QueryFold * fold)
 {
   fold->min = 0;
   fold->max = -1;
+  fold->live = FALSE;
 }
 
 static gboolean
@@ -2419,14 +2421,15 @@ bin_query_latency_fold (GstElement * item, GValue * ret, QueryFold * fold)
 {
   if (gst_element_query (item, fold->query)) {
     GstClockTime min, max;
+    gboolean live;
 
     g_value_set_boolean (ret, TRUE);
 
-    gst_query_parse_latency (fold->query, NULL, &min, &max);
+    gst_query_parse_latency (fold->query, &live, &min, &max);
 
     GST_DEBUG_OBJECT (item,
-        "got latency min %" GST_TIME_FORMAT ", max %" GST_TIME_FORMAT,
-        GST_TIME_ARGS (min), GST_TIME_ARGS (max));
+        "got latency min %" GST_TIME_FORMAT ", max %" GST_TIME_FORMAT
+        ", live %d", GST_TIME_ARGS (min), GST_TIME_ARGS (max), live);
 
     /* for the combined latency we collect the MAX of all min latencies and
      * the MIN of all max latencies */
@@ -2436,6 +2439,8 @@ bin_query_latency_fold (GstElement * item, GValue * ret, QueryFold * fold)
       fold->max = max;
     else if (max < fold->max)
       fold->max = max;
+    if (fold->live == FALSE)
+      fold->live = live;
   }
 
   gst_object_unref (item);
@@ -2445,11 +2450,12 @@ static void
 bin_query_latency_done (GstBin * bin, QueryFold * fold)
 {
   /* store max in query result */
-  gst_query_set_latency (fold->query, TRUE, fold->min, fold->max);
+  gst_query_set_latency (fold->query, fold->live, fold->min, fold->max);
 
   GST_DEBUG_OBJECT (bin,
-      "latency min %" GST_TIME_FORMAT ", max %" GST_TIME_FORMAT,
-      GST_TIME_ARGS (fold->min), GST_TIME_ARGS (fold->max));
+      "latency min %" GST_TIME_FORMAT ", max %" GST_TIME_FORMAT
+      ", live %d", GST_TIME_ARGS (fold->min), GST_TIME_ARGS (fold->max),
+      fold->live);
 }