diff options
| author | Leif Johnson <leif@ambient.2y.net> | 2003-07-19 23:47:42 +0000 |
|---|---|---|
| committer | Leif Johnson <leif@ambient.2y.net> | 2003-07-19 23:47:42 +0000 |
| commit | abe6f76b9fa11caab8fd19060723c3c9e2574748 (patch) | |
| tree | 6bf5fe600c2b6fb4d9a77fa20f641134951d1d05 /tests | |
| parent | 8c0b28395b9543ed127364edc1e19360c517140c (diff) | |
| download | gstreamer-plugins-base-abe6f76b9fa11caab8fd19060723c3c9e2574748.tar.gz | |
+ the last of the float caps changes ... these are a bit more pervasive
Original commit message from CVS:
+ the last of the float caps changes ... these are a bit more pervasive
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/old/testsuite/alsa/formats.c | 6 | ||||
| -rw-r--r-- | tests/old/testsuite/alsa/sinesrc.c | 26 |
2 files changed, 5 insertions, 27 deletions
diff --git a/tests/old/testsuite/alsa/formats.c b/tests/old/testsuite/alsa/formats.c index 93ed4e295..1a2bc0b82 100644 --- a/tests/old/testsuite/alsa/formats.c +++ b/tests/old/testsuite/alsa/formats.c @@ -124,11 +124,7 @@ create_pipeline (void) default: g_assert_not_reached (); } - g_print ("Setting format to: format: \"float\"\n" - " layout: \"%s\"\n" - " intercept: 0\n" - " slope: 1\n", - sinesrc->width == 32 ? "gfloat" : "gdouble"); + g_print ("Setting format to float width %d\n", sinesrc->width); } else if (last < NUMBER_OF_INT_TESTS + NUMBER_OF_FLOAT_TESTS + NUMBER_OF_LAW_TESTS) { gint temp = last - NUMBER_OF_INT_TESTS - NUMBER_OF_FLOAT_TESTS; GstElement *law; diff --git a/tests/old/testsuite/alsa/sinesrc.c b/tests/old/testsuite/alsa/sinesrc.c index 7e2cf3a01..26199fa3d 100644 --- a/tests/old/testsuite/alsa/sinesrc.c +++ b/tests/old/testsuite/alsa/sinesrc.c @@ -31,7 +31,6 @@ GST_PAD_TEMPLATE_FACTORY (sinesrc_src_factory, GST_CAPS_NEW ( "sinesrc_int_src", "audio/raw", - "format", GST_PROPS_STRING ("int"), "law", GST_PROPS_INT (0), "endianness", GST_PROPS_LIST (GST_PROPS_INT (G_LITTLE_ENDIAN), GST_PROPS_INT (G_BIG_ENDIAN)), "signed", GST_PROPS_LIST (GST_PROPS_BOOLEAN (FALSE), GST_PROPS_BOOLEAN (TRUE)), @@ -43,12 +42,8 @@ GST_PAD_TEMPLATE_FACTORY (sinesrc_src_factory, GST_CAPS_NEW ( "sinesrc_float_src", "audio/raw", - "format", GST_PROPS_STRING ("float"), - "layout", GST_PROPS_LIST (GST_PROPS_STRING ("gfloat"), GST_PROPS_STRING ("gdouble")), - "intercept", GST_PROPS_FLOAT (0), - "slope", GST_PROPS_FLOAT (1), "channels", GST_PROPS_INT_RANGE (1, 16) - ) + ) ); static GstElementClass *parent_class = NULL; @@ -123,10 +118,8 @@ sinesrc_force_caps (SineSrc *src) { caps = GST_CAPS_NEW ( "sinesrc_src_caps", "audio/raw", - "format", GST_PROPS_STRING ("int"), "law", GST_PROPS_INT (0), "signed", GST_PROPS_BOOLEAN (src->sign), - "width", GST_PROPS_INT (src->width), "depth", GST_PROPS_INT (src->depth) ); if (src->width > 8) @@ -139,26 +132,15 @@ sinesrc_force_caps (SineSrc *src) { caps = GST_CAPS_NEW ( "sinesrc_src_caps", "audio/raw", - "format", GST_PROPS_STRING ("float"), - "intercept", GST_PROPS_FLOAT (0), - "slope", GST_PROPS_FLOAT (1) + "endianness", GST_PROPS_INT(src->endianness) ); - if (src->width == 32) { - gst_props_add_entry (gst_caps_get_props (caps), - gst_props_entry_new ("layout", - GST_PROPS_STRING ("gfloat"))); - } else if (src->width == 64) { - gst_props_add_entry (gst_caps_get_props (caps), - gst_props_entry_new ("layout", - GST_PROPS_STRING ("gdouble"))); - } else { - g_assert_not_reached (); - } break; default: g_assert_not_reached(); } gst_props_add_entry (gst_caps_get_props (caps), + gst_props_entry_new ("width", GST_PROPS_INT (src->width))); + gst_props_add_entry (gst_caps_get_props (caps), gst_props_entry_new ("rate", GST_PROPS_INT (src->rate))); gst_props_add_entry (gst_caps_get_props (caps), gst_props_entry_new ("channels", GST_PROPS_INT (src->channels))); |