gnl: Remove the notion of media-duration

Rational described at https://bugzilla.gnome.org/show_bug.cgi?id=701287

9 files changed, 37 insertions, 192 deletions

diff --git a/gnl/gnlcomposition.c b/gnl/gnlcomposition.c
index 8faac0a..1b23316 100644
--- a/gnl/gnlcomposition.c
+++ b/gnl/gnlcomposition.c
@@ -2018,7 +2018,6 @@ update_start_stop_duration (GnlComposition * comp)
 
       for (tmp = priv->expandables; tmp; tmp = tmp->next) {
         g_object_set (tmp->data, "duration", obj->stop, NULL);
-        g_object_set (tmp->data, "media-duration", obj->stop, NULL);
       }
     }
 
@@ -2950,8 +2949,7 @@ gnl_composition_add_object (GstBin * bin, GstElement * element)
     g_object_set (element,
         "start", (GstClockTime) 0,
         "inpoint", (GstClockTime) 0,
-        "duration", (GstClockTimeDiff) GNL_OBJECT_STOP (comp),
-        "media-duration", (GstClockTimeDiff) GNL_OBJECT_STOP (comp), NULL);
+        "duration", (GstClockTimeDiff) GNL_OBJECT_STOP (comp), NULL);
   }
 
   entry->activehandler = g_signal_connect (G_OBJECT (element),
diff --git a/gnl/gnlghostpad.c b/gnl/gnlghostpad.c
index 0e88206..5db4e44 100644
--- a/gnl/gnlghostpad.c
+++ b/gnl/gnlghostpad.c
@@ -42,7 +42,7 @@ translate_incoming_seek (GnlObject * object, GstEvent * event)
 {
   GstEvent *event2;
   GstFormat format;
-  gdouble rate, nrate;
+  gdouble rate;
   GstSeekFlags flags;
   GstSeekType curtype, stoptype;
   GstSeekType ncurtype;
@@ -63,13 +63,6 @@ translate_incoming_seek (GnlObject * object, GstEvent * event)
   if (G_UNLIKELY (format != GST_FORMAT_TIME))
     goto invalid_format;
 
-  /* convert rate */
-  if (G_LIKELY (object->rate_1))
-    nrate = rate;
-  else
-    nrate = rate * object->rate;
-  GST_DEBUG ("nrate:%f , rate:%f, object->rate:%f", nrate, rate, object->rate);
-
   /* convert cur */
   ncurtype = GST_SEEK_TYPE_SET;
   if (G_LIKELY ((curtype == GST_SEEK_TYPE_SET)
@@ -118,10 +111,10 @@ translate_incoming_seek (GnlObject * object, GstEvent * event)
 
   GST_DEBUG_OBJECT (object,
       "SENDING SEEK rate:%f, format:TIME, flags:%d, curtype:%d, stoptype:SET, %"
-      GST_TIME_FORMAT " -- %" GST_TIME_FORMAT, nrate, flags, ncurtype,
+      GST_TIME_FORMAT " -- %" GST_TIME_FORMAT, rate, flags, ncurtype,
       GST_TIME_ARGS (ncur), GST_TIME_ARGS (nstop));
 
-  event2 = gst_event_new_seek (nrate, GST_FORMAT_TIME, flags,
+  event2 = gst_event_new_seek (rate, GST_FORMAT_TIME, flags,
       ncurtype, (gint64) ncur, GST_SEEK_TYPE_SET, (gint64) nstop);
   GST_EVENT_SEQNUM (event2) = seqnum;
 
@@ -142,7 +135,7 @@ translate_outgoing_seek (GnlObject * object, GstEvent * event)
 {
   GstEvent *event2;
   GstFormat format;
-  gdouble rate, nrate;
+  gdouble rate;
   GstSeekFlags flags;
   GstSeekType curtype, stoptype;
   GstSeekType ncurtype;
@@ -163,13 +156,6 @@ translate_outgoing_seek (GnlObject * object, GstEvent * event)
   if (G_UNLIKELY (format != GST_FORMAT_TIME))
     goto invalid_format;
 
-  /* convert rate */
-  if (G_LIKELY (object->rate_1))
-    nrate = rate;
-  else
-    nrate = rate / object->rate;
-  GST_DEBUG ("nrate:%f , rate:%f, object->rate:%f", nrate, rate, object->rate);
-
   /* convert cur */
   ncurtype = GST_SEEK_TYPE_SET;
   if (G_LIKELY ((curtype == GST_SEEK_TYPE_SET)
@@ -206,10 +192,10 @@ translate_outgoing_seek (GnlObject * object, GstEvent * event)
 
   GST_DEBUG_OBJECT (object,
       "SENDING SEEK rate:%f, format:TIME, flags:%d, curtype:%d, stoptype:SET, %"
-      GST_TIME_FORMAT " -- %" GST_TIME_FORMAT, nrate, flags, ncurtype,
+      GST_TIME_FORMAT " -- %" GST_TIME_FORMAT, rate, flags, ncurtype,
       GST_TIME_ARGS (ncur), GST_TIME_ARGS (nstop));
 
-  event2 = gst_event_new_seek (nrate, GST_FORMAT_TIME, flags,
+  event2 = gst_event_new_seek (rate, GST_FORMAT_TIME, flags,
       ncurtype, (gint64) ncur, GST_SEEK_TYPE_SET, (gint64) nstop);
   GST_EVENT_SEQNUM (event2) = seqnum;
 
diff --git a/gnl/gnlobject.c b/gnl/gnlobject.c
index d89899f..c2c8e05 100644
--- a/gnl/gnlobject.c
+++ b/gnl/gnlobject.c
@@ -53,9 +53,6 @@ enum
   PROP_DURATION,
   PROP_STOP,
   PROP_INPOINT,
-  PROP_MEDIA_DURATION,
-  PROP_MEDIA_STOP,
-  PROP_RATE,
   PROP_PRIORITY,
   PROP_ACTIVE,
   PROP_CAPS,
@@ -152,51 +149,6 @@ gnl_object_class_init (GnlObjectClass * klass)
       properties[PROP_INPOINT]);
 
   /**
-   * GnlObject:media_duration
-   *
-   * The media's duration in nanoseconds.
-   *
-   * This correspond to the 'contained' object's duration we will be
-   * outputting for.
-   */
-  properties[PROP_MEDIA_DURATION] =
-      g_param_spec_int64 ("media_duration", "Media duration",
-      "Duration of the media (in nanoseconds), can be negative", G_MININT64,
-      G_MAXINT64, 0, G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class, PROP_MEDIA_DURATION,
-      properties[PROP_MEDIA_DURATION]);
-
-  /**
-   * GnlObject:media_stop
-   *
-   * The media stop position in nanoseconds.
-   *
-   * Also called 'out-point' in video-editing, this corresponds to the
-   * position in the 'contained' object we should output until.
-   *
-   * This value is read-only, and is computed from the inpoint and
-   * media_duration property.
-   */
-  properties[PROP_MEDIA_STOP] = g_param_spec_uint64 ("media_stop", "Media stop",
-      "The media stop position (in nanoseconds)",
-      0, G_MAXUINT64, GST_CLOCK_TIME_NONE, G_PARAM_READABLE);
-  g_object_class_install_property (gobject_class, PROP_MEDIA_STOP,
-      properties[PROP_MEDIA_STOP]);
-
-  /**
-   * GnlObject:rate
-   *
-   * The rate applied to the controlled output.
-   *
-   * This is a read-only value computed from duration and media_duration.
-   */
-  properties[PROP_RATE] = g_param_spec_double ("rate", "Rate",
-      "Playback rate of the media (1.0 : standard forward)",
-      -G_MAXDOUBLE, G_MAXDOUBLE, 1.0, G_PARAM_READABLE);
-  g_object_class_install_property (gobject_class, PROP_RATE,
-      properties[PROP_RATE]);
-
-  /**
    * GnlObject:priority
    *
    * The priority of the object in the container.
@@ -266,11 +218,6 @@ gnl_object_init (GnlObject * object)
   object->stop = 0;
 
   object->inpoint = GST_CLOCK_TIME_NONE;
-  object->media_duration = 0;
-  object->media_stop = GST_CLOCK_TIME_NONE;
-
-  object->rate = 1.0;
-  object->rate_1 = TRUE;
   object->priority = 0;
   object->active = TRUE;
 
@@ -316,10 +263,8 @@ gnl_object_to_media_time (GnlObject * object, GstClockTime otime,
 
   GST_DEBUG_OBJECT (object,
       "Start/Stop:[%" GST_TIME_FORMAT " -- %" GST_TIME_FORMAT "] "
-      "Media [%" GST_TIME_FORMAT " -- %" GST_TIME_FORMAT "]",
-      GST_TIME_ARGS (object->start),
-      GST_TIME_ARGS (object->stop),
-      GST_TIME_ARGS (object->inpoint), GST_TIME_ARGS (object->media_stop));
+      "Media start: %" GST_TIME_FORMAT, GST_TIME_ARGS (object->start),
+      GST_TIME_ARGS (object->stop), GST_TIME_ARGS (object->inpoint));
 
   /* limit check */
   if (G_UNLIKELY ((otime < object->start))) {
@@ -330,9 +275,7 @@ gnl_object_to_media_time (GnlObject * object, GstClockTime otime,
 
   if (G_UNLIKELY ((otime >= object->stop))) {
     GST_DEBUG_OBJECT (object, "ObjectTime is after stop");
-    if (G_LIKELY (GST_CLOCK_TIME_IS_VALID (object->media_stop)))
-      *mtime = object->media_stop;
-    else if (GST_CLOCK_TIME_IS_VALID (object->inpoint))
+    if (G_LIKELY (GST_CLOCK_TIME_IS_VALID (object->inpoint)))
       *mtime = object->inpoint + object->duration;
     else
       *mtime = object->stop - object->start;
@@ -342,10 +285,8 @@ gnl_object_to_media_time (GnlObject * object, GstClockTime otime,
   if (G_UNLIKELY (object->inpoint == GST_CLOCK_TIME_NONE)) {
     /* no time shifting, for live sources ? */
     *mtime = otime - object->start;
-  } else if (G_LIKELY (object->rate_1)) {
-    *mtime = otime - object->start + object->inpoint;
   } else {
-    *mtime = (otime - object->start) * object->rate + object->inpoint;
+    *mtime = otime - object->start + object->inpoint;
   }
 
   GST_DEBUG_OBJECT (object, "Returning MediaTime : %" GST_TIME_FORMAT,
@@ -377,10 +318,8 @@ gnl_media_to_object_time (GnlObject * object, GstClockTime mtime,
 
   GST_DEBUG_OBJECT (object,
       "Start/Stop:[%" GST_TIME_FORMAT " -- %" GST_TIME_FORMAT "] "
-      "Media [%" GST_TIME_FORMAT " -- %" GST_TIME_FORMAT "]",
-      GST_TIME_ARGS (object->start),
-      GST_TIME_ARGS (object->stop),
-      GST_TIME_ARGS (object->inpoint), GST_TIME_ARGS (object->media_stop));
+      "inpoint  %" GST_TIME_FORMAT, GST_TIME_ARGS (object->start),
+      GST_TIME_ARGS (object->stop), GST_TIME_ARGS (object->inpoint));
 
 
   /* limit check */
@@ -391,20 +330,10 @@ gnl_media_to_object_time (GnlObject * object, GstClockTime mtime,
     return FALSE;
   }
 
-  if (G_UNLIKELY ((object->media_stop != GST_CLOCK_TIME_NONE)
-          && (mtime >= object->media_stop))) {
-    GST_DEBUG_OBJECT (object,
-        "media time is at or after media_stop, forcing to stop");
-    *otime = object->stop;
-    return FALSE;
-  }
-
-  if (G_LIKELY (object->rate_1 && (object->inpoint != GST_CLOCK_TIME_NONE))) {
+  if (G_LIKELY (object->inpoint != GST_CLOCK_TIME_NONE)) {
     *otime = mtime - object->inpoint + object->start;
-  } else if (object->inpoint == GST_CLOCK_TIME_NONE)
+  } else
     *otime = mtime + object->start;
-  else
-    *otime = (mtime - object->inpoint) / object->rate + object->start;
 
   GST_DEBUG_OBJECT (object, "Returning ObjectTime : %" GST_TIME_FORMAT,
       GST_TIME_ARGS (*otime));
@@ -478,36 +407,6 @@ update_values (GnlObject * object)
         GST_TIME_ARGS (object->start), GST_TIME_ARGS (object->duration));
     g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_STOP]);
   }
-
-  /* check if media start/duration has changed */
-  if ((object->inpoint != GST_CLOCK_TIME_NONE)
-      && ((object->inpoint + object->media_duration) != object->media_stop)) {
-    object->media_stop = object->inpoint + object->media_duration;
-    GST_LOG_OBJECT (object,
-        "Updated media_stop value : %" GST_TIME_FORMAT
-        " [mstart:%" GST_TIME_FORMAT ", mduration:%" GST_TIME_FORMAT "]",
-        GST_TIME_ARGS (object->media_stop),
-        GST_TIME_ARGS (object->inpoint),
-        GST_TIME_ARGS (object->media_duration));
-    g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_MEDIA_STOP]);
-  }
-
-  /* check if rate has changed */
-  if ((object->media_duration != GST_CLOCK_TIME_NONE)
-      && (object->duration) && (object->media_duration)
-      && (((gdouble) object->media_duration / (gdouble) object->duration) !=
-          object->rate)) {
-    object->rate =
-        (gdouble) object->media_duration / (gdouble) object->duration;
-    /* update the speedup rate_1 variable */
-    object->rate_1 = (object->media_duration == object->duration);
-    GST_LOG_OBJECT (object,
-        "Updated rate : %f [mduration:%" GST_TIME_FORMAT ", duration:%"
-        GST_TIME_FORMAT "] rate_1:%d", object->rate,
-        GST_TIME_ARGS (object->media_duration),
-        GST_TIME_ARGS (object->duration), object->rate_1);
-    g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_RATE]);
-  }
 }
 
 static void
@@ -530,10 +429,6 @@ gnl_object_set_property (GObject * object, guint prop_id,
     case PROP_INPOINT:
       gnlobject->inpoint = g_value_get_uint64 (value);
       break;
-    case PROP_MEDIA_DURATION:
-      gnlobject->media_duration = g_value_get_int64 (value);
-      update_values (gnlobject);
-      break;
     case PROP_PRIORITY:
       gnlobject->priority = g_value_get_uint (value);
       break;
@@ -574,15 +469,6 @@ gnl_object_get_property (GObject * object, guint prop_id,
     case PROP_INPOINT:
       g_value_set_uint64 (value, gnlobject->inpoint);
       break;
-    case PROP_MEDIA_DURATION:
-      g_value_set_int64 (value, gnlobject->media_duration);
-      break;
-    case PROP_MEDIA_STOP:
-      g_value_set_uint64 (value, gnlobject->media_stop);
-      break;
-    case PROP_RATE:
-      g_value_set_double (value, gnlobject->rate);
-      break;
     case PROP_PRIORITY:
       g_value_set_uint (value, gnlobject->priority);
       break;
diff --git a/gnl/gnlobject.h b/gnl/gnlobject.h
index d9bf966..72f7cdd 100644
--- a/gnl/gnlobject.h
+++ b/gnl/gnlobject.h
@@ -73,8 +73,6 @@ typedef enum
 #define GNL_OBJECT_STOP(obj) (GNL_OBJECT_CAST (obj)->stop)
 #define GNL_OBJECT_DURATION(obj) (GNL_OBJECT_CAST (obj)->duration)
 #define GNL_OBJECT_INPOINT(obj) (GNL_OBJECT_CAST (obj)->inpoint)
-#define GNL_OBJECT_MEDIA_STOP(obj) (GNL_OBJECT_CAST (obj)->media_stop)
-#define GNL_OBJECT_MEDIA_DURATION(obj) (GNL_OBJECT_CAST (obj)->media_duration)
 #define GNL_OBJECT_PRIORITY(obj) (GNL_OBJECT_CAST (obj)->priority)
 
 struct _GnlObject
@@ -83,22 +81,12 @@ struct _GnlObject
 
   /* Time positionning */
   GstClockTime start;
+  GstClockTime inpoint;
   GstClockTimeDiff duration;
 
   /* read-only */
   GstClockTime stop;
 
-  GstClockTime inpoint;
-  GstClockTimeDiff media_duration;
-
-  /* read-only */
-  GstClockTime media_stop;
-
-  /* read-only */
-  gdouble rate;
-  /* TRUE if rate == 1.0 */
-  gboolean rate_1;
-
   /* priority in parent */
   guint32 priority;
 
diff --git a/tests/check/gnl/common.c b/tests/check/gnl/common.c
index 5d419a8..7b21a00 100644
--- a/tests/check/gnl/common.c
+++ b/tests/check/gnl/common.c
@@ -167,8 +167,7 @@ new_gnl_src (const gchar * name, guint64 start, gint64 duration, gint priority)
 
   g_object_set (G_OBJECT (gnlsource),
       "start", start,
-      "duration", duration,
-      "inpoint", start, "media-duration", duration, "priority", priority, NULL);
+      "duration", duration, "inpoint", start, "priority", priority, NULL);
 
   return gnlsource;
 }
@@ -199,14 +198,13 @@ videotest_gnl_src (const gchar * name, guint64 start, gint64 duration,
 
 GstElement *
 videotest_gnl_src_full (const gchar * name, guint64 start, gint64 duration,
-    guint64 inpoint, gint64 mediaduration, gint pattern, guint priority)
+    guint64 inpoint, gint pattern, guint priority)
 {
   GstElement *gnls;
 
   gnls = videotest_gnl_src (name, start, duration, pattern, priority);
   if (gnls) {
-    g_object_set (G_OBJECT (gnls),
-        "inpoint", inpoint, "media-duration", mediaduration, NULL);
+    g_object_set (G_OBJECT (gnls), "inpoint", inpoint, NULL);
   }
 
   return gnls;
diff --git a/tests/check/gnl/common.h b/tests/check/gnl/common.h
index 64d7b75..7e0b3b5 100644
--- a/tests/check/gnl/common.h
+++ b/tests/check/gnl/common.h
@@ -54,7 +54,7 @@ GstPadProbeReturn sinkpad_probe (GstPad *sinkpad, GstPadProbeInfo * info, Collec
 GstElement *videotest_gnl_src (const gchar * name, guint64 start, gint64 duration,
 			       gint pattern, guint priority);
 GstElement * videotest_gnl_src_full (const gchar * name, guint64 start, gint64 duration,
-				     guint64 inpoint, gint64 mediaduration,
+				     guint64 inpoint,
 				     gint pattern, guint priority);
 GstElement *
 videotest_in_bin_gnl_src (const gchar * name, guint64 start, gint64 duration, gint pattern, guint priority);
diff --git a/tests/check/gnl/gnlcomposition.c b/tests/check/gnl/gnlcomposition.c
index c37e586..5353409 100644
--- a/tests/check/gnl/gnlcomposition.c
+++ b/tests/check/gnl/gnlcomposition.c
@@ -310,8 +310,7 @@ GST_START_TEST (test_no_more_pads_race)
   fail_unless (videomixer != NULL);
   gst_bin_add (GST_BIN (operation), videomixer);
   g_object_set (operation, "start", 0 * GST_SECOND, "duration", 10 * GST_SECOND,
-      "inpoint", 0 * GST_SECOND, "media-duration", 10 * GST_SECOND,
-      "priority", 10, NULL);
+      "inpoint", 0 * GST_SECOND, "priority", 10, NULL);
   gst_bin_add (GST_BIN (composition), operation);
 
   /* source 1 */
@@ -319,8 +318,7 @@ GST_START_TEST (test_no_more_pads_race)
   videotestsrc1 = gst_element_factory_make ("videotestsrc", "videotestsrc1");
   gst_bin_add (GST_BIN (source1), videotestsrc1);
   g_object_set (source1, "start", 0 * GST_SECOND, "duration", 5 * GST_SECOND,
-      "inpoint", 0 * GST_SECOND, "media-duration", 5 * GST_SECOND,
-      "priority", 20, NULL);
+      "inpoint", 0 * GST_SECOND, "priority", 20, NULL);
 
   /* source2 */
   source2 = gst_element_factory_make ("gnlsource", "source2");
@@ -333,16 +331,14 @@ GST_START_TEST (test_no_more_pads_race)
   gst_bin_add (bin, videotestsrc2);
   gst_bin_add (GST_BIN (source2), GST_ELEMENT (bin));
   g_object_set (source2, "start", 0 * GST_SECOND, "duration", 5 * GST_SECOND,
-      "inpoint", 0 * GST_SECOND, "media-duration", 5 * GST_SECOND,
-      "priority", 20, NULL);
+      "inpoint", 0 * GST_SECOND, "priority", 20, NULL);
 
   /* source3 */
   source3 = gst_element_factory_make ("gnlsource", "source3");
   videotestsrc2 = gst_element_factory_make ("videotestsrc", "videotestsrc3");
   gst_bin_add (GST_BIN (source3), videotestsrc2);
   g_object_set (source3, "start", 0 * GST_SECOND, "duration", 5 * GST_SECOND,
-      "inpoint", 0 * GST_SECOND, "media-duration", 5 * GST_SECOND,
-      "priority", 20, NULL);
+      "inpoint", 0 * GST_SECOND, "priority", 20, NULL);
 
   closure.composition = composition;
   closure.source3 = source3;
@@ -423,8 +419,7 @@ GST_START_TEST (test_simple_adder)
   fail_unless (adder != NULL);
   gst_bin_add (GST_BIN (gnl_adder), adder);
   g_object_set (gnl_adder, "start", 0 * GST_SECOND, "duration", total_time,
-      "inpoint", 0 * GST_SECOND, "media-duration", total_time,
-      "priority", 0, NULL);
+      "inpoint", 0 * GST_SECOND, "priority", 0, NULL);
   gst_bin_add (GST_BIN (composition), gnl_adder);
 
   /* source 1 */
@@ -432,8 +427,7 @@ GST_START_TEST (test_simple_adder)
   audiotestsrc1 = gst_element_factory_make ("audiotestsrc", "audiotestsrc1");
   gst_bin_add (GST_BIN (gnlsource1), audiotestsrc1);
   g_object_set (gnlsource1, "start", 0 * GST_SECOND, "duration",
-      total_time / 2, "inpoint", 0 * GST_SECOND, "media-duration",
-      total_time / 2, "priority", 1, NULL);
+      total_time / 2, "inpoint", 0, "priority", 1, NULL);
   fail_unless (gst_bin_add (GST_BIN (composition), gnlsource1));
 
   /* gnlsource2 */
@@ -441,8 +435,7 @@ GST_START_TEST (test_simple_adder)
   audiotestsrc2 = gst_element_factory_make ("audiotestsrc", "audiotestsrc2");
   gst_bin_add (GST_BIN (gnlsource2), GST_ELEMENT (audiotestsrc2));
   g_object_set (gnlsource2, "start", 0 * GST_SECOND, "duration", total_time,
-      "inpoint", 0 * GST_SECOND, "media-duration", total_time,
-      "priority", 2, NULL);
+      "inpoint", 0 * GST_SECOND, "priority", 2, NULL);
   fail_unless (gst_bin_add (GST_BIN (composition), gnlsource2));
 
   /* Connecting signals */
diff --git a/tests/check/gnl/seek.c b/tests/check/gnl/seek.c
index f6f3c93..fa6b724 100644
--- a/tests/check/gnl/seek.c
+++ b/tests/check/gnl/seek.c
@@ -170,12 +170,11 @@ test_simplest_full (void)
      Start : 0s
      Duration : 1s
      Media start : 5s
-     Media Duartion : 1s
      Priority : 1
    */
   source1 =
-      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND,
-      1 * GST_SECOND, 3, 1);
+      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND, 3,
+      1);
   fail_if (source1 == NULL);
   check_start_stop_duration (source1, 0, 1 * GST_SECOND, 1 * GST_SECOND);
 
@@ -241,12 +240,11 @@ test_one_after_other_full (void)
      Start : 0s
      Duration : 1s
      Media start : 5s
-     Media Duartion : 1s
      Priority : 1
    */
   source1 =
-      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND,
-      1 * GST_SECOND, 3, 1);
+      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND, 3,
+      1);
   fail_if (source1 == NULL);
   check_start_stop_duration (source1, 0, 1 * GST_SECOND, 1 * GST_SECOND);
 
@@ -255,11 +253,10 @@ test_one_after_other_full (void)
      Start : 1s
      Duration : 1s
      Media start : 2s
-     Media Duration : 1s
      Priority : 1
    */
   source2 = videotest_gnl_src_full ("source2", 1 * GST_SECOND, 1 * GST_SECOND,
-      2 * GST_SECOND, 1 * GST_SECOND, 2, 1);
+      2 * GST_SECOND, 2, 1);
   fail_if (source2 == NULL);
   check_start_stop_duration (source2, 1 * GST_SECOND, 2 * GST_SECOND,
       1 * GST_SECOND);
diff --git a/tests/check/gnl/simple.c b/tests/check/gnl/simple.c
index 14b269f..93fce7b 100644
--- a/tests/check/gnl/simple.c
+++ b/tests/check/gnl/simple.c
@@ -27,8 +27,8 @@ test_simplest_full (gboolean async)
      Priority : 1
    */
   source1 =
-      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND,
-      1 * GST_SECOND, 3, 1);
+      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND, 3,
+      1);
   fail_if (source1 == NULL);
   check_start_stop_duration (source1, 0, 1 * GST_SECOND, 1 * GST_SECOND);
 
@@ -211,8 +211,8 @@ test_one_after_other_full (gboolean async)
      Priority : 1
    */
   source1 =
-      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND,
-      1 * GST_SECOND, 3, 1);
+      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND, 3,
+      1);
   fail_if (source1 == NULL);
   check_start_stop_duration (source1, 0, 1 * GST_SECOND, 1 * GST_SECOND);
 
@@ -221,11 +221,10 @@ test_one_after_other_full (gboolean async)
      Start : 1s
      Duration : 1s
      Media start : 2s
-     Media Duration : 1s
      Priority : 1
    */
   source2 = videotest_gnl_src_full ("source2", 1 * GST_SECOND, 1 * GST_SECOND,
-      2 * GST_SECOND, 1 * GST_SECOND, 2, 1);
+      2 * GST_SECOND, 2, 1);
   fail_if (source2 == NULL);
   check_start_stop_duration (source2, 1 * GST_SECOND, 2 * GST_SECOND,
       1 * GST_SECOND);