check: Update parser mini-lib to 0.11 API

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 3dc36c3..e81f2ad 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -190,7 +190,7 @@ noinst_LTLIBRARIES = libparser.la
 libparser_la_SOURCES = elements/parser.c elements/parser.h
 libparser_la_CFLAGS = \
        -I$(top_srcdir)/tests/check \
-       $(GST_CHECK_CFLAGS) $(GST_OPTION_CFLAGS)
+       $(GST_CHECK_CFLAGS) $(GST_OPTION_CFLAGS) -DGST_USE_UNSTABLE_API
 
 elements_aacparse_LDADD = libparser.la $(LDADD)
 

diff --git a/tests/check/elements/parser.c b/tests/check/elements/parser.c
index 7596889..d0bd455 100644 (file)
--- a/tests/check/elements/parser.c
+++ b/tests/check/elements/parser.c
@@ -66,16 +66,21 @@ buffer_new (const unsigned char *buffer_data, guint size)
 
   buffer = gst_buffer_new_and_alloc (size);
   if (buffer_data) {
-    memcpy (GST_BUFFER_DATA (buffer), buffer_data, size);
+    gst_buffer_fill (buffer, 0, buffer_data, size);
   } else {
     guint i;
+    guint8 *data;
+    gsize wantsize = size;
+
+    data = gst_buffer_map (buffer, &wantsize, NULL, GST_MAP_WRITE);
     /* Create a recognizable pattern (loop 0x00 -> 0xff) in the data block */
-    for (i = 0; i < size; i++) {
-      GST_BUFFER_DATA (buffer)[i] = i % 0x100;
+    for (i = 0; i < wantsize; i++) {
+      data[i] = i % 0x100;
     }
+    gst_buffer_unmap (buffer, data, wantsize);
   }
 
-  gst_buffer_set_caps (buffer, GST_PAD_CAPS (srcpad));
+  /* gst_buffer_set_caps (buffer, GST_PAD_CAPS (srcpad)); */
   GST_BUFFER_OFFSET (buffer) = dataoffset;
   dataoffset += size;
   return buffer;
@@ -88,7 +93,7 @@ static void
 buffer_count_size (void *buffer, void *user_data)
 {
   guint *sum = (guint *) user_data;
-  *sum += GST_BUFFER_SIZE (buffer);
+  *sum += gst_buffer_get_size (buffer);
 }
 
 /*
@@ -115,8 +120,8 @@ buffer_verify_data (void *buffer, void *user_data)
     return;
   }
 
-  fail_unless (GST_BUFFER_SIZE (buffer) == vdata->data_to_verify_size);
-  fail_unless (memcmp (GST_BUFFER_DATA (buffer), vdata->data_to_verify,
+  fail_unless (gst_buffer_get_size (buffer) == vdata->data_to_verify_size);
+  fail_unless (gst_buffer_memcmp (buffer, 0, vdata->data_to_verify,
           vdata->data_to_verify_size) == 0);
 
   if (vdata->buffers_before_offset_skip) {
@@ -131,14 +136,8 @@ buffer_verify_data (void *buffer, void *user_data)
     fail_unless (GST_BUFFER_OFFSET (buffer) == offset_counter);
   }
 
-  if (vdata->caps) {
-    GST_LOG ("%" GST_PTR_FORMAT " = %" GST_PTR_FORMAT " ?",
-        GST_BUFFER_CAPS (buffer), vdata->caps);
-    fail_unless (gst_caps_is_equal (GST_BUFFER_CAPS (buffer), vdata->caps));
-  }
-
   ts_counter += GST_BUFFER_DURATION (buffer);
-  offset_counter += GST_BUFFER_SIZE (buffer);
+  offset_counter += gst_buffer_get_size (buffer);
   buffer_counter++;
 }
 
@@ -247,14 +246,8 @@ gst_parser_test_run (GstParserTest * test, GstCaps ** out_caps)
         if (!k)
           buffer = buffer_new (test->series[j].data, test->series[j].size);
         else {
-          GstCaps *caps = gst_buffer_get_caps (buffer);
-
           buffer = gst_buffer_join (buffer,
               buffer_new (test->series[j].data, test->series[j].size));
-          if (caps) {
-            gst_buffer_set_caps (buffer, caps);
-            gst_caps_unref (caps);
-          }
         }
       }
       fail_unless_equals_int (gst_pad_push (srcpad, buffer), GST_FLOW_OK);