From 1c2d31dd2f3ad349f74d9fe1cefc378314933b20 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@gnome.org>
Date: Thu, 26 Jun 2014 15:03:07 +0200
Subject: [PATCH] validate:media-check: Changes in tags detection are not fatal
 issues

---
 validate/gst/validate/gst-validate-report.c | 2 ++
 validate/gst/validate/gst-validate-report.h | 1 +
 validate/gst/validate/media-descriptor.c    | 6 ++++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/validate/gst/validate/gst-validate-report.c b/validate/gst/validate/gst-validate-report.c
index c9b6aecf0c..daccc6349b 100644
--- a/validate/gst/validate/gst-validate-report.c
+++ b/validate/gst/validate/gst-validate-report.c
@@ -195,6 +195,8 @@ gst_validate_report_load_issues (void)
       _("resulting file duration wasn't within the expected values"), NULL);
   REGISTER_VALIDATE_ISSUE (WARNING, FILE_SEEKABLE_INCORRECT,
       _("resulting file wasn't seekable or not seekable as expected"), NULL);
+  REGISTER_VALIDATE_ISSUE (ISSUE, FILE_TAG_DETECTION_INCORRECT,
+      _("detected tags are different than expected ones"), NULL);
   REGISTER_VALIDATE_ISSUE (CRITICAL, FILE_PROFILE_INCORRECT,
       _("resulting file stream profiles didn't match expected values"), NULL);
   REGISTER_VALIDATE_ISSUE (CRITICAL, FILE_NOT_FOUND,
diff --git a/validate/gst/validate/gst-validate-report.h b/validate/gst/validate/gst-validate-report.h
index a0771fb562..a799e25639 100644
--- a/validate/gst/validate/gst-validate-report.h
+++ b/validate/gst/validate/gst-validate-report.h
@@ -105,6 +105,7 @@ typedef enum {
 #define GST_VALIDATE_ISSUE_ID_FILE_PLAYBACK_START_FAILURE (((GstValidateIssueId) GST_VALIDATE_AREA_FILE_CHECK) << GST_VALIDATE_ISSUE_ID_SHIFT | 8)
 #define GST_VALIDATE_ISSUE_ID_FILE_PLAYBACK_ERROR (((GstValidateIssueId) GST_VALIDATE_AREA_FILE_CHECK) << GST_VALIDATE_ISSUE_ID_SHIFT | 9)
 #define GST_VALIDATE_ISSUE_ID_FILE_NO_STREAM_ID  (((GstValidateIssueId) GST_VALIDATE_AREA_FILE_CHECK) << GST_VALIDATE_ISSUE_ID_SHIFT | 10)
+#define GST_VALIDATE_ISSUE_ID_FILE_TAG_DETECTION_INCORRECT  (((GstValidateIssueId) GST_VALIDATE_AREA_FILE_CHECK) << GST_VALIDATE_ISSUE_ID_SHIFT | 11)
 
 #define GST_VALIDATE_ISSUE_ID_ALLOCATION_FAILURE (((GstValidateIssueId) GST_VALIDATE_AREA_RUN_ERROR) << GST_VALIDATE_ISSUE_ID_SHIFT | 1)
 #define GST_VALIDATE_ISSUE_ID_MISSING_PLUGIN     (((GstValidateIssueId) GST_VALIDATE_AREA_RUN_ERROR) << GST_VALIDATE_ISSUE_ID_SHIFT | 2)
diff --git a/validate/gst/validate/media-descriptor.c b/validate/gst/validate/media-descriptor.c
index 8f01283fa7..ec8f051e66 100644
--- a/validate/gst/validate/media-descriptor.c
+++ b/validate/gst/validate/media-descriptor.c
@@ -231,7 +231,7 @@ compare_tags (GstMediaDescriptor * ref, StreamNode * rstream,
     if (found == FALSE) {
       gchar *rtaglist = gst_tag_list_to_string (rtag->taglist);
 
-      GST_VALIDATE_REPORT (ref, FILE_PROFILE_INCORRECT,
+      GST_VALIDATE_REPORT (ref, FILE_TAG_DETECTION_INCORRECT,
           "Reference descriptor for stream %s has tags %s"
           " but no equivalent taglist was found on the compared stream",
           rstream->id, rtaglist);
@@ -262,7 +262,9 @@ comparse_stream (GstMediaDescriptor * ref, StreamNode * rstream,
       return 0;
     }
 
-    return compare_tags (ref, rstream, cstream);
+    compare_tags (ref, rstream, cstream);
+
+    return 1;
   }
 
   return -1;