decoder: Rename glob_parser to glob_media_desc_parser

1 files changed, 21 insertions, 16 deletions

diff --git a/tests/insanity-test-gst-decoder.c b/tests/insanity-test-gst-decoder.c
index da63e52..d1dc9eb 100644
--- a/tests/insanity-test-gst-decoder.c
+++ b/tests/insanity-test-gst-decoder.c
@@ -85,7 +85,7 @@ static gboolean glob_testing_parser = FALSE;
 /* Gloabl fields */
 
 static ProbeContext *glob_prob_ctx = NULL;
-static MediaDescriptorParser *glob_parser = NULL;
+static MediaDescriptorParser *glob_media_desc_parser = NULL;
 static GstClockTime glob_playback_duration = GST_CLOCK_TIME_NONE;
 static gboolean glob_push_mode = FALSE;
 static GstBuffer *glob_parsing_buf = NULL;
@@ -156,9 +156,9 @@ clean_test (InsanityTest * test)
     glob_prob_ctx = NULL;
   }
 
-  if (glob_parser != NULL) {
-    g_object_unref (glob_parser);
-    glob_parser = NULL;
+  if (glob_media_desc_parser != NULL) {
+    g_object_unref (glob_media_desc_parser);
+    glob_media_desc_parser = NULL;
   }
 
 
@@ -346,21 +346,23 @@ test_queries (InsanityTest * test)
     gboolean seekable, known_seekable;
 
     gst_query_parse_seeking (query, &fmt, &seekable, NULL, NULL);
-    if (glob_parser == NULL) {
+    if (glob_media_desc_parser == NULL) {
       insanity_test_validate_checklist_item (test, "seekable-detection",
           TRUE, "No media-descriptor file, result not verified against it");
 
       glob_seekable = seekable;
     } else {
-      known_seekable = media_descriptor_parser_get_seekable (glob_parser);
+      known_seekable =
+          media_descriptor_parser_get_seekable (glob_media_desc_parser);
 
       insanity_test_validate_checklist_item (test, "seekable-detection",
           known_seekable == seekable, NULL);
       glob_seekable = known_seekable;
     }
   } else {
-    if (glob_parser != NULL)
-      glob_seekable = media_descriptor_parser_get_seekable (glob_parser);
+    if (glob_media_desc_parser != NULL)
+      glob_seekable =
+          media_descriptor_parser_get_seekable (glob_media_desc_parser);
 
     LOG (test,
         "%s Does not handle seeking queries (seekable-detection \"SKIP\")",
@@ -375,7 +377,7 @@ test_queries (InsanityTest * test)
     gchar *validate_msg = NULL;
     gint64 duration;
 
-    if (glob_parser == NULL) {
+    if (glob_media_desc_parser == NULL) {
       gst_query_parse_duration (query, &fmt, &duration);
       validate_msg =
           g_strdup_printf ("Found duration %" GST_TIME_FORMAT
@@ -388,7 +390,8 @@ test_queries (InsanityTest * test)
 
       glob_duration = duration;
     } else {
-      glob_duration = media_descriptor_parser_get_duration (glob_parser);
+      glob_duration =
+          media_descriptor_parser_get_duration (glob_media_desc_parser);
       gst_query_parse_duration (query, &fmt, &duration);
 
       if (glob_duration != duration) {
@@ -408,8 +411,9 @@ test_queries (InsanityTest * test)
     }
 
   } else {
-    if (glob_parser != NULL)
-      glob_duration = media_descriptor_parser_get_seekable (glob_parser);
+    if (glob_media_desc_parser != NULL)
+      glob_duration =
+          media_descriptor_parser_get_seekable (glob_media_desc_parser);
 
     LOG (test, "%s Does not handle duration queries "
         "(duration-detection \"SKIP\")",
@@ -867,8 +871,8 @@ pad_added_cb (GstElement * element, GstPad * new_pad, InsanityTest * test)
     goto error;
   }
 
-  if (glob_parser)
-    media_descriptor_parser_add_stream (glob_parser, new_pad);
+  if (glob_media_desc_parser)
+    media_descriptor_parser_add_stream (glob_media_desc_parser, new_pad);
 
 done:
   DECODER_TEST_UNLOCK ();
@@ -1179,8 +1183,9 @@ start_cb (InsanityTest * test)
   gst_segment_init (&glob_last_segment, GST_FORMAT_UNDEFINED);
   glob_parsing_buf = gst_buffer_new ();
   xmllocation = g_strconcat (location, ".xml", NULL);
-  glob_parser = media_descriptor_parser_new (test, xmllocation, &err);
-  if (glob_parser == NULL) {
+  glob_media_desc_parser =
+      media_descriptor_parser_new (test, xmllocation, &err);
+  if (glob_media_desc_parser == NULL) {
     LOG (test, "Could not create media descriptor parser: %s not testing it",
         err->message);
     goto done;