From 076f3f6fa3c3454be7e5d55ab311d57a1798a0c3 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 28 Mar 2011 15:51:46 +0200
Subject: [PATCH] tests: fix remaining unit tests

---
 tests/check/libs/gstlibscpp.cc       |  1 -
 tests/check/libs/video.c             |  8 ++++++--
 tests/check/pipelines/streamheader.c | 16 +++++++++++++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/tests/check/libs/gstlibscpp.cc b/tests/check/libs/gstlibscpp.cc
index aa80624cc4..3cea1685cc 100644
--- a/tests/check/libs/gstlibscpp.cc
+++ b/tests/check/libs/gstlibscpp.cc
@@ -24,7 +24,6 @@
 #include <gst/gst.h>
 #include <gst/check/gstcheck.h>
 
-#include <gst/app/gstappbuffer.h>
 #include <gst/app/gstapp-marshal.h>
 #include <gst/app/gstappsink.h>
 #include <gst/app/gstappsrc.h>
diff --git a/tests/check/libs/video.c b/tests/check/libs/video.c
index eedab1c772..54178df886 100644
--- a/tests/check/libs/video.c
+++ b/tests/check/libs/video.c
@@ -606,14 +606,16 @@ GST_START_TEST (test_convert_frame)
   guint8 *data;
 
   from_buffer = gst_buffer_new_and_alloc (640 * 480 * 4);
-  data = GST_BUFFER_DATA (from_buffer);
 
+  data = gst_buffer_map (from_buffer, NULL, NULL, GST_MAP_WRITE);
   for (i = 0; i < 640 * 480; i++) {
     data[4 * i + 0] = 0;        /* x */
     data[4 * i + 1] = 255;      /* R */
     data[4 * i + 2] = 0;        /* G */
     data[4 * i + 3] = 0;        /* B */
   }
+  gst_buffer_unmap (from_buffer, data, 640 * 480 * 4);
+
   from_caps = gst_video_format_new_caps (GST_VIDEO_FORMAT_xRGB,
       640, 480, 25, 1, 1, 1);
   gst_buffer_set_caps (from_buffer, from_caps);
@@ -675,14 +677,16 @@ GST_START_TEST (test_convert_frame_async)
   ConvertFrameContext cf_data = { NULL, NULL, NULL };
 
   from_buffer = gst_buffer_new_and_alloc (640 * 480 * 4);
-  data = GST_BUFFER_DATA (from_buffer);
 
+  data = gst_buffer_map (from_buffer, NULL, NULL, GST_MAP_WRITE);
   for (i = 0; i < 640 * 480; i++) {
     data[4 * i + 0] = 0;        /* x */
     data[4 * i + 1] = 255;      /* R */
     data[4 * i + 2] = 0;        /* G */
     data[4 * i + 3] = 0;        /* B */
   }
+  gst_buffer_unmap (from_buffer, data, 640 * 480 * 4);
+
   from_caps = gst_video_format_new_caps (GST_VIDEO_FORMAT_xRGB,
       640, 480, 25, 1, 1, 1);
   gst_buffer_set_caps (from_buffer, from_caps);
diff --git a/tests/check/pipelines/streamheader.c b/tests/check/pipelines/streamheader.c
index c3872ad251..e32ba33292 100644
--- a/tests/check/pipelines/streamheader.c
+++ b/tests/check/pipelines/streamheader.c
@@ -122,6 +122,11 @@ static int n_in_caps = 0;
 static gboolean
 buffer_probe_cb (GstPad * pad, GstBuffer * buffer)
 {
+  guint8 *data;
+  gsize size;
+
+  data = gst_buffer_map (buffer, &size, NULL, GST_MAP_READ);
+
   if (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_IN_CAPS)) {
     GstCaps *caps;
     GstStructure *s;
@@ -143,22 +148,27 @@ buffer_probe_cb (GstPad * pad, GstBuffer * buffer)
 
     for (i = 0; i < 3; ++i) {
       GValue *val;
+      guint8 *data2;
+      gsize size2;
 
       val = &g_array_index (buffers, GValue, i);
       buf = g_value_peek_pointer (val);
       fail_unless (GST_IS_BUFFER (buf));
-      if (GST_BUFFER_SIZE (buf) == GST_BUFFER_SIZE (buffer)) {
-        if (memcmp (GST_BUFFER_DATA (buf), GST_BUFFER_DATA (buffer),
-                GST_BUFFER_SIZE (buffer)) == 0) {
+
+      data2 = gst_buffer_map (buf, &size2, NULL, GST_MAP_READ);
+      if (size2 == size) {
+        if (memcmp (data2, data, size) == 0) {
           found = TRUE;
         }
       }
+      gst_buffer_unmap (buf, data2, size2);
     }
     fail_unless (found, "Did not find incoming IN_CAPS buffer %p on caps",
         buffer);
 
     gst_caps_unref (caps);
   }
+  gst_buffer_unmap (buffer, data, size);
 
   return TRUE;
 }