aggregator: Assert if the sink/src pad type that is to be used is not a GstAggregator...

[platform/upstream/gstreamer.git] / libs / gst / base / gstbasesink.c

diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index 5738d63..4368c1a 100644 (file)
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -1201,28 +1201,30 @@ gst_base_sink_query_latency (GstBaseSink * sink, gboolean * live,
          * values to create the complete latency. */
         min = us_min;
         max = us_max;
+
+        if (l) {
+          if (max == -1 || min + processing_deadline <= max)
+            min += processing_deadline;
+          else {
+            GST_ELEMENT_WARNING (sink, CORE, CLOCK,
+                (_("Pipeline construction is invalid, please add queues.")),
+                ("Not enough buffering available for "
+                    " the processing deadline of %" GST_TIME_FORMAT
+                    ", add enough queues to buffer  %" GST_TIME_FORMAT
+                    " additional data. Shortening processing latency to %"
+                    GST_TIME_FORMAT ".",
+                    GST_TIME_ARGS (processing_deadline),
+                    GST_TIME_ARGS (min + processing_deadline - max),
+                    GST_TIME_ARGS (max - min)));
+            min = max;
+          }
+        }
       }
       if (l) {
         /* we need to add the render delay if we are live */
         min += render_delay;
         if (max != -1)
           max += render_delay;
-
-        if (max == -1 || min + processing_deadline <= max)
-          min += processing_deadline;
-        else {
-          GST_ELEMENT_WARNING (sink, CORE, CLOCK,
-              (_("Pipeline construction is invalid, please add queues.")),
-              ("Not enough buffering available for "
-                  " the processing deadline of %" GST_TIME_FORMAT
-                  ", add enough queues to buffer  %" GST_TIME_FORMAT
-                  " additional data. Shortening processing latency to %"
-                  GST_TIME_FORMAT ".",
-                  GST_TIME_ARGS (processing_deadline),
-                  GST_TIME_ARGS (min + processing_deadline - max),
-                  GST_TIME_ARGS (max - min)));
-          min = max;
-        }
       }
     }
     gst_query_unref (query);
@@ -2284,11 +2286,8 @@ gst_base_sink_wait_clock (GstBaseSink * sink, GstClockTime time,
   time += base_time;
 
   /* Re-use existing clockid if available */
-  /* FIXME: Casting to GstClockEntry only works because the types
-   * are the same */
   if (G_LIKELY (sink->priv->cached_clock_id != NULL
-          && GST_CLOCK_ENTRY_CLOCK ((GstClockEntry *) sink->
-              priv->cached_clock_id) == clock)) {
+          && gst_clock_id_uses_clock (sink->priv->cached_clock_id, clock))) {
     if (!gst_clock_single_shot_id_reinit (clock, sink->priv->cached_clock_id,
             time)) {
       gst_clock_id_unref (sink->priv->cached_clock_id);