validate: report: Fix the way we print 'repeat' values

diff --git a/validate/gst/validate/gst-validate-report.c b/validate/gst/validate/gst-validate-report.c
index ed8b463a37f105d4bec4326b8e240d1ff55cbca4..7bb708748529fe71d7456c43d1dafa844839a9f5 100644 (file)
--- a/validate/gst/validate/gst-validate-report.c
+++ b/validate/gst/validate/gst-validate-report.c
@@ -769,6 +769,9 @@ _append_value (GQuark field_id, const GValue * value, GString * string)
   if (g_strcmp0 (g_quark_to_string (field_id), "sub-action") == 0)
     return TRUE;
 
+  if (g_strcmp0 (g_quark_to_string (field_id), "repeat") == 0)
+    return TRUE;
+
   if (G_VALUE_TYPE (value) == GST_TYPE_CLOCK_TIME)
     val_str = g_strdup_printf ("%" GST_TIME_FORMAT,
         GST_TIME_ARGS (g_value_get_uint64 (value)));
@@ -806,7 +809,8 @@ gst_validate_print_action (GstValidateAction * action, const gchar * message)
       g_string_append_printf (string, "(subaction)");
 
     if (gst_structure_get_int (action->structure, "repeat", &nrepeats))
-      g_string_append_printf (string, "(%d/%d)", action->repeat, nrepeats);
+      g_string_append_printf (string, "(%d/%d)", nrepeats - action->repeat + 1,
+          nrepeats);
 
     g_string_append_printf (string, "%s",
         gst_structure_get_name (action->structure));

diff --git a/validate/tests/check/validate/expression_parser.c b/validate/tests/check/validate/expression_parser.c
index 76a8f2f62be7009db3701a1e0815f6806bf8d6e4..182730b95c2493747e61e0795297fb4b06cdd448 100644 (file)
--- a/validate/tests/check/validate/expression_parser.c
+++ b/validate/tests/check/validate/expression_parser.c
@@ -20,7 +20,7 @@ GST_START_TEST (test_expression_parser)
           NULL, NULL, NULL), 20);
 
   fail_unless_equals_float (gst_validate_utils_parse_expression
-      ("100, (10 / 0.1)", NULL, NULL, NULL), 1);
+      ("max(100, (10 / 0.1))", NULL, NULL, NULL), 100);
 
   fail_unless_equals_float (gst_validate_utils_parse_expression
       ("min(10, (duration - 0.1) / 0.1)", get_var, GINT_TO_POINTER (1), NULL),