Merge branch 'master' into 0.11

[platform/upstream/gst-plugins-base.git] / tests / check / elements / adder.c

diff --git a/tests/check/elements/adder.c b/tests/check/elements/adder.c
index fe3432c..0a721d6 100644 (file)
--- a/tests/check/elements/adder.c
+++ b/tests/check/elements/adder.c
@@ -692,7 +692,7 @@ GST_START_TEST (test_remove_pad)
   fail_unless (res == TRUE, NULL);
 
   /* create an unconnected sinkpad in adder */
-  pad = gst_element_get_request_pad (adder, "sink%d");
+  pad = gst_element_get_request_pad (adder, "sink_%u");
   fail_if (pad == NULL, NULL);
 
   srcpad = gst_element_get_static_pad (adder, "src");
@@ -757,6 +757,7 @@ handoff_buffer_cb (GstElement * fakesink, GstBuffer * buffer, GstPad * pad,
 /* check if clipping works as expected */
 GST_START_TEST (test_clip)
 {
+  GstSegment segment;
   GstElement *bin, *adder, *sink;
   GstBus *bus;
   GstPad *sinkpad;
@@ -764,7 +765,7 @@ GST_START_TEST (test_clip)
   GstFlowReturn ret;
   GstEvent *event;
   GstBuffer *buffer;
-  GstCaps *caps;
+//FIXME:  GstCaps *caps;
 
   GST_INFO ("preparing test");
 
@@ -793,26 +794,28 @@ GST_START_TEST (test_clip)
 
   /* create an unconnected sinkpad in adder, should also automatically activate
    * the pad */
-  sinkpad = gst_element_get_request_pad (adder, "sink%d");
+  sinkpad = gst_element_get_request_pad (adder, "sink_%u");
   fail_if (sinkpad == NULL, NULL);
 
   /* send segment to adder */
-  event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME,
-      GST_SECOND, 2 * GST_SECOND, 0);
+  gst_segment_init (&segment, GST_FORMAT_TIME);
+  segment.start = GST_SECOND;
+  segment.stop = 2 * GST_SECOND;
+  segment.time = 0;
+  event = gst_event_new_segment (&segment);
   gst_pad_send_event (sinkpad, event);
 
-  caps = gst_caps_new_simple ("audio/x-raw-int",
+/*FIXME:  caps = gst_caps_new_simple ("audio/x-raw",
+      "format", G_TYPE_STRING, GST_AUDIO_NE (S16),
       "rate", G_TYPE_INT, 44100,
-      "channels", G_TYPE_INT, 2,
-      "endianness", G_TYPE_INT, G_BYTE_ORDER,
-      "width", G_TYPE_INT, 16,
-      "depth", G_TYPE_INT, 16, "signed", G_TYPE_BOOLEAN, TRUE, NULL);
+      "channels", G_TYPE_INT, 2, NULL);
+*/
 
   /* should be clipped and ok */
   buffer = gst_buffer_new_and_alloc (44100);
   GST_BUFFER_TIMESTAMP (buffer) = 0;
   GST_BUFFER_DURATION (buffer) = 250 * GST_MSECOND;
-  gst_buffer_set_caps (buffer, caps);
+//FIXME:  gst_buffer_set_caps (buffer, caps);
   GST_DEBUG ("pushing buffer %p", buffer);
   ret = gst_pad_chain (sinkpad, buffer);
   fail_unless (ret == GST_FLOW_OK);
@@ -822,7 +825,7 @@ GST_START_TEST (test_clip)
   buffer = gst_buffer_new_and_alloc (44100);
   GST_BUFFER_TIMESTAMP (buffer) = 900 * GST_MSECOND;
   GST_BUFFER_DURATION (buffer) = 250 * GST_MSECOND;
-  gst_buffer_set_caps (buffer, caps);
+//FIXME:  gst_buffer_set_caps (buffer, caps);
   GST_DEBUG ("pushing buffer %p", buffer);
   ret = gst_pad_chain (sinkpad, buffer);
   fail_unless (ret == GST_FLOW_OK);
@@ -833,7 +836,7 @@ GST_START_TEST (test_clip)
   buffer = gst_buffer_new_and_alloc (44100);
   GST_BUFFER_TIMESTAMP (buffer) = 1 * GST_SECOND;
   GST_BUFFER_DURATION (buffer) = 250 * GST_MSECOND;
-  gst_buffer_set_caps (buffer, caps);
+//FIXME:  gst_buffer_set_caps (buffer, caps);
   GST_DEBUG ("pushing buffer %p", buffer);
   ret = gst_pad_chain (sinkpad, buffer);
   fail_unless (ret == GST_FLOW_OK);
@@ -844,7 +847,7 @@ GST_START_TEST (test_clip)
   buffer = gst_buffer_new_and_alloc (44100);
   GST_BUFFER_TIMESTAMP (buffer) = 2 * GST_SECOND;
   GST_BUFFER_DURATION (buffer) = 250 * GST_MSECOND;
-  gst_buffer_set_caps (buffer, caps);
+//FIXME:  gst_buffer_set_caps (buffer, caps);
   GST_DEBUG ("pushing buffer %p", buffer);
   ret = gst_pad_chain (sinkpad, buffer);
   fail_unless (ret == GST_FLOW_OK);