tests: fix more caps
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 8 Mar 2012 10:32:27 +0000 (11:32 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 8 Mar 2012 10:32:27 +0000 (11:32 +0100)
tests/check/elements/autovideoconvert.c
tests/check/elements/camerabin2.c
tests/check/elements/opus.c

index 78c8a57bf19d8ea6ff07b441c3cc519e4c5177d0..609c730abac697cacf92c0136a2a255b6afb1df8 100644 (file)
@@ -101,7 +101,7 @@ GST_START_TEST (test_autovideoconvert_rbg2bayer)
 
   pipeline =
       g_strdup_printf
-      ("videotestsrc num-buffers=1 ! video/x-raw,format=ARGB,depth=32,width=100,height=100,framerate=10/1 ! autovideoconvert ! video/x-raw-bayer,width=100,height=100,format=bggr,framerate=10/1 ! fakesink");
+      ("videotestsrc num-buffers=1 ! video/x-raw,format=ARGB,depth=32,width=100,height=100,framerate=10/1 ! autovideoconvert ! video/x-bayer,width=100,height=100,format=bggr,framerate=10/1 ! fakesink");
 
   run_test (pipeline);
   g_free (pipeline);
index 7d9513f958aac5cc7c0ee8ab78af16fe6a0bd477..d8bea462c7f761f9d52f2b8e2505781306aa7fec 100644 (file)
@@ -39,8 +39,8 @@
 #define CAPTURE_COUNT 3
 #define VIDEO_DURATION 5
 
-#define VIDEO_PAD_SUPPORTED_CAPS "video/x-raw, format=rgb, width=600, height=480"
-#define IMAGE_PAD_SUPPORTED_CAPS "video/x-raw, format=rgb, width=800, height=600"
+#define VIDEO_PAD_SUPPORTED_CAPS "video/x-raw, format=RGB, width=600, height=480"
+#define IMAGE_PAD_SUPPORTED_CAPS "video/x-raw, format=RGB, width=800, height=600"
 
 /* custom test camera src element */
 #define GST_TYPE_TEST_CAMERA_SRC \
@@ -390,10 +390,10 @@ setup_wrappercamerabinsrc_videotestsrc (void)
   testsrc = gst_element_factory_make ("videotestsrc", NULL);
   audiosrc = gst_element_factory_make ("audiotestsrc", NULL);
 
-  preview_caps = gst_caps_new_simple ("video/x-raw-rgb", "width", G_TYPE_INT,
+  preview_caps = gst_caps_new_simple ("video/x-raw", "width", G_TYPE_INT,
       320, "height", G_TYPE_INT, 240, NULL);
 
-  g_object_set (G_OBJECT (testsrc), "is-live", TRUE, "peer-alloc", FALSE, NULL);
+  g_object_set (G_OBJECT (testsrc), "is-live", TRUE, NULL);
   g_object_set (G_OBJECT (audiosrc), "is-live", TRUE, NULL);
   g_object_set (G_OBJECT (src), "video-source", testsrc, NULL);
   g_object_set (G_OBJECT (camera), "camera-source", src, "preview-caps",
@@ -739,7 +739,7 @@ GST_START_TEST (test_multiple_image_captures)
     GstMessage *msg;
     GstCaps *caps;
 
-    caps = gst_caps_new_simple ("video/x-raw-rgb", "width", G_TYPE_INT,
+    caps = gst_caps_new_simple ("video/x-raw", "width", G_TYPE_INT,
         widths[i], "height", G_TYPE_INT, heights[i], NULL);
 
     g_object_set (camera, "image-capture-caps", caps, NULL);
@@ -845,7 +845,7 @@ GST_START_TEST (test_multiple_video_recordings)
     GstMessage *msg;
     GstCaps *caps;
 
-    caps = gst_caps_new_simple ("video/x-raw-rgb", "width", G_TYPE_INT,
+    caps = gst_caps_new_simple ("video/x-raw", "width", G_TYPE_INT,
         widths[i], "height", G_TYPE_INT, heights[i], "framerate",
         GST_TYPE_FRACTION, fr[i], 1, NULL);
 
@@ -982,7 +982,7 @@ GST_START_TEST (test_image_capture_previews)
     GstMessage *msg;
     GstCaps *caps;
 
-    caps = gst_caps_new_simple ("video/x-raw-rgb", "width", G_TYPE_INT,
+    caps = gst_caps_new_simple ("video/x-raw", "width", G_TYPE_INT,
         widths[i], "height", G_TYPE_INT, heights[i], NULL);
 
     g_object_set (camera, "preview-caps", caps, NULL);
@@ -1474,7 +1474,7 @@ GST_START_TEST (test_image_location_switching)
 
   /* set still image mode */
   g_object_set (camera, "mode", 1, NULL);
-  caps = gst_caps_new_simple ("video/x-raw-rgb", "width", G_TYPE_INT,
+  caps = gst_caps_new_simple ("video/x-raw", "width", G_TYPE_INT,
       800, "height", G_TYPE_INT, 600, NULL);
   g_object_set (camera, "image-capture-caps", caps, NULL);
   gst_caps_unref (caps);
index d18f6230fe244b9c4480c822ac22247bfba2d520..282589c257fa1d940c66ab0e42f3e9260b7277c0 100644 (file)
@@ -228,8 +228,7 @@ GST_START_TEST (test_opus_encode_samples)
   ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
 
   caps =
-      gst_caps_from_string
-      ("audio/x-raw-int,rate=48000,channels=1,signed=true,width=16,depth=16,endianness=1234");
+      gst_caps_from_string ("audio/x-raw,format=S16LE,rate=48000,channels=1");
   fail_unless (caps != NULL);
   gst_buffer_set_caps (inbuffer, caps);
   gst_caps_unref (caps);
@@ -301,8 +300,7 @@ GST_START_TEST (test_opus_encode_properties)
       "could not set to playing");
 
   caps =
-      gst_caps_from_string
-      ("audio/x-raw-int,rate=48000,channels=1,signed=true,width=16,depth=16,endianness=1234");
+      gst_caps_from_string ("audio/x-raw,format=S16LE,rate=48000,channels=1");
   fail_unless (caps != NULL);
 
   for (step = 0; step < steps; ++step) {