diff options
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | ext/Makefile.am | 10 | ||||
| -rw-r--r-- | ext/ivorbis/Makefile.am | 9 | ||||
| -rw-r--r-- | ext/ivorbis/vorbis.c | 148 | ||||
| -rw-r--r-- | ext/ivorbis/vorbisenc.h | 101 | ||||
| -rw-r--r-- | ext/ivorbis/vorbisfile.c | 1078 | ||||
| -rw-r--r-- | ext/mas/Makefile.in | 4 |
7 files changed, 1364 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 4ae65d84..6e8231c7 100644 --- a/configure.ac +++ b/configure.ac @@ -601,6 +601,22 @@ GST_CHECK_FEATURE(HTTP, [http plug-ins], gsthttpsrc, [ AC_SUBST(GST_HTTPSRC_GET_TYPE) ]) +dnl *** ivorbis *** +dnl AM_PATH_IVORBIS only takes two options +translit(dnm, m, l) AM_CONDITIONAL(USE_IVORBIS, true) +GST_CHECK_FEATURE(IVORBIS, [integer vorbis plug-in], ivorbisdec, [ + XIPH_PATH_IVORBIS(HAVE_IVORBIS=yes, HAVE_IVORBIS=no) + AS_SCRUB_INCLUDE(IVORBIS_CFLAGS) +]) + +dnl *** ivorbis *** +dnl AM_PATH_IVORBIS only takes two options +translit(dnm, m, l) AM_CONDITIONAL(USE_IVORBIS, true) +GST_CHECK_FEATURE(IVORBIS, [integer vorbis plug-in], ivorbisdec, [ + XIPH_PATH_IVORBIS(HAVE_IVORBIS=yes, HAVE_IVORBIS=no) + AS_SCRUB_INCLUDE(IVORBIS_CFLAGS) +]) + dnl *** Jack *** translit(dnm, m, l) AM_CONDITIONAL(USE_JACK, true) GST_CHECK_FEATURE(JACK, Jack, jack, [ @@ -1098,6 +1114,7 @@ ext/gnomevfs/Makefile ext/gsm/Makefile ext/hermes/Makefile ext/http/Makefile +ext/ivorbis/Makefile ext/jack/Makefile ext/jpeg/Makefile ext/ladspa/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 0d107fc5..6816c7de 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -238,6 +238,12 @@ else TARKIN_DIR= endif +if USE_IVORBIS +IVORBIS_DIR=ivorbis +else +IVORBIS_DIR= +endif + if USE_VORBIS VORBIS_DIR=vorbis else @@ -268,7 +274,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \ $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ $(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \ - $(VORBIS_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR) + $(IVORBIS_DIR) $(VORBIS_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR) DIST_SUBDIRS=\ a52dec aalib alsa \ @@ -276,7 +282,7 @@ DIST_SUBDIRS=\ audiofile cdparanoia dv \ dvdread dvdnav esd mas ffmpeg \ flac gnomevfs gsm \ - hermes http jack jpeg \ + hermes http ivorbis jack jpeg \ ladspa lame lcs libfame libpng \ mad mikmod mjpegtools mpeg2dec \ openquicktime raw1394 rtp \ diff --git a/ext/ivorbis/Makefile.am b/ext/ivorbis/Makefile.am new file mode 100644 index 00000000..456a5926 --- /dev/null +++ b/ext/ivorbis/Makefile.am @@ -0,0 +1,9 @@ +plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ + +plugin_LTLIBRARIES = libgstivorbis.la + +libgstivorbis_la_SOURCES = vorbis.c vorbisfile.c +libgstivorbis_la_CFLAGS = $(GST_CFLAGS) $(IVORBIS_CFLAGS) +libgstivorbis_la_LIBADD = $(IVORBIS_LIBS) $(IVORBISFILE_LIBS) +libgstivorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + diff --git a/ext/ivorbis/vorbis.c b/ext/ivorbis/vorbis.c new file mode 100644 index 00000000..5ac26297 --- /dev/null +++ b/ext/ivorbis/vorbis.c @@ -0,0 +1,148 @@ +/* GStreamer + * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * + * 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. + */ + +#include <string.h> +#include <gst/gst.h> +#include <tremor/ivorbiscodec.h> +#include <tremor/ivorbisfile.h> +#include <gst/bytestream/bytestream.h> + +extern GType vorbisfile_get_type(void); + +extern GstElementDetails vorbisfile_details; +extern GstElementDetails vorbisenc_details; + +static GstCaps* vorbis_type_find (GstBuffer *buf, gpointer private); + +GstPadTemplate *gst_vorbisdec_src_template, *gst_vorbisdec_sink_template; + +static GstCaps* +vorbis_caps_factory (void) +{ + return + gst_caps_new ( + "tremor_tremor", + "application/x-ogg", + NULL); +} + +static GstCaps* +raw_caps_factory (void) +{ + return + gst_caps_new ( + "tremor_raw", + "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_RANGE (11025, 48000), + "channels", GST_PROPS_INT_RANGE (1, 2), + NULL)); +} + +static GstCaps* +raw_caps2_factory (void) +{ + return + gst_caps_new ( + "tremor_raw_float", + "audio/raw", + gst_props_new ( + "format", GST_PROPS_STRING ("float"), + "layout", GST_PROPS_STRING ("IEEE"), + "rate", GST_PROPS_INT_RANGE (11025, 48000), + "channels", GST_PROPS_INT (2), + NULL)); +} + +static GstTypeDefinition vorbisdefinition = { + "tremor_audio/x-ogg", + "application/x-ogg", + ".ogg", + vorbis_type_find, +}; + +static GstCaps* +vorbis_type_find (GstBuffer *buf, gpointer private) +{ + gulong head = GULONG_FROM_BE (*((gulong *)GST_BUFFER_DATA (buf))); + + if (head != 0x4F676753) + return NULL; + + return gst_caps_new ("vorbis_type_find", "application/x-ogg", NULL); +} + + +static gboolean +plugin_init (GModule *module, GstPlugin *plugin) +{ + GstElementFactory *enc, *file; + GstTypeFactory *type; + GstCaps *raw_caps, *vorbis_caps, *raw_caps2; + + gst_plugin_set_longname (plugin, "The OGG Vorbis Codec"); + + raw_caps = raw_caps_factory (); + raw_caps2 = raw_caps2_factory (); + vorbis_caps = vorbis_caps_factory (); + + /* register sink pads */ + gst_vorbisdec_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK, + GST_PAD_ALWAYS, + vorbis_caps, NULL); + raw_caps = gst_caps_prepend (raw_caps, raw_caps2); + /* register src pads */ + gst_vorbisdec_src_template = gst_pad_template_new ("src", GST_PAD_SRC, + GST_PAD_ALWAYS, + raw_caps, NULL); + /* create an elementfactory for the vorbisfile element */ + file = gst_element_factory_new ("ivorbisfile", vorbisfile_get_type(), + &vorbisfile_details); + g_return_val_if_fail(file != NULL, FALSE); + gst_element_factory_set_rank (file, GST_ELEMENT_RANK_PRIMARY); + + /* register sink pads */ + gst_element_factory_add_pad_template (file, gst_vorbisdec_sink_template); + /* register src pads */ + gst_element_factory_add_pad_template (file, gst_vorbisdec_src_template); + + gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (file)); + + /* this filter needs the bytestream package */ + if (!gst_library_load ("gstbytestream")) + return FALSE; + + type = gst_type_factory_new (&vorbisdefinition); + gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type)); + + return TRUE; +} + +GstPluginDesc plugin_desc = { + GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "tremor", + plugin_init +}; diff --git a/ext/ivorbis/vorbisenc.h b/ext/ivorbis/vorbisenc.h new file mode 100644 index 00000000..7170baac --- /dev/null +++ b/ext/ivorbis/vorbisenc.h @@ -0,0 +1,101 @@ +/* GStreamer + * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * + * 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 __VORBISENC_H__ +#define __VORBISENC_H__ + + +#include <config.h> +#include <gst/gst.h> + +#include <tremor/codec.h> + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#define GST_TYPE_VORBISENC \ + (vorbisenc_get_type()) +#define GST_VORBISENC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc)) +#define GST_VORBISENC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass)) +#define GST_IS_VORBISENC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC)) +#define GST_IS_VORBISENC_CLASS(obj) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC)) + +typedef struct _VorbisEnc VorbisEnc; +typedef struct _VorbisEncClass VorbisEncClass; + +struct _VorbisEnc { + GstElement element; + + GstPad *sinkpad, + *srcpad; + + ogg_stream_state os; /* take physical pages, weld into a logical + stream of packets */ + ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ + ogg_packet op; /* one raw packet of data for decode */ + + vorbis_info vi; /* struct that stores all the static vorbis bitstream + settings */ + vorbis_comment vc; /* struct that stores all the user comments */ + + vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ + vorbis_block vb; /* local working space for packet->PCM decode */ + + gboolean eos; + + gboolean managed; + gint bitrate; + gint min_bitrate; + gint max_bitrate; + gfloat quality; + gboolean quality_set; + gint serial; + + gint channels; + gint frequency; + + guint64 samples_in; + guint64 bytes_out; + + GstCaps *metadata; + + gboolean setup; + gboolean flush_header; + gchar *last_message; +}; + +struct _VorbisEncClass { + GstElementClass parent_class; +}; + +GType vorbisenc_get_type(void); + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + +#endif /* __VORBISENC_H__ */ diff --git a/ext/ivorbis/vorbisfile.c b/ext/ivorbis/vorbisfile.c new file mode 100644 index 00000000..d3aa599e --- /dev/null +++ b/ext/ivorbis/vorbisfile.c @@ -0,0 +1,1078 @@ +/* GStreamer + * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * + * 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. + */ + +#include <string.h> +#include <gst/gst.h> +#include <tremor/ivorbiscodec.h> +#include <tremor/ivorbisfile.h> +#include <gst/bytestream/bytestream.h> + +#define GST_TYPE_VORBISFILE \ + (vorbisfile_get_type()) +#define GST_VORBISFILE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISFILE,VorbisFile)) +#define GST_VORBISFILE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISFILE,VorbisFileClass)) +#define GST_IS_VORBISFILE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISFILE)) +#define GST_IS_VORBISFILE_CLASS(obj) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISFILE)) + +typedef struct _VorbisFile VorbisFile; +typedef struct _VorbisFileClass VorbisFileClass; + +struct _VorbisFile { + GstElement element; + + GstPad *sinkpad,*srcpad; + GstByteStream *bs; + + OggVorbis_File vf; + gint current_link; + + gboolean restart; + gboolean need_discont; + gboolean eos; + gboolean seek_pending; + gint64 seek_value; + GstFormat seek_format; + gboolean seek_accurate; + + gboolean may_eos; + guint64 total_bytes; + guint64 offset; + + GstCaps *metadata; + GstCaps *streaminfo; +}; + +struct _VorbisFileClass { + GstElementClass parent_class; + +}; + +GType vorbisfile_get_type (void); + +extern GstPadTemplate *gst_vorbisdec_src_template, *gst_vorbisdec_sink_template; + +/* elementfactory information */ +GstElementDetails vorbisfile_details = +{ + "Ogg Vorbis decoder", + "Codec/Audio/Decoder", + "GPL", + "Decodes OGG Vorbis audio using the vorbisfile API", + VERSION, + "Monty <monty@xiph.org>, " + "Wim Taymans <wim.taymans@chello.be>", + "(C) 2000", +}; + +/* VorbisFile signals and args */ +enum +{ + LAST_SIGNAL +}; + +enum +{ + ARG_0, + ARG_METADATA, + ARG_STREAMINFO +}; + +static void + gst_vorbisfile_class_init (VorbisFileClass *klass); +static void gst_vorbisfile_init (VorbisFile *vorbisfile); + +static GstElementStateReturn + gst_vorbisfile_change_state (GstElement *element); + +static const +GstFormat* gst_vorbisfile_get_formats (GstPad *pad); +static gboolean gst_vorbisfile_src_convert (GstPad *pad, + GstFormat src_format, + gint64 src_value, + GstFormat *dest_format, + gint64 *dest_value); +static gboolean gst_vorbisfile_sink_convert (GstPad *pad, + GstFormat src_format, + gint64 src_value, + GstFormat *dest_format, + gint64 *dest_value); +static const GstPadQueryType* + gst_vorbisfile_get_query_types (GstPad *pad); + +static gboolean gst_vorbisfile_src_query (GstPad *pad, + GstPadQueryType type, + GstFormat *format, + gint64 *value); +static const +GstEventMask* gst_vorbisfile_get_event_masks (GstPad *pad); +static gboolean gst_vorbisfile_src_event (GstPad *pad, GstEvent *event); + +static void gst_vorbisfile_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void gst_vorbisfile_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); + +static void gst_vorbisfile_loop (GstElement *element); + +static GstElementClass *parent_class = NULL; +//static guint gst_vorbisfile_signals[LAST_SIGNAL] = { 0 }; + +static GstFormat logical_stream_format; + +GType +vorbisfile_get_type (void) +{ + static GType vorbisfile_type = 0; + + if (!vorbisfile_type) { + static const GTypeInfo vorbisfile_info = { + sizeof (VorbisFileClass), NULL, NULL, + (GClassInitFunc) gst_vorbisfile_class_init, NULL, NULL, + sizeof (VorbisFile), 0, + (GInstanceInitFunc) gst_vorbisfile_init, + }; + + vorbisfile_type = g_type_register_static (GST_TYPE_ELEMENT, "VorbisFile", + &vorbisfile_info, 0); + + logical_stream_format = gst_format_register ("logical_stream", "The logical stream"); + } + return vorbisfile_type; +} + +static void +gst_vorbisfile_class_init (VorbisFileClass * klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + + gobject_class = (GObjectClass*) klass; + gstelement_class = (GstElementClass *) klass; + + parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + + g_object_class_install_property (gobject_class, ARG_METADATA, + g_param_spec_boxed ("metadata", "Metadata", "(logical) Stream metadata", + GST_TYPE_CAPS, G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, ARG_STREAMINFO, + g_param_spec_boxed ("streaminfo", "stream", "(logical) Stream information", + GST_TYPE_CAPS, G_PARAM_READABLE)); + + gobject_class->get_property = gst_vorbisfile_get_property; + gobject_class->set_property = gst_vorbisfile_set_property; + + gstelement_class->change_state = gst_vorbisfile_change_state; +} + +static void +gst_vorbisfile_init (VorbisFile * vorbisfile) +{ + vorbisfile->sinkpad = gst_pad_new_from_template (gst_vorbisdec_sink_template, + "sink"); + gst_element_add_pad (GST_ELEMENT (vorbisfile), vorbisfile->sinkpad); + gst_pad_set_formats_function (vorbisfile->sinkpad, gst_vorbisfile_get_formats); + gst_pad_set_convert_function (vorbisfile->sinkpad, gst_vorbisfile_sink_convert); + + gst_element_set_loop_function (GST_ELEMENT (vorbisfile), gst_vorbisfile_loop); + vorbisfile->srcpad = gst_pad_new_from_template (gst_vorbisdec_src_template, + "src"); + gst_element_add_pad (GST_ELEMENT (vorbisfile), vorbisfile->srcpad); + gst_pad_set_formats_function (vorbisfile->srcpad, gst_vorbisfile_get_formats); + gst_pad_set_query_type_function (vorbisfile->srcpad, + gst_vorbisfile_get_query_types); + gst_pad_set_query_function (vorbisfile->srcpad, gst_vorbisfile_src_query); + gst_pad_set_event_mask_function (vorbisfile->srcpad, + gst_vorbisfile_get_event_masks); + gst_pad_set_event_function (vorbisfile->srcpad, gst_vorbisfile_src_event); + gst_pad_set_convert_function (vorbisfile->srcpad, gst_vorbisfile_src_convert); + + vorbisfile->total_bytes = 0; + vorbisfile->offset = 0; + vorbisfile->seek_pending = 0; + vorbisfile->need_discont = FALSE; + vorbisfile->metadata = NULL; + vorbisfile->streaminfo = NULL; + vorbisfile->current_link = -1; +} + +/* the next four functions are the ov callbacks we provide to vorbisfile + * which interface between GStreamer's handling of the data flow and + * vorbis's needs */ +static size_t +gst_vorbisfile_read (void *ptr, size_t size, size_t nmemb, void *datasource) +{ + guint32 got_bytes = 0; + guint8 *data; + size_t read_size = size * nmemb; + + VorbisFile *vorbisfile = GST_VORBISFILE (datasource); + + GST_DEBUG (0, "read %d", read_size); + + /* make sure we don't go to EOS */ + if (!vorbisfile->may_eos && vorbisfile->total_bytes && + vorbisfile->offset + read_size > vorbisfile->total_bytes) + { + read_size = vorbisfile->total_bytes - vorbisfile->offset; + } + + if (read_size == 0 || vorbisfile->eos) + return 0; + + while (got_bytes == 0) { + got_bytes = gst_bytestream_peek_bytes (vorbisfile->bs, &data, read_size); + if (got_bytes < read_size) { + GstEvent *event; + guint32 avail; + + gst_bytestream_get_status (vorbisfile->bs, &avail, &event); + + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_EOS: + GST_DEBUG (0, "eos"); + vorbisfile->eos = TRUE; + if (avail == 0) { + gst_event_unref (event); + return 0; + } + break; + case GST_EVENT_DISCONTINUOUS: + GST_DEBUG (0, "discont"); + vorbisfile->need_discont = TRUE; + default: + break; + } + gst_event_unref (event); + if (avail > 0) + got_bytes = gst_bytestream_peek_bytes (vorbisfile->bs, &data, avail); + else + got_bytes = 0; + } + } + + memcpy (ptr, data, got_bytes); + gst_bytestream_flush_fast (vorbisfile->bs, got_bytes); + + vorbisfile->offset += got_bytes; + + return got_bytes / size; +} + +static int +gst_vorbisfile_seek (void *datasource, int64_t offset, int whence) +{ + VorbisFile *vorbisfile = GST_VORBISFILE (datasource); + GstSeekType method; + guint64 pending_offset = vorbisfile->offset; + gboolean need_total = FALSE; + + + if (!vorbisfile->vf.seekable) { + return -1; + } + + GST_DEBUG (0, "seek %lld %d", offset, whence); + + if (whence == SEEK_SET) { + method = GST_SEEK_METHOD_SET; + pending_offset = offset; + } + else if (whence == SEEK_CUR) { + method = GST_SEEK_METHOD_CUR; + pending_offset += offset; + } + else if (whence == SEEK_END) { + method = GST_SEEK_METHOD_END; + need_total = TRUE; + pending_offset = vorbisfile->total_bytes - offset; + } + else + return -1; + + if (!gst_bytestream_seek (vorbisfile->bs, offset, method)) + return -1; + + vorbisfile->offset = pending_offset; + if (need_total) + vorbisfile->total_bytes = gst_bytestream_tell (vorbisfile->bs) + offset; + + return 0; +} + +static int +gst_vorbisfile_close (void *datasource) +{ + GST_DEBUG (0, "close"); + return 0; +} + +static long +gst_vorbisfile_tell (void *datasource) +{ + VorbisFile *vorbisfile = GST_VORBISFILE (datasource); + long result; + + result = gst_bytestream_tell (vorbisfile->bs); + + GST_DEBUG (0, "tell %ld", result); + + return result; +} + +ov_callbacks vorbisfile_ov_callbacks = +{ + gst_vorbisfile_read, + gst_vorbisfile_seek, + gst_vorbisfile_close, + gst_vorbisfile_tell, +}; + +/* retrieve the comment field (or tags) and put in metadata GstCaps + * returns TRUE if caps could be set, + * FALSE if they couldn't be read somehow */ +static gboolean +gst_vorbisfile_update_metadata (VorbisFile *vorbisfile, gint link) +{ + OggVorbis_File *vf = &vorbisfile->vf; + gchar **ptr; + vorbis_comment *vc; + GstProps *props = NULL; + GstPropsEntry *entry; + gchar *name, *value; + + /* clear old one */ + if (vorbisfile->metadata) { + gst_caps_unref (vorbisfile->metadata); + vorbisfile->metadata = NULL; + } + + /* create props to hold the key/value pairs */ + props = gst_props_empty_new (); + + vc = ov_comment (vf, link); + ptr = vc->user_comments; + while (*ptr) { + value = strstr (*ptr, "="); + if (value) { + name = g_strndup (*ptr, value-*ptr); + entry = gst_props_entry_new (name, GST_PROPS_STRING_TYPE, value+1); + gst_props_add_entry (props, (GstPropsEntry *) entry); + } + ptr++; + } + vorbisfile->metadata = gst_caps_new ("vorbisfile_metadata", + "application/x-gst-metadata", + props); + + g_object_notify (G_OBJECT (vorbisfile), "metadata"); + + return TRUE; +} + +/* retrieve logical stream properties and put them in streaminfo GstCaps + * returns TRUE if caps could be set, + * FALSE if they couldn't be read somehow */ +static gboolean +gst_vorbisfile_update_streaminfo (VorbisFile *vorbisfile, gint link) +{ + OggVorbis_File *vf = &vorbisfile->vf; + vorbis_info *vi; + GstProps *props = NULL; + GstPropsEntry *entry; + + /* clear old one */ + if (vorbisfile->streaminfo) { + gst_caps_unref (vorbisfile->streaminfo); + vorbisfile->streaminfo = NULL; + } + + /* create props to hold the key/value pairs */ + props = gst_props_empty_new (); + + vi = ov_info (vf, link); + entry = gst_props_entry_new ("version", GST_PROPS_INT_TYPE, vi->version); + gst_props_add_entry (props, (GstPropsEntry *) entry); + entry = gst_props_entry_new ("bitrate_upper", GST_PROPS_INT_TYPE, + vi->bitrate_upper); + gst_props_add_entry (props, (GstPropsEntry *) entry); + entry = gst_props_entry_new ("bitrate_nominal", GST_PROPS_INT_TYPE, + vi->bitrate_nominal); + gst_props_add_entry (props, (GstPropsEntry *) entry); + entry = gst_props_entry_new ("bitrate_lower", GST_PROPS_INT_TYPE, + vi->bitrate_lower); + gst_props_add_entry (props, (GstPropsEntry *) entry); + entry = gst_props_entry_new ("serial", GST_PROPS_INT_TYPE, + ov_serialnumber (vf, link)); + gst_props_add_entry (props, (GstPropsEntry *) entry); + entry = gst_props_entry_new ("bitrate", GST_PROPS_INT_TYPE, + ov_bitrate (vf, link)); + gst_props_add_entry (props, (GstPropsEntry *) entry); + + vorbisfile->streaminfo = gst_caps_new ("vorbisfile_streaminfo", + "application/x-gst-streaminfo", + props); + + g_object_notify (G_OBJECT (vorbisfile), "streaminfo"); + + return TRUE; +} + +static gboolean +gst_vorbisfile_new_link (VorbisFile *vorbisfile, gint link) +{ + vorbis_info *vi = ov_info (&vorbisfile->vf, link); + + /* new logical bitstream */ + vorbisfile->current_link = link; + + gst_vorbisfile_update_metadata (vorbisfile, link); + gst_vorbisfile_update_streaminfo (vorbisfile, link); + + if (gst_pad_try_set_caps (vorbisfile->srcpad, + GST_CAPS_NEW ("vorbisdec_src", + "audio/raw", + "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 (vi->rate), + "channels", GST_PROPS_INT (vi->channels) + )) <= 0) + { + return FALSE; + } + + return TRUE; +} + +static void +gst_vorbisfile_loop (GstElement *element) +{ + VorbisFile *vorbisfile = GST_VORBISFILE (element); + GstBuffer *outbuf; + long ret; + GstClockTime time; + gint64 samples; + gint link; + + /* this function needs to go first since you don't want to be messing + * with an unset vf ;) */ + if (vorbisfile->restart) { + vorbisfile->offset = 0; + vorbisfile->total_bytes = 0; + vorbisfile->may_eos = FALSE; + vorbisfile->vf.seekable = gst_bytestream_seek (vorbisfile->bs, 0, + GST_SEEK_METHOD_SET); + GST_DEBUG (GST_CAT_PLUGIN_INFO, "vorbisfile: seekable: %s\n", + vorbisfile->vf.seekable ? "yes" : "no"); + + /* open our custom vorbisfile data object with the callbacks we provide */ + if (ov_open_callbacks (vorbisfile, &vorbisfile->vf, NULL, 0, + vorbisfile_ov_callbacks) < 0) { + gst_element_error (element, "this is not a vorbis file"); + return; + } + vorbisfile->need_discont = TRUE; + vorbisfile->restart = FALSE; + vorbisfile->current_link = -1; + } + + if (vorbisfile->seek_pending) { + /* get time to seek to in seconds */ + + switch (vorbisfile->seek_format) { + case GST_FORMAT_TIME: + { + gdouble seek_to = (gdouble) vorbisfile->seek_value / GST_SECOND; + + if (vorbisfile->seek_accurate) { + if (ov_time_seek (&vorbisfile->vf, seek_to) == 0) { + vorbisfile->need_discont = TRUE; + } + } + else { + if (ov_time_seek_page (&vorbisfile->vf, seek_to) == 0) { + vorbisfile->need_discont = TRUE; + } + } + break; + } + case GST_FORMAT_UNITS: + if (vorbisfile->seek_accurate) { + if (ov_pcm_seek (&vorbisfile->vf, vorbisfile->seek_value) == 0) { + vorbisfile->need_discont = TRUE; + } + } + else { + if (ov_pcm_seek_page (&vorbisfile->vf, vorbisfile->seek_value) == 0) { + vorbisfile->need_discont = TRUE; + } + } + break; + default: + if (vorbisfile->seek_format == logical_stream_format) { + gint64 seek_to; + + seek_to = vorbisfile->vf.offsets[vorbisfile->seek_value]; + + if (ov_raw_seek (&vorbisfile->vf, seek_to) == 0) { + vorbisfile->need_discont = TRUE; + vorbisfile->current_link = -1; + } + else { + g_warning ("raw seek failed"); + } + } + else + g_warning ("unknown seek method, implement me !"); + break; + } + vorbisfile->seek_pending = FALSE; + } + + /* we update the caps for each logical stream */ + if (vorbisfile->vf.current_link != vorbisfile->current_link) { + if (!gst_vorbisfile_new_link (vorbisfile, vorbisfile->vf.current_link)) { + gst_element_error (GST_ELEMENT (vorbisfile), "could not negotiate format"); + } + return; + } + + outbuf = gst_buffer_new (); + GST_BUFFER_DATA (outbuf) = g_malloc (4096); + GST_BUFFER_SIZE (outbuf) = 4096; + + /* get current time for discont and buffer timestamp */ + time = (GstClockTime) (ov_time_tell (&vorbisfile->vf) * GST_SECOND); + + ret = ov_read (&vorbisfile->vf, + GST_BUFFER_DATA (outbuf), GST_BUFFER_SIZE (outbuf), + &link); + + if (ret == 0) { + GST_DEBUG (0, "eos"); + /* send EOS event */ + /*ov_clear (&vorbisfile->vf);*/ + vorbisfile->restart = TRUE; + gst_buffer_unref (outbuf); + /* if the pad is not usable, don't push it out */ + if (GST_PAD_IS_USABLE (vorbisfile->srcpad)) { + gst_pad_push (vorbisfile->srcpad, + GST_BUFFER (gst_event_new (GST_EVENT_EOS))); + } + gst_element_set_eos (element); + return; + } + else if (ret < 0) { + g_warning ("vorbisfile: decoding error"); + gst_buffer_unref (outbuf); + return; + } + else { + if (vorbisfile->need_discont) { + GstEvent *discont; + + vorbisfile->need_discont = FALSE; + + /* if the pad is not usable, don't push it out */ + if (GST_PAD_IS_USABLE (vorbisfile->srcpad)) { + /* get stream stats */ + samples = (gint64) (ov_pcm_tell (&vorbisfile->vf)); + + discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time, + GST_FORMAT_UNITS, samples, NULL); + + gst_pad_push (vorbisfile->srcpad, GST_BUFFER (discont)); + } + } + + GST_BUFFER_SIZE (outbuf) = ret; + GST_BUFFER_TIMESTAMP (outbuf) = time; + + vorbisfile->may_eos = TRUE; + + if (!vorbisfile->vf.seekable) { + vorbisfile->total_bytes += GST_BUFFER_SIZE (outbuf); + } + + if (GST_PAD_IS_USABLE (vorbisfile->srcpad)) + gst_pad_push (vorbisfile->srcpad, outbuf); + else + gst_buffer_unref (outbuf); + } +} + +static const GstFormat* +gst_vorbisfile_get_formats (GstPad *pad) +{ + static GstFormat src_formats[] = { + GST_FORMAT_TIME, + GST_FORMAT_BYTES, + GST_FORMAT_UNITS, + 0, + 0 + }; + static GstFormat sink_formats[] = { + GST_FORMAT_TIME, + GST_FORMAT_BYTES, + 0, + 0 + }; + + src_formats[3] = logical_stream_format; + sink_formats[2] = logical_stream_format; + + return (GST_PAD_IS_SRC (pad) ? src_formats : sink_formats); +} + +static gboolean +gst_vorbisfile_src_convert (GstPad *pad, + GstFormat src_format, gint64 src_value, + GstFormat *dest_format, gint64 *dest_value) +{ + gboolean res = TRUE; + guint scale = 1; + gint bytes_per_sample; + VorbisFile *vorbisfile; + vorbis_info *vi; + + vorbisfile = GST_VORBISFILE (gst_pad_get_parent (pad)); + + if (*dest_format == GST_FORMAT_DEFAULT) + *dest_format = GST_FORMAT_TIME; + + vi = ov_info (&vorbisfile->vf, -1); + bytes_per_sample = vi->channels * 2; + + switch (src_format) { + case GST_FORMAT_BYTES: + switch (*dest_format) { + case GST_FORMAT_UNITS: + *dest_value = src_value / (vi->channels * 2); + break; + case GST_FORMAT_TIME: + { + gint byterate = bytes_per_sample * vi->rate; + + if (byterate == 0) + return FALSE; + *dest_value = src_value * GST_SECOND / byterate; + break; + } + default: + res = FALSE; + } + case GST_FORMAT_UNITS: + switch (*dest_format) { + case GST_FORMAT_BYTES: + *dest_value = src_value * bytes_per_sample; + break; + case GST_FORMAT_TIME: + if (vi->rate == 0) + return FALSE; + *dest_value = src_value * GST_SECOND / vi->rate; + break; + default: + res = FALSE; + } + break; + case GST_FORMAT_TIME: + switch (*dest_format) { + case GST_FORMAT_BYTES: + scale = bytes_per_sample; + case GST_FORMAT_UNITS: + *dest_value = src_value * scale * vi->rate / GST_SECOND; + break; + default: + res = FALSE; + } + break; + default: + if (src_format == logical_stream_format) { + /* because we need to convert relative from 0, we have to add + * all pcm totals */ + gint i; + gint64 count = 0; + + switch (*dest_format) { + case GST_FORMAT_BYTES: + res = FALSE; + break; + case GST_FORMAT_UNITS: + if (src_value > vorbisfile->vf.links) { + src_value = vorbisfile->vf.links; + } + for (i = 0; i < src_value; i++) { + vi = ov_info (&vorbisfile->vf, i); + + count += ov_pcm_total (&vorbisfile->vf, i); + } + *dest_value = count; + break; + case GST_FORMAT_TIME: + { + if (src_value > vorbisfile->vf.links) { + src_value = vorbisfile->vf.links; + } + for (i = 0; i < src_value; i++) { + vi = ov_info (&vorbisfile->vf, i); + if (vi->rate) + count += ov_pcm_total (&vorbisfile->vf, i) * GST_SECOND / vi->rate; + else + count += ov_time_total (&vorbisfile->vf, i) * GST_SECOND; + } + /* we use the pcm totals to get the total time, it's more accurate */ + *dest_value = count; + break; + } + default: + res = FALSE; + } + } + else + res = FALSE; + break; + } + return res; +} + +static gboolean +gst_vorbisfile_sink_convert (GstPad *pad, + GstFormat src_format, gint64 src_value, + GstFormat *dest_format, gint64 *dest_value) +{ + gboolean res = TRUE; + VorbisFile *vorbisfile; + + vorbisfile = GST_VORBISFILE (gst_pad_get_parent (pad)); + + if (*dest_format == GST_FORMAT_DEFAULT) + *dest_format = GST_FORMAT_TIME; + + switch (src_format) { + case GST_FORMAT_BYTES: + switch (*dest_format) { + case GST_FORMAT_TIME: + break; + default: + if (*dest_format == logical_stream_format) { + } + else + res = FALSE; + } + case GST_FORMAT_TIME: + switch (*dest_format) { + case GST_FORMAT_BYTES: + break; + default: + if (*dest_format == logical_stream_format) { + } + else + res = FALSE; + } + default: + if (src_format == logical_stream_format) { + switch (*dest_format) { + case GST_FORMAT_TIME: + break; + case GST_FORMAT_BYTES: + break; + default: + res = FALSE; + } + } + else + res = FALSE; + break; + } + + return res; +} + +static const GstPadQueryType* +gst_vorbisfile_get_query_types (GstPad *pad) +{ + static const GstPadQueryType types[] = { + GST_PAD_QUERY_TOTAL, + GST_PAD_QUERY_POSITION, + 0 + }; + return types; +} + +/* handles queries for location in the stream in the requested format */ +static gboolean +gst_vorbisfile_src_query (GstPad *pad, GstPadQueryType type, + GstFormat *format, gint64 *value) +{ + gboolean res = TRUE; + VorbisFile *vorbisfile; + vorbis_info *vi; + + vorbisfile = GST_VORBISFILE (gst_pad_get_parent (pad)); + + vi = ov_info (&vorbisfile->vf, -1); + + switch (type) { + case GST_PAD_QUERY_TOTAL: + { + switch (*format) { + case GST_FORMAT_UNITS: + if (vorbisfile->vf.seekable) + *value = ov_pcm_total (&vorbisfile->vf, -1); + else + return FALSE; + break; + case GST_FORMAT_BYTES: + if (vorbisfile->vf.seekable) + *value = ov_pcm_total (&vorbisfile->vf, -1) * vi->channels * 2; + else + return FALSE; + break; + case GST_FORMAT_DEFAULT: + *format = GST_FORMAT_TIME; + /* fall through */ + case GST_FORMAT_TIME: + if (vorbisfile->vf.seekable) + *value = (gint64) (ov_time_total (&vorbisfile->vf, -1) * GST_SECOND); + else + return FALSE; + break; + default: + if (*format == logical_stream_format) { + if (vorbisfile->vf.seekable) + *value = vorbisfile->vf.links; + else + return FALSE; + } + else + res = FALSE; + break; + } + break; + } + case GST_PAD_QUERY_POSITION: + switch (*format) { + case GST_FORMAT_DEFAULT: + *format = GST_FORMAT_TIME; + /* fall through */ + case GST_FORMAT_TIME: + if (vorbisfile->vf.seekable) + *value = (gint64) (ov_time_tell (&vorbisfile->vf) * GST_SECOND); + else + *value = vorbisfile->total_bytes * GST_SECOND + / (vi->rate * vi->channels * 2); + break; + case GST_FORMAT_BYTES: + if (vorbisfile->vf.seekable) + *value = ov_pcm_tell (&vorbisfile->vf) * vi->channels * 2; + else + *value = vorbisfile->total_bytes; + break; + case GST_FORMAT_UNITS: + if (vorbisfile->vf.seekable) + *value = ov_pcm_tell (&vorbisfile->vf); + else + *value = vorbisfile->total_bytes / (vi->channels * 2); + break; + default: + if (*format == logical_stream_format) { + if (vorbisfile->vf.seekable) + *value = vorbisfile->current_link; + else + return FALSE; + } + else + res = FALSE; + break; + } + break; + default: + res = FALSE; + break; + } + + return res; +} + +static const GstEventMask* +gst_vorbisfile_get_event_masks (GstPad *pad) +{ + static const GstEventMask masks[] = { + { GST_EVENT_SEEK, GST_SEEK_METHOD_SET | GST_SEEK_FLAG_ACCURATE }, + { 0, } + }; + return masks; +} + +/* handle events on src pad */ +static gboolean +gst_vorbisfile_src_event (GstPad *pad, GstEvent *event) +{ + gboolean res = TRUE; + VorbisFile *vorbisfile; + + vorbisfile = GST_VORBISFILE (gst_pad_get_parent (pad)); + + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_SEEK: + { + gint64 offset; + vorbis_info *vi; + GstFormat format; + + GST_DEBUG (GST_CAT_EVENT, "vorbisfile: handling seek event on pad %s:%s", + GST_DEBUG_PAD_NAME (pad)); + if (!vorbisfile->vf.seekable) { + gst_event_unref (event); + GST_DEBUG (GST_CAT_EVENT, "vorbis stream is not seekable"); + return FALSE; + } + + offset = GST_EVENT_SEEK_OFFSET (event); + format = GST_EVENT_SEEK_FORMAT (event); + + switch (format) { + case GST_FORMAT_TIME: + vorbisfile->seek_pending = TRUE; + vorbisfile->seek_value = offset; + vorbisfile->seek_format = format; + vorbisfile->seek_accurate = GST_EVENT_SEEK_FLAGS (event) + & GST_SEEK_FLAG_ACCURATE; + break; + case GST_FORMAT_BYTES: + vi = ov_info (&vorbisfile->vf, -1); + if (vi->channels == 0) { + GST_DEBUG (GST_CAT_EVENT, "vorbis stream has 0 channels ?"); + res = FALSE; + goto done; + } + offset /= vi->channels * 2; + /* fallthrough */ + case GST_FORMAT_UNITS: + vorbisfile->seek_pending = TRUE; + vorbisfile->seek_value = offset; + vorbisfile->seek_format = format; + vorbisfile->seek_accurate = GST_EVENT_SEEK_FLAGS (event) + & GST_SEEK_FLAG_ACCURATE; + break; + default: + if (format == logical_stream_format) { + vorbisfile->seek_pending = TRUE; + vorbisfile->seek_value = offset; + vorbisfile->seek_format = format; + vorbisfile->seek_accurate = GST_EVENT_SEEK_FLAGS (event) + & GST_SEEK_FLAG_ACCURATE; + } + else + { + GST_DEBUG (GST_CAT_EVENT, "unhandled seek format"); + res = FALSE; + } + break; + } + break; + } + default: + res = FALSE; + break; + } + +done: + gst_event_unref (event); + return res; +} + +static GstElementStateReturn +gst_vorbisfile_change_state (GstElement *element) +{ + VorbisFile *vorbisfile = GST_VORBISFILE (element); + + switch (GST_STATE_TRANSITION (element)) { + case GST_STATE_NULL_TO_READY: + case GST_STATE_READY_TO_PAUSED: + vorbisfile->restart = TRUE; + vorbisfile->bs = gst_bytestream_new (vorbisfile->sinkpad); + break; + case GST_STATE_PAUSED_TO_PLAYING: + vorbisfile->eos = FALSE; + case GST_STATE_PLAYING_TO_PAUSED: + break; + case GST_STATE_PAUSED_TO_READY: + ov_clear (&vorbisfile->vf); + gst_bytestream_destroy (vorbisfile->bs); + break; + case GST_STATE_READY_TO_NULL: + default: + break; + } + + if (GST_ELEMENT_CLASS (parent_class)->change_state) + return GST_ELEMENT_CLASS (parent_class)->change_state (element); + + return GST_STATE_SUCCESS; +} + +static void +gst_vorbisfile_set_property (GObject *object, guint prop_id, + const GValue *value, GParamSpec *pspec) +{ + VorbisFile *vorbisfile; + + g_return_if_fail (GST_IS_VORBISFILE (object)); + + vorbisfile = GST_VORBISFILE (object); + + switch (prop_id) { + default: + g_warning ("Unknown property id\n"); + } +} + +static void +gst_vorbisfile_get_property (GObject *object, guint prop_id, + GValue *value, GParamSpec *pspec) +{ + VorbisFile *vorbisfile; + + g_return_if_fail (GST_IS_VORBISFILE (object)); + + vorbisfile = GST_VORBISFILE (object); + + switch (prop_id) { + case ARG_METADATA: + g_value_set_boxed (value, vorbisfile->metadata); + break; + case ARG_STREAMINFO: + g_value_set_boxed (value, vorbisfile->streaminfo); + break; + default: + g_warning ("Unknown property id\n"); + } +} diff --git a/ext/mas/Makefile.in b/ext/mas/Makefile.in index 7a9b0824..de72ba46 100644 --- a/ext/mas/Makefile.in +++ b/ext/mas/Makefile.in @@ -137,6 +137,9 @@ HAVE_GCONFTOOL = @HAVE_GCONFTOOL@ HERMES_LIBS = @HERMES_LIBS@ HTTP_LIBS = @HTTP_LIBS@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IVORBISFILE_LIBS = @IVORBISFILE_LIBS@ +IVORBIS_CFLAGS = @IVORBIS_CFLAGS@ +IVORBIS_LIBS = @IVORBIS_LIBS@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ JPEG_LIBS = @JPEG_LIBS@ @@ -220,7 +223,6 @@ libgstmassink_la_CFLAGS = $(GST_CFLAGS) $(MAS_CFLAGS) libgstmassink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(MAS_LIBS) noinst_HEADERS = massink.h -EXTRA_DIST = README subdir = ext/mas mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h |