From f6830d4ad15f488c6a61ebccf4f09529fdf5ebd3 Mon Sep 17 00:00:00 2001 From: Leif Johnson Date: Sat, 19 Jul 2003 23:25:25 +0000 Subject: [PATCH] + changes for new float caps without slope/intercept + some category changes for plugins Original commit message from CVS: + changes for new float caps without slope/intercept + some category changes for plugins --- ext/hermes/gstcolorspace.c | 2 +- ext/jack/gstjack.c | 8 +++--- ext/jack/gstjack.h | 8 +++--- ext/ladspa/gstladspa.c | 45 +++++++++++++++++----------------- ext/shout/gstshout.c | 2 +- ext/smoothwave/gstsmoothwave.c | 2 +- ext/snapshot/gstsnapshot.c | 2 +- ext/sndfile/gstsf.c | 16 +++--------- gst/smoothwave/gstsmoothwave.c | 2 +- 9 files changed, 39 insertions(+), 48 deletions(-) diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c index 86b3fc6bea..17f9ba74ef 100644 --- a/ext/hermes/gstcolorspace.c +++ b/ext/hermes/gstcolorspace.c @@ -30,7 +30,7 @@ static GstElementDetails colorspace_details = { "Colorspace converter", - "Filter/Video", + "Filter/Convert", "LGPL", "Converts video from one colorspace to another using libhermes", VERSION, diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c index 700cf0aead..6e057f6cd4 100644 --- a/ext/jack/gstjack.c +++ b/ext/jack/gstjack.c @@ -26,7 +26,7 @@ #include /* TODO: - + this element is still nonfunctional - work out the src side (caps setting, etc) @@ -39,7 +39,7 @@ */ /* elementfactory information */ -static GstElementDetails gst_jack_bin_details = { +static GstElementDetails gst_jack_bin_details = { "Jack Bin", "Generic/Bin", "GPL", @@ -171,7 +171,7 @@ gst_jack_src_request_pad_factory(void) GstCaps *caps; caps = gst_caps_new("src", "audio/x-raw-float", - GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS); + GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS); template = gst_pad_template_new("%s", GST_PAD_SRC, GST_PAD_REQUEST, caps, NULL); } @@ -188,7 +188,7 @@ gst_jack_sink_request_pad_factory(void) GstCaps *caps; caps = gst_caps_new ("sink", "audio/x-raw-float", - GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS); + GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS); template = gst_pad_template_new("%s", GST_PAD_SINK, GST_PAD_REQUEST, caps, NULL); } diff --git a/ext/jack/gstjack.h b/ext/jack/gstjack.h index 3bf3f2d4ff..216c305292 100644 --- a/ext/jack/gstjack.h +++ b/ext/jack/gstjack.h @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset: 4 -*- */ /* Copyright (C) 2002 Andy Wingo - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either @@ -85,12 +85,12 @@ struct _GstJack { /* list of GstJackPads */ GList *pads; - + /* for convenience */ GstPadDirection direction; - + gchar *port_name_prefix; - + GstJackBin *bin; }; diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index f4b9684a69..a58358ba33 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "gstladspa.h" #include /* main ladspa sdk include file */ @@ -35,14 +36,10 @@ ladspa_sink_factory (gchar *name) name, GST_PAD_SINK, GST_PAD_ALWAYS, - GST_CAPS_NEW ( + gst_caps_new ( "ladspa_sink", "audio/x-raw-float", - "width", GST_PROPS_INT (32), - "endianness", GST_PROPS_INT (G_BYTE_ORDER), - "rate", GST_PROPS_INT_RANGE (4000, 96000), - "buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT), - "channels", GST_PROPS_INT (1) + GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS ) ); } @@ -55,14 +52,10 @@ ladspa_src_factory (gchar *name) name, GST_PAD_SRC, GST_PAD_ALWAYS, - GST_CAPS_NEW ( + gst_caps_new ( "ladspa_src", "audio/x-raw-float", - "width", GST_PROPS_INT (32), - "endianness", GST_PROPS_INT (G_BYTE_ORDER), - "rate", GST_PROPS_INT_RANGE (4000, 96000), - "buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT), - "channels", GST_PROPS_INT (1) + GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS ) ); } @@ -91,6 +84,13 @@ static GstElementClass *parent_class = NULL; static GstPlugin *ladspa_plugin; static GHashTable *ladspa_descriptors; +enum { + ARG_0, + ARG_SAMPLERATE, + ARG_BUFFERSIZE, + ARG_LAST, +}; + GST_DEBUG_CATEGORY_STATIC (ladspa_debug); #define DEBUG(...) \ GST_CAT_LEVEL_LOG (ladspa_debug, GST_LEVEL_DEBUG, NULL, __VA_ARGS__) @@ -477,25 +477,24 @@ gst_ladspa_force_src_caps(GstLADSPA *ladspa, GstPad *pad) if (!ladspa->buffer_frames) { ladspa->buffer_frames = 256; /* 5 ms at 44100 kHz (just a default...) */ g_return_if_fail (ladspa->bufpool == NULL); - ladspa->bufpool = gst_buffer_pool_get_default (ladspa->buffer_frames * sizeof(gfloat), - 3); + ladspa->bufpool = + gst_buffer_pool_get_default (ladspa->buffer_frames * sizeof(gfloat), 3); } DEBUG_OBJ (ladspa, "forcing caps with rate=%d, buffer-frames=%d", ladspa->samplerate, ladspa->buffer_frames); - gst_pad_try_set_caps (pad, gst_caps_new ( + gst_pad_try_set_caps (pad, + gst_caps_new ( "ladspa_src_caps", "audio/x-raw-float", gst_props_new ( - "width", GST_PROPS_INT (32), - "endianness", GST_PROPS_INT (G_BYTE_ORDER), + "width", GST_PROPS_INT (32), + "endianness", GST_PROPS_INT (G_BYTE_ORDER), + "rate", GST_PROPS_INT (ladspa->samplerate), "buffer-frames", GST_PROPS_INT (ladspa->buffer_frames), - "rate", GST_PROPS_INT (ladspa->samplerate), "channels", GST_PROPS_INT (1), - NULL - ) - )); + NULL))); } static void @@ -504,7 +503,7 @@ gst_ladspa_set_property (GObject *object, guint prop_id, const GValue *value, GP GstLADSPA *ladspa = (GstLADSPA*)object; GstLADSPAClass *oclass; ladspa_control_info *control_info; - + oclass = (GstLADSPAClass*)(G_OBJECT_GET_CLASS (object)); /* remember, properties have an offset of 1 */ @@ -512,7 +511,7 @@ gst_ladspa_set_property (GObject *object, guint prop_id, const GValue *value, GP /* verify it exists */ g_return_if_fail (prop_id < oclass->numcontrols); - + control_info = &(oclass->control_info[prop_id]); g_return_if_fail (control_info->name != NULL); diff --git a/ext/shout/gstshout.c b/ext/shout/gstshout.c index 46908ee337..1badacd54c 100644 --- a/ext/shout/gstshout.c +++ b/ext/shout/gstshout.c @@ -25,7 +25,7 @@ /* elementfactory information */ static GstElementDetails icecastsend_details = { "An Icecast plugin", - "Sink/Network/Icecast", + "Sink/Network", "GPL", "Sends data to an icecast server using libshout", VERSION, diff --git a/ext/smoothwave/gstsmoothwave.c b/ext/smoothwave/gstsmoothwave.c index 6b96dd9eca..a8b8849639 100644 --- a/ext/smoothwave/gstsmoothwave.c +++ b/ext/smoothwave/gstsmoothwave.c @@ -27,7 +27,7 @@ static GstElementDetails gst_smoothwave_details = { "Smooth waveform", - "Sink/Visualization", + "Visualization", "LGPL", "Fading grayscale waveform display", VERSION, diff --git a/ext/snapshot/gstsnapshot.c b/ext/snapshot/gstsnapshot.c index 859d560010..f2669d9f6d 100644 --- a/ext/snapshot/gstsnapshot.c +++ b/ext/snapshot/gstsnapshot.c @@ -31,7 +31,7 @@ /* elementfactory information */ static GstElementDetails snapshot_details = { "snapshot", - "Filter/Effect", + "Filter/Video", "LGPL", "Dump a frame to a png file", VERSION, diff --git a/ext/sndfile/gstsf.c b/ext/sndfile/gstsf.c index ae2cee11b0..3d75087bfc 100644 --- a/ext/sndfile/gstsf.c +++ b/ext/sndfile/gstsf.c @@ -60,14 +60,10 @@ GST_PAD_TEMPLATE_FACTORY (sf_src_factory, "src%d", GST_PAD_SRC, GST_PAD_REQUEST, - GST_CAPS_NEW ( + gst_caps_new ( "sf_src", "audio/x-raw-float", - "rate", GST_PROPS_INT_RANGE (1, G_MAXINT), - "width", GST_PROPS_INT (32), - "endianness", GST_PROPS_INT (G_BYTE_ORDER), - "buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT), - "channels", GST_PROPS_INT (1) + GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS ) ); @@ -75,14 +71,10 @@ GST_PAD_TEMPLATE_FACTORY (sf_sink_factory, "sink%d", GST_PAD_SINK, GST_PAD_REQUEST, - GST_CAPS_NEW ( + gst_caps_new ( "sf_sink", "audio/x-raw-float", - "rate", GST_PROPS_INT_RANGE (1, G_MAXINT), - "width", GST_PROPS_INT (32), - "endianness", GST_PROPS_INT (G_BYTE_ORDER), - "buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT), - "channels", GST_PROPS_INT (1) + GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS ) ); diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c index 6b96dd9eca..a8b8849639 100644 --- a/gst/smoothwave/gstsmoothwave.c +++ b/gst/smoothwave/gstsmoothwave.c @@ -27,7 +27,7 @@ static GstElementDetails gst_smoothwave_details = { "Smooth waveform", - "Sink/Visualization", + "Visualization", "LGPL", "Fading grayscale waveform display", VERSION,