diff options
| -rw-r--r-- | ChangeLog | 30 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | docs/plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-good-plugins-docs.sgml | 3 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-good-plugins-sections.txt | 16 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-good-plugins.hierarchy | 2 | ||||
| -rw-r--r-- | ext/Makefile.am | 8 | ||||
| -rw-r--r-- | ext/hal/Makefile.am | 17 | ||||
| -rw-r--r-- | ext/hal/gsthalaudiosink.c | 254 | ||||
| -rw-r--r-- | ext/hal/gsthalaudiosink.h | 58 | ||||
| -rw-r--r-- | ext/hal/gsthalaudiosrc.c | 255 | ||||
| -rw-r--r-- | ext/hal/gsthalaudiosrc.h | 52 | ||||
| -rw-r--r-- | ext/hal/gsthalelements.c | 54 | ||||
| -rw-r--r-- | ext/hal/gsthalelements.h | 29 | ||||
| -rw-r--r-- | ext/hal/hal.c | 168 | ||||
| -rw-r--r-- | ext/hal/hal.h | 44 |
16 files changed, 1001 insertions, 0 deletions
@@ -1,5 +1,35 @@ 2006-02-15 Wim Taymans <wim@fluendo.com> + * configure.ac: + * docs/plugins/Makefile.am: + * docs/plugins/gst-plugins-good-plugins-docs.sgml: + * docs/plugins/gst-plugins-good-plugins-sections.txt: + * docs/plugins/gst-plugins-good-plugins.hierarchy: + * ext/Makefile.am: + * ext/hal/Makefile.am: + * ext/hal/gsthalaudiosink.c: (gst_hal_audio_sink_base_init), + (gst_hal_audio_sink_class_init), (gst_hal_audio_sink_reset), + (gst_hal_audio_sink_init), (gst_hal_audio_sink_dispose), + (do_toggle_element), (gst_hal_audio_sink_set_property), + (gst_hal_audio_sink_get_property), + (gst_hal_audio_sink_change_state): + * ext/hal/gsthalaudiosink.h: + * ext/hal/gsthalaudiosrc.c: (gst_hal_audio_src_base_init), + (gst_hal_audio_src_class_init), (gst_hal_audio_src_reset), + (gst_hal_audio_src_init), (gst_hal_audio_src_dispose), + (do_toggle_element), (gst_hal_audio_src_set_property), + (gst_hal_audio_src_get_property), (gst_hal_audio_src_change_state): + * ext/hal/gsthalaudiosrc.h: + * ext/hal/gsthalelements.c: (plugin_init): + * ext/hal/gsthalelements.h: + * ext/hal/hal.c: (gst_hal_get_string), + (gst_hal_render_bin_from_udi), (gst_hal_get_audio_sink), + (gst_hal_get_audio_src): + * ext/hal/hal.h: + Add HAL sound device wrapper plugins. Closes #329106 + +2006-02-15 Wim Taymans <wim@fluendo.com> + * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_event): Add comment in a fultile attempt to stop the copy-and-paste paradigm leading to duplication of bad code. diff --git a/configure.ac b/configure.ac index 3f067466..d540e4de 100644 --- a/configure.ac +++ b/configure.ac @@ -385,6 +385,14 @@ GST_CHECK_FEATURE(GCONF, [GConf libraries], , [ AC_SUBST(GCONF_LIBS) ]) +dnl *** HAL *** +translit(dnm, m, l) AM_CONDITIONAL(USE_HAL, true) +GST_CHECK_FEATURE(HAL, [HAL libraries], , [ + PKG_CHECK_MODULES(HAL, [hal >= 0.5.6, dbus-1 >= 0.32], HAVE_HAL="yes", HAVE_HAL="no") + AC_SUBST(HAL_CFLAGS) + AC_SUBST(HAL_LIBS) +]) + dnl *** jpeg *** dnl FIXME: we could use header checks here as well IMO translit(dnm, m, l) AM_CONDITIONAL(USE_JPEG, true) @@ -616,6 +624,7 @@ ext/dv/Makefile ext/esd/Makefile ext/flac/Makefile ext/gconf/Makefile +ext/hal/Makefile ext/ladspa/Makefile ext/libcaca/Makefile ext/libpng/Makefile diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 4317fed3..d25bee1a 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -83,6 +83,8 @@ EXTRA_HFILES = \ $(top_srcdir)/ext/cairo/gsttimeoverlay.h \ $(top_srcdir)/ext/cdio/gstcdiocddasrc.h \ $(top_srcdir)/ext/flac/gstflacdec.h \ + $(top_srcdir)/ext/hal/gsthalaudiosink.h \ + $(top_srcdir)/ext/hal/gsthalaudiosrc.h \ $(top_srcdir)/gst/multipart/multipartmux.c \ $(top_srcdir)/gst/multipart/multipartdemux.c \ $(top_srcdir)/gst/udp/gstmultiudpsink.h \ diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml index ae25019a..f12d2eea 100644 --- a/docs/plugins/gst-plugins-good-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml @@ -19,6 +19,8 @@ <xi:include href="xml/element-cdiocddasrc.xml" /> <xi:include href="xml/element-flacdec.xml" /> <xi:include href="xml/element-goom.xml" /> + <xi:include href="xml/element-halaudiosink.xml" /> + <xi:include href="xml/element-halaudiosrc.xml" /> <xi:include href="xml/element-id3demux.xml" /> <xi:include href="xml/element-level.xml" /> <xi:include href="xml/element-multiudpsink.xml" /> @@ -51,6 +53,7 @@ <xi:include href="xml/plugin-flxdec.xml" /> <xi:include href="xml/plugin-gconfelements.xml" /> <xi:include href="xml/plugin-goom.xml" /> + <xi:include href="xml/plugin-halelements.xml" /> <xi:include href="xml/plugin-id3demux.xml" /> <xi:include href="xml/plugin-jpeg.xml" /> <xi:include href="xml/plugin-level.xml" /> diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index 6ded2430..e7807c49 100644 --- a/docs/plugins/gst-plugins-good-plugins-sections.txt +++ b/docs/plugins/gst-plugins-good-plugins-sections.txt @@ -55,6 +55,22 @@ GstGoomClass </SECTION> <SECTION> +<FILE>element-halaudiosink</FILE> +GstHalAudioSink +<TITLE>halaudiosink</TITLE> +<SUBSECTION Standard> +GstHalAudioSinkClass +</SECTION> + +<SECTION> +<FILE>element-halaudiosrc</FILE> +GstHalAudioSrc +<TITLE>halaudiosrc</TITLE> +<SUBSECTION Standard> +GstHalAudioSrcClass +</SECTION> + +<SECTION> <FILE>element-id3demux</FILE> GstID3Demux <TITLE>id3demux</TITLE> diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy index 4baea48f..742f160c 100644 --- a/docs/plugins/gst-plugins-good-plugins.hierarchy +++ b/docs/plugins/gst-plugins-good-plugins.hierarchy @@ -12,6 +12,8 @@ GObject GstGConfAudioSink GstAutoVideoSink GstAutoAudioSink + GstHalAudioSink + GstHalAudioSrc GstSpeexEnc GstSpeexDec GstBaseSink diff --git a/ext/Makefile.am b/ext/Makefile.am index cdc854f6..438c8d7f 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -40,6 +40,12 @@ endif GDK_PIXBUF_DIR = # endif +if USE_HAL +HAL_DIR = hal +else +HAL_DIR = +endif + if USE_JPEG JPEG_DIR = jpeg else @@ -109,6 +115,7 @@ SUBDIRS = \ $(FLAC_DIR) \ $(GCONF_DIR) \ $(GDK_PIXBUF_DIR) \ + $(HAL_DIR) \ $(JPEG_DIR) \ $(LADSPA_DIR) \ $(LIBCACA_DIR) \ @@ -127,6 +134,7 @@ DIST_SUBDIRS = \ esd \ flac \ gconf \ + hal \ jpeg \ ladspa \ libcaca \ diff --git a/ext/hal/Makefile.am b/ext/hal/Makefile.am new file mode 100644 index 00000000..6585936d --- /dev/null +++ b/ext/hal/Makefile.am @@ -0,0 +1,17 @@ +plugin_LTLIBRARIES = libgsthalelements.la + +libgsthalelements_la_SOURCES = \ + gsthalaudiosink.c \ + gsthalaudiosrc.c \ + gsthalelements.c \ + hal.c + +libgsthalelements_la_CFLAGS = $(GST_CFLAGS) $(HAL_CFLAGS) +libgsthalelements_la_LIBADD = $(GST_LIBS) $(HAL_LIBS) +libgsthalelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + +noinst_HEADERS = \ + gsthalaudiosink.h \ + gsthalaudiosrc.h \ + gsthalelements.h \ + hal.h diff --git a/ext/hal/gsthalaudiosink.c b/ext/hal/gsthalaudiosink.c new file mode 100644 index 00000000..e1e5ae74 --- /dev/null +++ b/ext/hal/gsthalaudiosink.c @@ -0,0 +1,254 @@ +/* GStreamer + * (c) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * (c) 2006 Jürg Billeter <j@bitron.ch> + * + * 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 + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/** + * SECTION:element-halaudiosink + * + * <refsect2> + * <para> + * HalAudioSink allows access to output of sound devices by specifying the + * corresponding persistent Unique Device Id (UDI) from the Hardware Abstraction + * Layer (HAL) in the <link linkend="GstHalAudioSrc--udi">udi</link> property. + * It currently always embeds alsasink as HAL doesn't support other sound + * systems yet. + * </para> + * <title>Examples</title> + * <para> + * To list the UDIs of all your ALSA output devices : + * <programlisting> + * hal-find-by-property --key alsa.type --string playback + * </programlisting> + * Here is a pipeline to test your sound output : + * <programlisting> + * gst-launch -v audiotestsrc ! halaudiosink udi=/org/freedesktop/Hal/devices/pci_8086_27d8_alsa_playback_0 + * </programlisting> + * This pipeline produces a test signal on the specified sound device. + * </para> + * </refsect2> + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "gsthalelements.h" +#include "gsthalaudiosink.h" + +static void gst_hal_audio_sink_dispose (GObject * object); +static GstStateChangeReturn +gst_hal_audio_sink_change_state (GstElement * element, + GstStateChange transition); + +enum +{ + PROP_0, + PROP_UDI +}; + +GST_BOILERPLATE (GstHalAudioSink, gst_hal_audio_sink, GstBin, GST_TYPE_BIN); + +static void gst_hal_audio_sink_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec); +static void gst_hal_audio_sink_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec); + +static void +gst_hal_audio_sink_base_init (gpointer klass) +{ + GstElementClass *eklass = GST_ELEMENT_CLASS (klass); + GstElementDetails gst_hal_audio_sink_details = { + "HAL audio sink", + "Sink/Audio", + "Audio sink for sound device access via HAL", + "Jürg Billeter <j@bitron.ch>" + }; + GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS_ANY); + + gst_element_class_add_pad_template (eklass, + gst_static_pad_template_get (&sink_template)); + gst_element_class_set_details (eklass, &gst_hal_audio_sink_details); +} + +static void +gst_hal_audio_sink_class_init (GstHalAudioSinkClass * klass) +{ + GObjectClass *oklass = G_OBJECT_CLASS (klass); + GstElementClass *eklass = GST_ELEMENT_CLASS (klass); + + oklass->set_property = gst_hal_audio_sink_set_property; + oklass->get_property = gst_hal_audio_sink_get_property; + oklass->dispose = gst_hal_audio_sink_dispose; + eklass->change_state = gst_hal_audio_sink_change_state; + + g_object_class_install_property (oklass, PROP_UDI, + g_param_spec_string ("udi", + "UDI", "Unique Device Id", NULL, G_PARAM_READWRITE)); +} + +/* + * Hack to make negotiation work. + */ + +static void +gst_hal_audio_sink_reset (GstHalAudioSink * sink) +{ + GstPad *targetpad; + + /* fakesink */ + if (sink->kid) { + gst_element_set_state (sink->kid, GST_STATE_NULL); + gst_bin_remove (GST_BIN (sink), sink->kid); + } + sink->kid = gst_element_factory_make ("fakesink", "testsink"); + gst_bin_add (GST_BIN (sink), sink->kid); + + targetpad = gst_element_get_pad (sink->kid, "sink"); + gst_ghost_pad_set_target (GST_GHOST_PAD (sink->pad), targetpad); + gst_object_unref (targetpad); +} + +static void +gst_hal_audio_sink_init (GstHalAudioSink * sink, GstHalAudioSinkClass * g_class) +{ + sink->pad = gst_ghost_pad_new_no_target ("sink", GST_PAD_SINK); + gst_element_add_pad (GST_ELEMENT (sink), sink->pad); + + gst_hal_audio_sink_reset (sink); +} + +static void +gst_hal_audio_sink_dispose (GObject * object) +{ + GstHalAudioSink *sink = GST_HAL_AUDIO_SINK (object); + + if (sink->udi) { + g_free (sink->udi); + sink->udi = NULL; + } + + GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object)); +} + +static gboolean +do_toggle_element (GstHalAudioSink * sink) +{ + GstPad *targetpad; + + /* kill old element */ + if (sink->kid) { + GST_DEBUG_OBJECT (sink, "Removing old kid"); + gst_element_set_state (sink->kid, GST_STATE_NULL); + gst_bin_remove (GST_BIN (sink), sink->kid); + sink->kid = NULL; + } + + GST_DEBUG_OBJECT (sink, "Creating new kid"); + if (!(sink->kid = gst_hal_get_audio_sink (sink->udi))) { + GST_ELEMENT_ERROR (sink, LIBRARY, SETTINGS, (NULL), + ("Failed to render audio sink from Hal")); + return FALSE; + } + gst_element_set_state (sink->kid, GST_STATE (sink)); + gst_bin_add (GST_BIN (sink), sink->kid); + + /* re-attach ghostpad */ + GST_DEBUG_OBJECT (sink, "Creating new ghostpad"); + targetpad = gst_element_get_pad (sink->kid, "sink"); + gst_ghost_pad_set_target (GST_GHOST_PAD (sink->pad), targetpad); + gst_object_unref (targetpad); + GST_DEBUG_OBJECT (sink, "done changing hal audio sink"); + + return TRUE; +} + +static void +gst_hal_audio_sink_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) +{ + GstHalAudioSink *this = GST_HAL_AUDIO_SINK (object); + + GST_OBJECT_LOCK (this); + + switch (prop_id) { + case PROP_UDI: + if (this->udi) + g_free (this->udi); + this->udi = g_value_dup_string (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } + + GST_OBJECT_UNLOCK (this); +} + +static void +gst_hal_audio_sink_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec) +{ + GstHalAudioSink *this = GST_HAL_AUDIO_SINK (object); + + GST_OBJECT_LOCK (this); + + switch (prop_id) { + case PROP_UDI: + g_value_set_string (value, this->udi); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } + + GST_OBJECT_UNLOCK (this); +} + +static GstStateChangeReturn +gst_hal_audio_sink_change_state (GstElement * element, + GstStateChange transition) +{ + GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS; + GstHalAudioSink *sink = GST_HAL_AUDIO_SINK (element); + + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: + if (!do_toggle_element (sink)) + return GST_STATE_CHANGE_FAILURE; + break; + default: + break; + } + + ret = GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state, + (element, transition), GST_STATE_CHANGE_SUCCESS); + + switch (transition) { + case GST_STATE_CHANGE_READY_TO_NULL: + gst_hal_audio_sink_reset (sink); + break; + default: + break; + } + + return ret; +} diff --git a/ext/hal/gsthalaudiosink.h b/ext/hal/gsthalaudiosink.h new file mode 100644 index 00000000..d93e717e --- /dev/null +++ b/ext/hal/gsthalaudiosink.h @@ -0,0 +1,58 @@ +/* GStreamer + * (c) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * (c) 2006 Jürg Billeter <j@bitron.ch> + * + * 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 + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_HAL_AUDIO_SINK_H__ +#define __GST_HAL_AUDIO_SINK_H__ + +#include <gst/gst.h> + +G_BEGIN_DECLS + +#define GST_TYPE_HAL_AUDIO_SINK \ + (gst_hal_audio_sink_get_type ()) +#define GST_HAL_AUDIO_SINK(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_HAL_AUDIO_SINK, \ + GstHalAudioSink)) +#define GST_HAL_AUDIO_SINK_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_HAL_AUDIO_SINK, \ + GstHalAudioSink)) +#define GST_IS_HAL_AUDIO_SINK(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_HAL_AUDIO_SINK)) +#define GST_IS_HAL_AUDIO_SINK_CLASS(obj) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_HAL_AUDIO_SINK)) + +typedef struct _GstHalAudioSink { + GstBin parent; + + /* explicit pointers to stuff used */ + gchar *udi; + GstElement *kid; + GstPad *pad; +} GstHalAudioSink; + +typedef struct _GstHalAudioSinkClass { + GstBinClass parent_class; +} GstHalAudioSinkClass; + +GType gst_hal_audio_sink_get_type (void); + +G_END_DECLS + +#endif /* __GST_HAL_AUDIO_SINK_H__ */ diff --git a/ext/hal/gsthalaudiosrc.c b/ext/hal/gsthalaudiosrc.c new file mode 100644 index 00000000..6c2401aa --- /dev/null +++ b/ext/hal/gsthalaudiosrc.c @@ -0,0 +1,255 @@ +/* GStreamer + * (c) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * (c) 2005 Tim-Philipp Müller <tim centricular net> + * (c) 2006 Jürg Billeter <j@bitron.ch> + * + * 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 + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/** + * SECTION:element-halaudiosrc + * + * <refsect2> + * <para> + * HalAudioSrc allows access to input of sound devices by specifying the + * corresponding persistent Unique Device Id (UDI) from the Hardware Abstraction + * Layer (HAL) in the <link linkend="GstHalAudioSrc--udi">udi</link> property. + * It currently always embeds alsasrc as HAL doesn't support other sound systems + * yet. + * </para> + * <title>Examples</title> + * <para> + * To list the UDIs of all your ALSA input devices : + * <programlisting> + * hal-find-by-property --key alsa.type --string capture + * </programlisting> + * Here is a pipeline to test your sound input : + * <programlisting> + * gst-launch -v halaudiosrc udi=/org/freedesktop/Hal/devices/pci_8086_27d8_alsa_capture_0 ! autoaudiosink + * </programlisting> + * You should now hear yourself with a small delay if you have a microphone + * connected to the specified sound device. + * </para> + * </refsect2> + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "gsthalelements.h" +#include "gsthalaudiosrc.h" + +static void gst_hal_audio_src_dispose (GObject * object); +static GstStateChangeReturn +gst_hal_audio_src_change_state (GstElement * element, + GstStateChange transition); + +enum +{ + PROP_0, + PROP_UDI +}; + +GST_BOILERPLATE (GstHalAudioSrc, gst_hal_audio_src, GstBin, GST_TYPE_BIN); + +static void gst_hal_audio_src_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec); +static void gst_hal_audio_src_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec); + +static void +gst_hal_audio_src_base_init (gpointer klass) +{ + GstElementClass *eklass = GST_ELEMENT_CLASS (klass); + GstElementDetails gst_hal_audio_src_details = { + "HAL audio source", + "Source/Audio", + "Audio source for sound device access via HAL", + "Jürg Billeter <j@bitron.ch>" + }; + GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS_ANY); + + gst_element_class_add_pad_template (eklass, + gst_static_pad_template_get (&src_template)); + gst_element_class_set_details (eklass, &gst_hal_audio_src_details); +} + +static void +gst_hal_audio_src_class_init (GstHalAudioSrcClass * klass) +{ + GObjectClass *oklass = G_OBJECT_CLASS (klass); + GstElementClass *eklass = GST_ELEMENT_CLASS (klass); + + oklass->set_property = gst_hal_audio_src_set_property; + oklass->get_property = gst_hal_audio_src_get_property; + oklass->dispose = gst_hal_audio_src_dispose; + eklass->change_state = gst_hal_audio_src_change_state; + + g_object_class_install_property (oklass, PROP_UDI, + g_param_spec_string ("udi", + "UDI", "Unique Device Id", NULL, G_PARAM_READWRITE)); +} + +/* + * Hack to make negotiation work. + */ + +static void +gst_hal_audio_src_reset (GstHalAudioSrc * src) +{ + GstPad *targetpad; + + /* fakesrc */ + if (src->kid) { + gst_element_set_state (src->kid, GST_STATE_NULL); + gst_bin_remove (GST_BIN (src), src->kid); + } + src->kid = gst_element_factory_make ("fakesrc", "testsrc"); + gst_bin_add (GST_BIN (src), src->kid); + + targetpad = gst_element_get_pad (src->kid, "src"); + gst_ghost_pad_set_target (GST_GHOST_PAD (src->pad), targetpad); + gst_object_unref (targetpad); +} + +static void +gst_hal_audio_src_init (GstHalAudioSrc * src, GstHalAudioSrcClass * g_class) +{ + src->pad = gst_ghost_pad_new_no_target ("src", GST_PAD_SRC); + gst_element_add_pad (GST_ELEMENT (src), src->pad); + + gst_hal_audio_src_reset (src); +} + +static void +gst_hal_audio_src_dispose (GObject * object) +{ + GstHalAudioSrc *src = GST_HAL_AUDIO_SRC (object); + + if (src->udi) { + g_free (src->udi); + src->udi = NULL; + } + + GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object)); +} + +static gboolean +do_toggle_element (GstHalAudioSrc * src) +{ + GstPad *targetpad; + + /* kill old element */ + if (src->kid) { + GST_DEBUG_OBJECT (src, "Removing old kid"); + gst_element_set_state (src->kid, GST_STATE_NULL); + gst_bin_remove (GST_BIN (src), src->kid); + src->kid = NULL; + } + + GST_DEBUG_OBJECT (src, "Creating new kid"); + if (!(src->kid = gst_hal_get_audio_src (src->udi))) { + GST_ELEMENT_ERROR (src, LIBRARY, SETTINGS, (NULL), + ("Failed to render audio source from Hal")); + return FALSE; + } + gst_element_set_state (src->kid, GST_STATE (src)); + gst_bin_add (GST_BIN (src), src->kid); + + /* re-attach ghostpad */ + GST_DEBUG_OBJECT (src, "Creating new ghostpad"); + targetpad = gst_element_get_pad (src->kid, "src"); + gst_ghost_pad_set_target (GST_GHOST_PAD (src->pad), targetpad); + gst_object_unref (targetpad); + GST_DEBUG_OBJECT (src, "done changing hal audio source"); + + return TRUE; +} + +static void +gst_hal_audio_src_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) +{ + GstHalAudioSrc *this = GST_HAL_AUDIO_SRC (object); + + GST_OBJECT_LOCK (this); + + switch (prop_id) { + case PROP_UDI: + if (this->udi) + g_free (this->udi); + this->udi = g_value_dup_string (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } + + GST_OBJECT_UNLOCK (this); +} + +static void +gst_hal_audio_src_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec) +{ + GstHalAudioSrc *this = GST_HAL_AUDIO_SRC (object); + + GST_OBJECT_LOCK (this); + + switch (prop_id) { + case PROP_UDI: + g_value_set_string (value, this->udi); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } + + GST_OBJECT_UNLOCK (this); +} + +static GstStateChangeReturn +gst_hal_audio_src_change_state (GstElement * element, GstStateChange transition) +{ + GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS; + GstHalAudioSrc *src = GST_HAL_AUDIO_SRC (element); + + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: + if (!do_toggle_element (src)) + return GST_STATE_CHANGE_FAILURE; + break; + default: + break; + } + + ret = GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state, + (element, transition), GST_STATE_CHANGE_SUCCESS); + + switch (transition) { + case GST_STATE_CHANGE_READY_TO_NULL: + gst_hal_audio_src_reset (src); + break; + default: + break; + } + + return ret; +} diff --git a/ext/hal/gsthalaudiosrc.h b/ext/hal/gsthalaudiosrc.h new file mode 100644 index 00000000..c407b3cb --- /dev/null +++ b/ext/hal/gsthalaudiosrc.h @@ -0,0 +1,52 @@ +/* GStreamer + * (c) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * (c) 2005 Tim-Philipp Müller <tim centricular net> + * (c) 2006 Jürg Billeter <j@bitron.ch> + * + * 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 + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_HAL_AUDIO_SRC_H__ +#define __GST_HAL_AUDIO_SRC_H__ + +#include <gst/gst.h> + +G_BEGIN_DECLS + +#define GST_TYPE_HAL_AUDIO_SRC (gst_hal_audio_src_get_type ()) +#define GST_HAL_AUDIO_SRC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_HAL_AUDIO_SRC, GstHalAudioSrc)) +#define GST_HAL_AUDIO_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_HAL_AUDIO_SRC, GstHalAudioSrc)) +#define GST_IS_HAL_AUDIO_SRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_HAL_AUDIO_SRC)) +#define GST_IS_HAL_AUDIO_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_HAL_AUDIO_SRC)) + +typedef struct _GstHalAudioSrc { + GstBin parent; + + /* explicit pointers to stuff used */ + gchar *udi; + GstElement *kid; + GstPad *pad; +} GstHalAudioSrc; + +typedef struct _GstHalAudioSrcClass { + GstBinClass parent_class; +} GstHalAudioSrcClass; + +GType gst_hal_audio_src_get_type (void); + +G_END_DECLS + +#endif /* __GST_HAL_AUDIO_SRC_H__ */ diff --git a/ext/hal/gsthalelements.c b/ext/hal/gsthalelements.c new file mode 100644 index 00000000..dd5122aa --- /dev/null +++ b/ext/hal/gsthalelements.c @@ -0,0 +1,54 @@ +/* GStreamer + * (c) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * (c) 2006 Jürg Billeter <j@bitron.ch> + * + * 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 + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <gst/gst.h> + +#include "gsthalelements.h" + +#include "gsthalaudiosink.h" +#include "gsthalaudiosrc.h" + +GST_DEBUG_CATEGORY (hal_debug); + +static gboolean +plugin_init (GstPlugin * plugin) +{ + GST_DEBUG_CATEGORY_INIT (hal_debug, "hal", 0, + "HAL/GStreamer audio input/output wrapper elements"); + + if (!gst_element_register (plugin, "halaudiosink", + GST_RANK_NONE, GST_TYPE_HAL_AUDIO_SINK) || + !gst_element_register (plugin, "halaudiosrc", + GST_RANK_NONE, GST_TYPE_HAL_AUDIO_SRC)) { + return FALSE; + } + + return TRUE; +} + +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "halelements", + "elements wrapping the GStreamer/HAL audio input/output devices", + plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/hal/gsthalelements.h b/ext/hal/gsthalelements.h new file mode 100644 index 00000000..6a9462ff --- /dev/null +++ b/ext/hal/gsthalelements.h @@ -0,0 +1,29 @@ +/* GStreamer + * (c) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * (c) 2006 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * + * 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 + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_HAL_ELEMENTS_H__ +#define __GST_HAL_ELEMENTS_H__ + +#include <hal.h> + +GST_DEBUG_CATEGORY_EXTERN (hal_debug); +#define GST_CAT_DEFAULT hal_debug + +#endif /* __GST_HAL_ELEMENTS_H__ */ diff --git a/ext/hal/hal.c b/ext/hal/hal.c new file mode 100644 index 00000000..9b55f6d6 --- /dev/null +++ b/ext/hal/hal.c @@ -0,0 +1,168 @@ +/* GStreamer + * Copyright (C) <2002> Thomas Vander Stichele <thomas@apestaart.org> + * Copyright (C) <2006> Jürg Billeter <j@bitron.ch> + * + * 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 + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * this library handles interaction with Hal + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <string.h> +#include <glib.h> +#include "hal.h" + + +/* external functions */ + +/** + * gst_hal_get_string: + * @key: a #gchar corresponding to the key you want to get. + * + * Get Hal UDI @udi's string value. + * + * Returns: a newly allocated #gchar string containing the appropriate pipeline + * for UDI @udi, or NULL in the case of an error.. + */ +gchar * +gst_hal_get_string (const gchar * udi) +{ + DBusConnection *connection; + DBusError error; + LibHalContext *ctx; + char *type, *string; + char *element; + int card, device; + + dbus_error_init (&error); + + connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error); + g_return_val_if_fail (connection != NULL, NULL); + + ctx = libhal_ctx_new (); + g_return_val_if_fail (ctx != NULL, NULL); + + libhal_ctx_set_dbus_connection (ctx, connection); + libhal_ctx_init (ctx, &error); + + string = NULL; + + if (libhal_device_query_capability (ctx, udi, "alsa", &error)) { + type = libhal_device_get_property_string (ctx, udi, "alsa.type", &error); + if (strcmp (type, "playback") == 0) { + element = "alsasink"; + } else if (strcmp (type, "capture") == 0) { + element = "alsasrc"; + } else { + element = NULL; + } + card = libhal_device_get_property_int (ctx, udi, "alsa.card", &error); + device = libhal_device_get_property_int (ctx, udi, "alsa.device", &error); + if (device == 0) { + /* handle default device specially to use + * dmix, dsnoop, and softvol if appropriate */ + string = g_strdup_printf ("%s device=default:%d", element, card); + } else { + string = + g_strdup_printf ("%s device=plughw:%d,%d", element, card, device); + } + } + + libhal_ctx_shutdown (ctx, &error); + libhal_ctx_free (ctx); + + dbus_error_free (&error); + + return string; +} + +/** + * gst_hal_render_bin_from_udi: + * @key: a #gchar string corresponding to a Hal UDI. + * + * Render bin from Hal UDI @udi. + * + * Returns: a #GstElement containing the rendered bin. + */ +GstElement * +gst_hal_render_bin_from_udi (const gchar * udi) +{ + GstElement *bin = NULL; + gchar *value; + + value = gst_hal_get_string (udi); + if (value) + bin = gst_parse_bin_from_description (value, TRUE, NULL); + g_free (value); + return bin; +} + +/** + * gst_hal_get_audio_sink: + * + * Render audio output bin from GStreamer Hal UDI. + * If no device with the specified UDI exists, the default audio sink for the + * platform is used (typically osssink or sunaudiosink). + * + * Returns: a #GstElement containing the audio output bin, or NULL if + * everything failed. + */ +GstElement * +gst_hal_get_audio_sink (const gchar * udi) +{ + GstElement *ret = gst_hal_render_bin_from_udi (udi); + + if (!ret) { + ret = gst_element_factory_make (DEFAULT_AUDIOSINK, NULL); + + if (!ret) + g_warning ("No Hal default audio sink key and %s doesn't work", + DEFAULT_AUDIOSINK); + } + + return ret; +} + +/** + * gst_hal_get_audio_src: + * + * Render audio acquisition bin from GStreamer Hal UDI. + * If no device with the specified UDI exists, the default audio source for the + * plaform is used (typically osssrc or sunaudiosrc). + * + * Returns: a #GstElement containing the audio source bin, or NULL if + * everything failed. + */ +GstElement * +gst_hal_get_audio_src (const gchar * udi) +{ + GstElement *ret = gst_hal_render_bin_from_udi (udi); + + if (!ret) { + ret = gst_element_factory_make (DEFAULT_AUDIOSRC, NULL); + + if (!ret) + g_warning ("No Hal default audio src key and %s doesn't work", + DEFAULT_AUDIOSRC); + } + + return ret; +} diff --git a/ext/hal/hal.h b/ext/hal/hal.h new file mode 100644 index 00000000..194d1ce6 --- /dev/null +++ b/ext/hal/hal.h @@ -0,0 +1,44 @@ +/* GStreamer + * Copyright (C) <2002> Thomas Vander Stichele <thomas@apestaart.org> + * Copyright (C) <2006> Jürg Billeter <j@bitron.ch> + * + * 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 + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef GST_HAL_H +#define GST_HAL_H + +/* + * this library handles interaction with Hal + */ + +#include <gst/gst.h> +#include <dbus/dbus.h> +#include <libhal.h> + +G_BEGIN_DECLS + +gchar * gst_hal_get_string (const gchar *udi); + +GstElement * gst_hal_render_bin_from_udi (const gchar *udi); +GstElement * gst_hal_render_bin_from_description (const gchar *description); + +GstElement * gst_hal_get_audio_sink (const gchar *udi); +GstElement * gst_hal_get_audio_src (const gchar *udi); + +G_END_DECLS + +#endif /* GST_HAL_H */ |