summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2010-10-04 19:00:45 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2010-10-04 19:01:03 +0200
commita060a657861a8a1a8386be89d729df1286de3c00 (patch)
treef4c4730e71cd8c7f36f01c0cb88cabebff504d6f
parent8c910a25fe6915662cea7cb56adb45be47441158 (diff)
goom2k1: report our latency correctly
Fixes #631303
-rw-r--r--gst/goom2k1/gstgoom.c61
1 files changed, 61 insertions, 0 deletions
diff --git a/gst/goom2k1/gstgoom.c b/gst/goom2k1/gstgoom.c
index 398cad373..8faee926b 100644
--- a/gst/goom2k1/gstgoom.c
+++ b/gst/goom2k1/gstgoom.c
@@ -95,6 +95,8 @@ static GstFlowReturn gst_goom_chain (GstPad * pad, GstBuffer * buffer);
static gboolean gst_goom_src_event (GstPad * pad, GstEvent * event);
static gboolean gst_goom_sink_event (GstPad * pad, GstEvent * event);
+static gboolean gst_goom_src_query (GstPad * pad, GstQuery * query);
+
static gboolean gst_goom_sink_setcaps (GstPad * pad, GstCaps * caps);
static gboolean gst_goom_src_setcaps (GstPad * pad, GstCaps * caps);
@@ -174,6 +176,8 @@ gst_goom_init (GstGoom * goom)
GST_DEBUG_FUNCPTR (gst_goom_src_setcaps));
gst_pad_set_event_function (goom->srcpad,
GST_DEBUG_FUNCPTR (gst_goom_src_event));
+ gst_pad_set_query_function (goom->srcpad,
+ GST_DEBUG_FUNCPTR (gst_goom_src_query));
gst_element_add_pad (GST_ELEMENT (goom), goom->srcpad);
goom->adapter = gst_adapter_new ();
@@ -392,6 +396,63 @@ gst_goom_sink_event (GstPad * pad, GstEvent * event)
return res;
}
+static gboolean
+gst_goom_src_query (GstPad * pad, GstQuery * query)
+{
+ gboolean res;
+ GstGoom *goom;
+
+ goom = GST_GOOM (gst_pad_get_parent (pad));
+
+ switch (GST_QUERY_TYPE (query)) {
+ case GST_QUERY_LATENCY:
+ {
+ /* We need to send the query upstream and add the returned latency to our
+ * own */
+ GstClockTime min_latency, max_latency;
+ gboolean us_live;
+ GstClockTime our_latency;
+ guint max_samples;
+
+ if ((res = gst_pad_peer_query (goom->sinkpad, query))) {
+ gst_query_parse_latency (query, &us_live, &min_latency, &max_latency);
+
+ GST_DEBUG_OBJECT (goom, "Peer latency: min %"
+ GST_TIME_FORMAT " max %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (min_latency), GST_TIME_ARGS (max_latency));
+
+ /* the max samples we must buffer buffer */
+ max_samples = MAX (GOOM_SAMPLES, goom->spf);
+ our_latency =
+ gst_util_uint64_scale_int (max_samples, GST_SECOND, goom->rate);
+
+ GST_DEBUG_OBJECT (goom, "Our latency: %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (our_latency));
+
+ /* we add some latency but only if we need to buffer more than what
+ * upstream gives us */
+ min_latency = MAX (our_latency, min_latency);
+ if (max_latency != -1)
+ max_latency = MAX (our_latency, max_latency);
+
+ GST_DEBUG_OBJECT (goom, "Calculated total latency : min %"
+ GST_TIME_FORMAT " max %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (min_latency), GST_TIME_ARGS (max_latency));
+
+ gst_query_set_latency (query, TRUE, min_latency, max_latency);
+ }
+ break;
+ }
+ default:
+ res = gst_pad_peer_query (goom->sinkpad, query);
+ break;
+ }
+
+ gst_object_unref (goom);
+
+ return res;
+}
+
static GstFlowReturn
get_buffer (GstGoom * goom, GstBuffer ** outbuf)
{