validate: Properly use boolean in XML
authorThibault Saunier <tsaunier@gnome.org>
Thu, 15 May 2014 07:46:24 +0000 (09:46 +0200)
committerThibault Saunier <tsaunier@gnome.org>
Thu, 15 May 2014 07:46:24 +0000 (09:46 +0200)
validate/gst/validate/media-descriptor-parser.c
validate/gst/validate/media-descriptor-writer.c

index f62bdd7c323ef0bc3ef3f770e892142f5ab17ef4..4209637976b80010a25f0f9b0defcc683bc808a1 100644 (file)
@@ -55,7 +55,7 @@ compare_frames (FrameNode * frm, FrameNode * frm1)
 }
 
 static void
-deserialize_filenode (FileNode *filenode,
+deserialize_filenode (FileNode * filenode,
     const gchar ** names, const gchar ** values)
 {
   gint i;
@@ -134,8 +134,12 @@ deserialize_framenode (const gchar ** names, const gchar ** values)
       framenode->pts = g_ascii_strtoull (values[i], NULL, 0);
     else if (g_strcmp0 (names[i], "dts") == 0)
       framenode->dts = g_ascii_strtoull (values[i], NULL, 0);
-    else if (g_strcmp0 (names[i], "is-keyframe") == 0)
-      framenode->is_keyframe = g_ascii_strtoull (values[i], NULL, 0);
+    else if (g_strcmp0 (names[i], "is-keyframe") == 0) {
+      if (g_ascii_strcasecmp (values[i], "true"))
+        framenode->is_keyframe = TRUE;
+      else
+        framenode->is_keyframe = FALSE;
+    }
   }
 
   framenode->buf = gst_buffer_new ();
index 5e8bfdf436f1e16495f0502842a32931593ce298..2be7fba8e9256c91eed5be9bab4dc286c59c9567 100644 (file)
@@ -464,8 +464,8 @@ _run_frame_analisis (GstMediaDescriptorWriter * writer,
   writer->priv->pipeline = gst_pipeline_new ("frame-analisis");
 
   monitor =
-      gst_validate_monitor_factory_create (GST_OBJECT_CAST (writer->priv->
-          pipeline), runner, NULL);
+      gst_validate_monitor_factory_create (GST_OBJECT_CAST (writer->
+          priv->pipeline), runner, NULL);
   gst_validate_reporter_set_handle_g_logs (GST_VALIDATE_REPORTER (monitor));
 
   g_object_set (uridecodebin, "uri", uri, "caps", writer->priv->raw_caps, NULL);
@@ -735,11 +735,11 @@ gst_media_descriptor_writer_add_frame (GstMediaDescriptorWriter
 
       fnode->str_open =
           g_markup_printf_escaped (" <frame duration=\"%" G_GUINT64_FORMAT
-          "\" id=\"%i\" is-keyframe=\"%i\" offset=\"%" G_GUINT64_FORMAT
+          "\" id=\"%i\" is-keyframe=\"%s\" offset=\"%" G_GUINT64_FORMAT
           "\" offset-end=\"%" G_GUINT64_FORMAT "\" pts=\"%" G_GUINT64_FORMAT
           "\"  dts=\"%" G_GUINT64_FORMAT "\" />", fnode->duration, id,
-          fnode->is_keyframe, fnode->offset, fnode->offset_end, fnode->pts,
-          fnode->dts);
+          fnode->is_keyframe ? "true" : "false",
+          fnode->offset, fnode->offset_end, fnode->pts, fnode->dts);
 
       fnode->str_close = NULL;