mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/volume/: Reenable volume element and fix to work with new caps stuff.

Browse source 
Original commit message from CVS:
2003-12-22  Benjamin Otte  <in7y118@public.uni-hamburg.de>

* gst/volume/Makefile.am:
* gst/volume/gstvolume.c: (volume_connect), (volume_parse_caps),
(volume_base_init), (volume_init):
Reenable volume element and fix to work with new caps stuff.
Rhythmbox needs this.
This commit is contained in:
Benjamin Otte 2003-12-22 21:06:03 +00:00
parent e0c2f4470a
commit 00e3d21803
3 changed files with 64 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2003-12-22 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/volume/Makefile.am:
* gst/volume/gstvolume.c: (volume_connect), (volume_parse_caps),
(volume_base_init), (volume_init):
Reenable volume element and fix to work with new caps stuff.
Rhythmbox needs this.
2003-12-22 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/qtdemux/qtdemux.c: (plugin_init):

14
gst/volume/Makefile.am
View file

@ -1,11 +1,9 @@
# disabled, since I want to fix this by subclassing audiofilter
plugin_LTLIBRARIES = libgstvolume.la
#plugin_LTLIBRARIES = libgstvolume.la
libgstvolume_la_SOURCES = gstvolume.c
libgstvolume_la_CFLAGS = $(GST_CFLAGS)
libgstvolume_la_LIBADD = $(GST_LIBS) $(GST_CONTROL_LIBS)
libgstvolume_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
#libgstvolume_la_SOURCES = gstvolume.c
#libgstvolume_la_CFLAGS = $(GST_CFLAGS)
#libgstvolume_la_LIBADD = $(GST_LIBS) $(GST_CONTROL_LIBS)
#libgstvolume_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
#noinst_HEADERS = gstvolume.h filter.func
noinst_HEADERS = gstvolume.h filter.func

86
gst/volume/gstvolume.c
View file

@ -55,20 +55,20 @@ GST_STATIC_PAD_TEMPLATE (
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
gst_caps_new (
"volume_float_sink",
"audio/x-raw-float",
GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS
),
GST_STATIC_CAPS (
"volume_int_sink",
"audio/x-raw-int",
"channels", G_TYPE_INT_RANGE (1, G_MAXINT),
"rate", G_TYPE_INT_RANGE (1, G_MAXINT),
"endianness", G_TYPE_INT (G_BYTE_ORDER),
"width", G_TYPE_INT (16),
"depth", G_TYPE_INT (16),
"signed", G_TYPE_BOOLEAN (TRUE)
"audio/x-raw-float, "
"rate = (int) [ 1, MAX ], "
"channels = (int) [ 1, MAX ], "
"endianness = (int) BYTE_ORDER, "
"width = (int) 32, "
"buffer-frames = (int) [ 1, MAX]; "
"audio/x-raw-int, "
"channels = (int) [ 1, MAX ], "
"rate = (int) [ 1, MAX ], "
"endianness = (int) BYTE_ORDER, "
"width = (int) 16, "
"depth = (int) 16, "
"signed = (bool) TRUE"
)
);
@ -77,20 +77,20 @@ GST_STATIC_PAD_TEMPLATE (
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
gst_caps_new (
"volume_float_src",
"audio/x-raw-float",
GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS
),
GST_STATIC_CAPS (
"volume_int_src",
"audio/x-raw-int",
"channels", G_TYPE_INT_RANGE (1, G_MAXINT),
"rate", G_TYPE_INT_RANGE (1, G_MAXINT),
"endianness", G_TYPE_INT (G_BYTE_ORDER),
"width", G_TYPE_INT (16),
"depth", G_TYPE_INT (16),
"signed", G_TYPE_BOOLEAN (TRUE)
"audio/x-raw-float, "
"rate = (int) [ 1, MAX ], "
"channels = (int) [ 1, MAX ], "
"endianness = (int) BYTE_ORDER, "
"width = (int) 32, "
"buffer-frames = (int) [ 1, MAX]; "
"audio/x-raw-int, "
"channels = (int) [ 1, MAX ], "
"rate = (int) [ 1, MAX ], "
"endianness = (int) BYTE_ORDER, "
"width = (int) 16, "
"depth = (int) 16, "
"signed = (bool) TRUE"
)
);
@ -103,7 +103,7 @@ static void volume_get_property (GObject *object, guint prop_id, GValue *va
static void volume_update_volume (const GValue *value, gpointer data);
static void volume_update_mute (const GValue *value, gpointer data);
static gboolean volume_parse_caps (GstVolume *filter, GstCaps *caps);
static gboolean volume_parse_caps (GstVolume *filter, GstStructure *structure);
static void volume_chain_float (GstPad *pad, GstData *_data);
static void volume_chain_int16 (GstPad *pad, GstData *_data);
@ -112,20 +112,20 @@ static GstElementClass *parent_class = NULL;
/*static guint gst_filter_signals[LAST_SIGNAL] = { 0 }; */
static GstPadLinkReturn
volume_connect (GstPad *pad, GstCaps *caps)
volume_connect (GstPad *pad, const GstCaps *caps)
{
GstVolume *filter;
GstPad *otherpad;
gint rate;
GstPadLinkReturn set_retval;
GstStructure *structure;
filter = GST_VOLUME (gst_pad_get_parent (pad));
g_return_val_if_fail (filter != NULL, GST_PAD_LINK_REFUSED);
g_return_val_if_fail (GST_IS_VOLUME (filter), GST_PAD_LINK_REFUSED);
otherpad = (pad == filter->srcpad ? filter->sinkpad : filter->srcpad);
structure = gst_caps_get_structure (caps, 0);
if (GST_CAPS_IS_FIXED (caps)) {
GstPadLinkReturn set_retval;
if (!volume_parse_caps (filter, caps))
if (!volume_parse_caps (filter, structure))
return GST_PAD_LINK_REFUSED;
if ((set_retval = gst_pad_try_set_caps(otherpad, caps)) > 0)
@ -133,20 +133,18 @@ volume_connect (GstPad *pad, GstCaps *caps)
gst_dpman_set_rate(filter->dpman, rate);
}
return set_retval;
}
return GST_PAD_LINK_DELAYED;
}
static gboolean
volume_parse_caps (GstVolume *filter, GstCaps *caps)
volume_parse_caps (GstVolume *filter, GstStructure *structure)
{
const gchar *mimetype;
g_return_val_if_fail(filter!=NULL,FALSE);
g_return_val_if_fail(caps!=NULL,FALSE);
g_return_val_if_fail(structure!=NULL,FALSE);
mimetype = gst_structure_get_name (structure);
mimetype = gst_structure_get_mime (structure
if (strcmp(mimetype, "audio/x-raw-int")==0) {
gst_pad_set_chain_function(filter->sinkpad,volume_chain_int16);
return TRUE;
@ -186,8 +184,10 @@ volume_base_init (gpointer g_class)
{
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
gst_element_class_add_pad_template (element_class, volume_src_factory ());
gst_element_class_add_pad_template (element_class, volume_sink_factory ());
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&volume_src_factory));
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&volume_sink_factory));
gst_element_class_set_details (element_class, &volume_details);
}
static void
@ -216,9 +216,11 @@ volume_class_init (GstVolumeClass *klass)
static void
volume_init (GstVolume *filter)
{
filter->sinkpad = gst_pad_new_from_template(volume_sink_factory (),"sink");
filter->sinkpad = gst_pad_new_from_template(
gst_static_pad_template_get (&volume_sink_factory),"sink");
gst_pad_set_link_function(filter->sinkpad,volume_connect);
filter->srcpad = gst_pad_new_from_template(volume_src_factory (),"src");
filter->srcpad = gst_pad_new_from_template(
gst_static_pad_template_get (&volume_src_factory),"src");
gst_pad_set_link_function(filter->srcpad,volume_connect);
gst_element_add_pad(GST_ELEMENT(filter),filter->sinkpad);