From: Benjamin O. <co...@pd...> - 2003-12-27 10:09:40
|
CVS Root: /home/cvs/gstreamer Module: gst-plugins Changes by: company Date: Sat Dec 27 2003 02:10:26 PST Log message: ChangeLog Modified files: testsuite/spider: spider1.c spider2.c spider3.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/testsuite/spider/spider1.c.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/testsuite/spider/spider2.c.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/testsuite/spider/spider3.c.diff?r1=1.2&r2=1.3 ====Begin Diffs==== Index: spider1.c =================================================================== RCS file: /home/cvs/gstreamer/gst-plugins/testsuite/spider/spider1.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- spider1.c 13 Oct 2003 23:29:43 -0000 1.2 +++ spider1.c 27 Dec 2003 10:10:14 -0000 1.3 @@ -12,6 +12,7 @@ GstElement *pipeline; GstElement *sinesrc, *spider, *volume, *fakesink; GstCaps *caps; + gchar *caps_str; GstPad *pad; gst_init (&argc, &argv); @@ -22,7 +23,6 @@ g_assert (pipeline); sinesrc = gst_element_factory_make ("sinesrc", "sinesrc"); g_assert (sinesrc); - gst_element_set (sinesrc, "samplerate", 44100, NULL); spider = gst_element_factory_make ("spider", "spider"); g_assert (spider); volume = gst_element_factory_make ("volume", "volume"); @@ -33,26 +33,22 @@ gst_bin_add_many (GST_BIN (pipeline), sinesrc, spider, volume, fakesink, NULL); /* force standard audio caps on volume ! fakesink */ - caps = gst_caps_new ("stereo", "audio/raw", - gst_props_new ( - "format", GST_PROPS_STRING ("int"), - "law", GST_PROPS_INT (0), - "endianness", GST_PROPS_INT (G_BYTE_ORDER), - "signed", GST_PROPS_BOOLEAN (TRUE), - "width", GST_PROPS_INT (16), - "depth", GST_PROPS_INT (16), - "rate", GST_PROPS_INT (44100), - "channels", GST_PROPS_INT (2), - NULL)); + caps = gst_caps_new_simple ("audio/x-raw-int", + "endianness", G_TYPE_INT, G_BYTE_ORDER, + "signed", G_TYPE_BOOLEAN, TRUE, + "width", G_TYPE_INT, 16, + "depth", G_TYPE_INT, 16, + "rate", G_TYPE_INT, 44100, + "channels", G_TYPE_INT, 2, + NULL); if (!gst_element_link_filtered (volume, fakesink, caps)) g_error ("Could not connect_filtered volume and fakesink"); /* force samplerate on sinesrc ! spider */ - caps = gst_caps_new ("samplerate", "audio/raw", - gst_props_new ( - "rate", GST_PROPS_INT (44100), - NULL)); + caps = gst_caps_new_simple ("audio/x-raw-int", + "rate", G_TYPE_INT, 44100, + NULL); if (!gst_element_link_filtered (sinesrc, spider, caps)) g_error ("Could not connect_filtered sinesrc and spider"); @@ -67,27 +63,30 @@ g_assert (pad); caps = gst_pad_get_caps (pad); g_assert (caps); - g_print ("Dumping caps of sinesrc's src pad\n"); - gst_caps_debug (caps, "sinesrc src pad after filtered connection"); - g_assert (GST_CAPS_IS_FIXED (caps)); + caps_str = gst_caps_to_string (caps); + g_print ("caps of sinesrc's src pad: %s\n", caps_str); + g_free (caps_str); + g_assert (gst_caps_is_fixed (caps)); /* debug volume sink caps, make sure they got fixed */ pad = gst_element_get_pad (volume, "sink"); g_assert (pad); caps = gst_pad_get_caps (pad); g_assert (caps); - g_print ("Dumping caps of volume's sink pad\n"); - gst_caps_debug (caps, "volume sink pad after filtered connection"); - g_assert (GST_CAPS_IS_FIXED (caps)); + caps_str = gst_caps_to_string (caps); + g_print ("caps of volume's sink pad: %s\n", caps_str); + g_free (caps_str); + g_assert (gst_caps_is_fixed (caps)); /* debug volume source caps, make sure they got fixed */ pad = gst_element_get_pad (volume, "src"); g_assert (pad); caps = gst_pad_get_caps (pad); g_assert (caps); - g_print ("Dumping caps of volume's source pad\n"); - gst_caps_debug (caps, "volume source pad after filtered connection"); - g_assert (GST_CAPS_IS_FIXED (caps)); + caps_str = gst_caps_to_string (caps); + g_print ("caps of volume's src pad: %s\n", caps_str); + g_free (caps_str); + g_assert (gst_caps_is_fixed (caps)); g_print ("Setting pipeline to play\n"); Index: spider2.c =================================================================== RCS file: /home/cvs/gstreamer/gst-plugins/testsuite/spider/spider2.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- spider2.c 13 Oct 2003 23:29:43 -0000 1.2 +++ spider2.c 27 Dec 2003 10:10:14 -0000 1.3 @@ -15,6 +15,7 @@ GstElement *pipeline; GstElement *sinesrc, *spider, *volume, *fakesink; GstCaps *caps; + gchar *caps_str; GstPad *pad; gst_init (&argc, &argv); @@ -25,7 +26,6 @@ g_assert (pipeline); sinesrc = gst_element_factory_make ("sinesrc", "sinesrc"); g_assert (sinesrc); - gst_element_set (sinesrc, "samplerate", 44100, NULL); spider = gst_element_factory_make ("spider", "spider"); g_assert (spider); volume = gst_element_factory_make ("volume", "volume"); @@ -36,26 +36,22 @@ gst_bin_add_many (GST_BIN (pipeline), sinesrc, spider, volume, fakesink, NULL); /* force standard audio caps on spider ! volume */ - caps = gst_caps_new ("stereo", "audio/raw", - gst_props_new ( - "format", GST_PROPS_STRING ("int"), - "law", GST_PROPS_INT (0), - "endianness", GST_PROPS_INT (G_BYTE_ORDER), - "signed", GST_PROPS_BOOLEAN (TRUE), - "width", GST_PROPS_INT (16), - "depth", GST_PROPS_INT (16), - "rate", GST_PROPS_INT (44100), - "channels", GST_PROPS_INT (2), - NULL)); + caps = gst_caps_new_simple ("audio/x-raw-int", + "endianness", G_TYPE_INT, G_BYTE_ORDER, + "signed", G_TYPE_BOOLEAN, TRUE, + "width", G_TYPE_INT, 16, + "depth", G_TYPE_INT, 16, + "rate", G_TYPE_INT, 44100, + "channels", G_TYPE_INT, 2, + NULL); if (!gst_element_link_filtered (spider, volume, caps)) g_error ("Could not connect_filtered spider and volume"); /* force samplerate on sinesrc ! spider */ - caps = gst_caps_new ("samplerate", "audio/raw", - gst_props_new ( - "rate", GST_PROPS_INT (44100), - NULL)); + caps = gst_caps_new_simple ("audio/x-raw-int", + "rate", G_TYPE_INT, 44100, + NULL); if (!gst_element_link_filtered (sinesrc, spider, caps)) g_error ("Could not connect_filtered sinesrc and spider"); @@ -70,27 +66,30 @@ g_assert (pad); caps = gst_pad_get_caps (pad); g_assert (caps); - g_print ("Dumping caps of sinesrc's src pad\n"); - gst_caps_debug (caps, "sinesrc src pad after filtered connection"); - g_assert (GST_CAPS_IS_FIXED (caps)); + caps_str = gst_caps_to_string (caps); + g_print ("caps of sinesrc's src pad: %s\n", caps_str); + g_free (caps_str); + g_assert (gst_caps_is_fixed (caps)); /* debug volume sink caps, make sure they got fixed */ pad = gst_element_get_pad (volume, "sink"); g_assert (pad); caps = gst_pad_get_caps (pad); g_assert (caps); - g_print ("Dumping caps of volume's sink pad\n"); - gst_caps_debug (caps, "volume sink pad after filtered connection"); - g_assert (GST_CAPS_IS_FIXED (caps)); + caps_str = gst_caps_to_string (caps); + g_print ("caps of volume's sink pad: %s\n", caps_str); + g_free (caps_str); + g_assert (gst_caps_is_fixed (caps)); /* debug volume source caps, make sure they got fixed */ pad = gst_element_get_pad (volume, "src"); g_assert (pad); caps = gst_pad_get_caps (pad); g_assert (caps); - g_print ("Dumping caps of volume's source pad\n"); - gst_caps_debug (caps, "volume source pad after filtered connection"); - g_assert (GST_CAPS_IS_FIXED (caps)); + caps_str = gst_caps_to_string (caps); + g_print ("caps of volume's src pad: %s\n", caps_str); + g_free (caps_str); + g_assert (gst_caps_is_fixed (caps)); g_print ("Setting pipeline to play\n"); Index: spider3.c =================================================================== RCS file: /home/cvs/gstreamer/gst-plugins/testsuite/spider/spider3.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- spider3.c 13 Oct 2003 23:29:43 -0000 1.2 +++ spider3.c 27 Dec 2003 10:10:14 -0000 1.3 @@ -14,6 +14,7 @@ GstElement *pipeline; GstElement *sinesrc, *lame, *spider, *volume, *fakesink; GstCaps *caps; + gchar *caps_str; GstPad *pad; gst_init (&argc, &argv); @@ -24,7 +25,6 @@ g_assert (pipeline); sinesrc = gst_element_factory_make ("sinesrc", "sinesrc"); g_assert (sinesrc); - gst_element_set (sinesrc, "samplerate", 44100, NULL); lame = gst_element_factory_make ("lame", "lame"); g_assert (lame); spider = gst_element_factory_make ("spider", "spider"); @@ -37,26 +37,22 @@ gst_bin_add_many (GST_BIN (pipeline), sinesrc, lame, spider, volume, fakesink, NULL); /* force standard audio caps on spider ! volume */ - caps = gst_caps_new ("stereo", "audio/raw", - gst_props_new ( - "format", GST_PROPS_STRING ("int"), - "law", GST_PROPS_INT (0), - "endianness", GST_PROPS_INT (G_BYTE_ORDER), - "signed", GST_PROPS_BOOLEAN (TRUE), - "width", GST_PROPS_INT (16), - "depth", GST_PROPS_INT (16), - "rate", GST_PROPS_INT (44100), - "channels", GST_PROPS_INT (2), - NULL)); + caps = gst_caps_new_simple ("audio/x-raw-int", + "endianness", G_TYPE_INT, G_BYTE_ORDER, + "signed", G_TYPE_BOOLEAN, TRUE, + "width", G_TYPE_INT, 16, + "depth", G_TYPE_INT, 16, + "rate", G_TYPE_INT, 44100, + "channels", G_TYPE_INT, 2, + NULL); if (!gst_element_link_filtered (spider, volume, caps)) g_error ("Could not connect_filtered spider and volume"); /* force samplerate on sinesrc ! lame */ - caps = gst_caps_new ("samplerate", "audio/raw", - gst_props_new ( - "rate", GST_PROPS_INT (44100), - NULL)); + caps = gst_caps_new_simple ("audio/x-raw-int", + "rate", G_TYPE_INT, 44100, + NULL); if (!gst_element_link_filtered (sinesrc, lame, caps)) g_error ("Could not connect_filtered sinesrc and lame"); @@ -72,27 +68,30 @@ g_assert (pad); caps = gst_pad_get_caps (pad); g_assert (caps); - g_print ("Dumping caps of sinesrc's src pad\n"); - gst_caps_debug (caps, "sinesrc src pad after filtered connection"); - g_assert (GST_CAPS_IS_FIXED (caps)); + caps_str = gst_caps_to_string (caps); + g_print ("caps of sinesrc's src pad: %s\n", caps_str); + g_free (caps_str); + g_assert (gst_caps_is_fixed (caps)); /* debug volume sink caps, make sure they got fixed */ pad = gst_element_get_pad (volume, "sink"); g_assert (pad); caps = gst_pad_get_caps (pad); g_assert (caps); - g_print ("Dumping caps of volume's sink pad\n"); - gst_caps_debug (caps, "volume sink pad after filtered connection"); - g_assert (GST_CAPS_IS_FIXED (caps)); + caps_str = gst_caps_to_string (caps); + g_print ("caps of volume's sink pad: %s\n", caps_str); + g_free (caps_str); + g_assert (gst_caps_is_fixed (caps)); /* debug volume source caps, make sure they got fixed */ pad = gst_element_get_pad (volume, "src"); g_assert (pad); caps = gst_pad_get_caps (pad); g_assert (caps); - g_print ("Dumping caps of volume's source pad\n"); - gst_caps_debug (caps, "volume source pad after filtered connection"); - g_assert (GST_CAPS_IS_FIXED (caps)); + caps_str = gst_caps_to_string (caps); + g_print ("caps of volume's src pad: %s\n", caps_str); + g_free (caps_str); + g_assert (gst_caps_is_fixed (caps)); g_print ("Setting pipeline to play\n"); |