mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

cdio: port cdiocddasrc to 0.11

Browse source
This commit is contained in:
Tim-Philipp Müller 2011-11-12 21:06:29 +00:00
parent 09675d7a8e
commit b699e199f2
5 changed files with 47 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -210,7 +210,7 @@ dnl *** plug-ins to include ***
dnl Non ported plugins (non-dependant, then dependant) dnl Non ported plugins (non-dependant, then dependant)
dnl Make sure you have a space before and after all plugins dnl Make sure you have a space before and after all plugins
GST_PLUGINS_NONPORTED=" synaesthesia xingmux mpegstream cdio " GST_PLUGINS_NONPORTED=" synaesthesia xingmux mpegstream "
AC_SUBST(GST_PLUGINS_NONPORTED) AC_SUBST(GST_PLUGINS_NONPORTED)
dnl these are all the gst plug-ins, compilable without additional libs dnl these are all the gst plug-ins, compilable without additional libs

2
ext/cdio/Makefile.am
View file

@ -11,7 +11,7 @@ libgstcdio_la_CFLAGS = \
$(CDIO_CFLAGS) $(CDIO_CFLAGS)
libgstcdio_la_LIBADD = \ libgstcdio_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgstcdda-$(GST_MAJORMINOR) \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(CDIO_LIBS) $(CDIO_LIBS)

2
ext/cdio/gstcdio.c
View file

@ -49,7 +49,7 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
} }
if (*p_tags == NULL) if (*p_tags == NULL)
*p_tags = gst_tag_list_new (); *p_tags = gst_tag_list_new_empty ();
gst_tag_list_add (*p_tags, GST_TAG_MERGE_REPLACE, gst_tag, txt, NULL); gst_tag_list_add (*p_tags, GST_TAG_MERGE_REPLACE, gst_tag, txt, NULL);

88
ext/cdio/gstcdiocddasrc.c
View file

@ -19,7 +19,7 @@
/** /**
* SECTION:element-cdiocddasrc * SECTION:element-cdiocddasrc
* @see_also: GstCdParanoiaSrc, GstCddaBaseSrc * @see_also: GstCdParanoiaSrc, GstAudioCdSrc
* *
* <refsect2> * <refsect2>
* <para> * <para>
@ -93,8 +93,7 @@ enum
PROP_READ_SPEED PROP_READ_SPEED
}; };
GST_BOILERPLATE (GstCdioCddaSrc, gst_cdio_cdda_src, GstCddaBaseSrc, G_DEFINE_TYPE (GstCdioCddaSrc, gst_cdio_cdda_src, GST_TYPE_AUDIO_CD_SRC);
GST_TYPE_CDDA_BASE_SRC);
static void gst_cdio_cdda_src_finalize (GObject * obj); static void gst_cdio_cdda_src_finalize (GObject * obj);
static void gst_cdio_cdda_src_set_property (GObject * object, guint prop_id, static void gst_cdio_cdda_src_set_property (GObject * object, guint prop_id,
@ -102,31 +101,20 @@ static void gst_cdio_cdda_src_set_property (GObject * object, guint prop_id,
static void gst_cdio_cdda_src_get_property (GObject * object, guint prop_id, static void gst_cdio_cdda_src_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static gchar *gst_cdio_cdda_src_get_default_device (GstCddaBaseSrc * src); static gchar *gst_cdio_cdda_src_get_default_device (GstAudioCdSrc * src);
static GstBuffer *gst_cdio_cdda_src_read_sector (GstCddaBaseSrc * src, static GstBuffer *gst_cdio_cdda_src_read_sector (GstAudioCdSrc * src,
gint sector); gint sector);
static gboolean gst_cdio_cdda_src_open (GstCddaBaseSrc * src, static gboolean gst_cdio_cdda_src_open (GstAudioCdSrc * src,
const gchar * device); const gchar * device);
static void gst_cdio_cdda_src_close (GstCddaBaseSrc * src); static void gst_cdio_cdda_src_close (GstAudioCdSrc * src);
static void
gst_cdio_cdda_src_base_init (gpointer g_class)
{
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
gst_element_class_set_details_simple (element_class, "CD audio source (CDDA)",
"Source/File",
"Read audio from CD using libcdio",
"Tim-Philipp Müller <tim centricular net>");
}
static gchar * static gchar *
gst_cdio_cdda_src_get_default_device (GstCddaBaseSrc * cddabasesrc) gst_cdio_cdda_src_get_default_device (GstAudioCdSrc * audiocdsrc)
{ {
GstCdioCddaSrc *src; GstCdioCddaSrc *src;
gchar *default_device, *ret; gchar *default_device, *ret;
src = GST_CDIO_CDDA_SRC (cddabasesrc); src = GST_CDIO_CDDA_SRC (audiocdsrc);
/* src->cdio may be NULL here */ /* src->cdio may be NULL here */
default_device = cdio_get_default_device (src->cdio); default_device = cdio_get_default_device (src->cdio);
@ -140,7 +128,7 @@ gst_cdio_cdda_src_get_default_device (GstCddaBaseSrc * cddabasesrc)
} }
static gchar ** static gchar **
gst_cdio_cdda_src_probe_devices (GstCddaBaseSrc * cddabasesrc) gst_cdio_cdda_src_probe_devices (GstAudioCdSrc * audiocdsrc)
{ {
char **devices, **ret, **d; char **devices, **ret, **d;
@ -156,7 +144,7 @@ gst_cdio_cdda_src_probe_devices (GstCddaBaseSrc * cddabasesrc)
ret = g_strdupv (devices); ret = g_strdupv (devices);
for (d = devices; *d != NULL; ++d) { for (d = devices; *d != NULL; ++d) {
GST_DEBUG_OBJECT (cddabasesrc, "device: %s", GST_STR_NULL (*d)); GST_DEBUG_OBJECT (audiocdsrc, "device: %s", GST_STR_NULL (*d));
free (*d); free (*d);
} }
free (devices); free (devices);
@ -166,32 +154,32 @@ gst_cdio_cdda_src_probe_devices (GstCddaBaseSrc * cddabasesrc)
/* ERRORS */ /* ERRORS */
no_devices: no_devices:
{ {
GST_DEBUG_OBJECT (cddabasesrc, "no devices found"); GST_DEBUG_OBJECT (audiocdsrc, "no devices found");
return NULL; return NULL;
} }
empty_devices: empty_devices:
{ {
GST_DEBUG_OBJECT (cddabasesrc, "empty device list found"); GST_DEBUG_OBJECT (audiocdsrc, "empty device list found");
free (devices); free (devices);
return NULL; return NULL;
} }
} }
static GstBuffer * static GstBuffer *
gst_cdio_cdda_src_read_sector (GstCddaBaseSrc * cddabasesrc, gint sector) gst_cdio_cdda_src_read_sector (GstAudioCdSrc * audiocdsrc, gint sector)
{ {
GstCdioCddaSrc *src; GstCdioCddaSrc *src;
GstBuffer *buf; guint8 *data;
src = GST_CDIO_CDDA_SRC (cddabasesrc); src = GST_CDIO_CDDA_SRC (audiocdsrc);
/* can't use pad_alloc because we can't return the GstFlowReturn */ data = g_malloc (CDIO_CD_FRAMESIZE_RAW);
buf = gst_buffer_new_and_alloc (CDIO_CD_FRAMESIZE_RAW);
if (cdio_read_audio_sector (src->cdio, GST_BUFFER_DATA (buf), sector) != 0) /* can't use pad_alloc because we can't return the GstFlowReturn (FIXME 0.11) */
if (cdio_read_audio_sector (src->cdio, data, sector) != 0)
goto read_failed; goto read_failed;
return buf; return gst_buffer_new_wrapped (data, CDIO_CD_FRAMESIZE_RAW);
/* ERRORS */ /* ERRORS */
read_failed: read_failed:
@ -201,7 +189,7 @@ read_failed:
(_("Could not read from CD.")), (_("Could not read from CD.")),
("cdio_read_audio_sector at %d failed: %s", sector, ("cdio_read_audio_sector at %d failed: %s", sector,
g_strerror (errno))); g_strerror (errno)));
gst_buffer_unref (buf); g_free (data);
return NULL; return NULL;
} }
} }
@ -213,13 +201,13 @@ notcdio_track_is_audio_track (const CdIo * p_cdio, track_t i_track)
} }
static gboolean static gboolean
gst_cdio_cdda_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device) gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
{ {
GstCdioCddaSrc *src; GstCdioCddaSrc *src;
discmode_t discmode; discmode_t discmode;
gint first_track, num_tracks, i; gint first_track, num_tracks, i;
src = GST_CDIO_CDDA_SRC (cddabasesrc); src = GST_CDIO_CDDA_SRC (audiocdsrc);
g_assert (device != NULL); g_assert (device != NULL);
g_assert (src->cdio == NULL); g_assert (src->cdio == NULL);
@ -245,12 +233,12 @@ gst_cdio_cdda_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device)
cdio_set_speed (src->cdio, src->read_speed); cdio_set_speed (src->cdio, src->read_speed);
gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio,
cddabasesrc->tags); audiocdsrc->tags);
GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track);
for (i = 0; i < num_tracks; ++i) { for (i = 0; i < num_tracks; ++i) {
GstCddaBaseSrcTrack track = { 0, }; GstAudioCdSrcTrack track = { 0, };
gint len_sectors; gint len_sectors;
len_sectors = cdio_get_track_sec_count (src->cdio, i + first_track); len_sectors = cdio_get_track_sec_count (src->cdio, i + first_track);
@ -265,7 +253,7 @@ gst_cdio_cdda_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device)
track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio,
i + first_track); i + first_track);
gst_cdda_base_src_add_track (GST_CDDA_BASE_SRC (src), &track); gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track);
} }
return TRUE; return TRUE;
@ -289,9 +277,9 @@ not_audio:
} }
static void static void
gst_cdio_cdda_src_close (GstCddaBaseSrc * cddabasesrc) gst_cdio_cdda_src_close (GstAudioCdSrc * audiocdsrc)
{ {
GstCdioCddaSrc *src = GST_CDIO_CDDA_SRC (cddabasesrc); GstCdioCddaSrc *src = GST_CDIO_CDDA_SRC (audiocdsrc);
if (src->cdio) { if (src->cdio) {
cdio_destroy (src->cdio); cdio_destroy (src->cdio);
@ -300,7 +288,7 @@ gst_cdio_cdda_src_close (GstCddaBaseSrc * cddabasesrc)
} }
static void static void
gst_cdio_cdda_src_init (GstCdioCddaSrc * src, GstCdioCddaSrcClass * klass) gst_cdio_cdda_src_init (GstCdioCddaSrc * src)
{ {
src->read_speed = DEFAULT_READ_SPEED; /* don't need atomic access here */ src->read_speed = DEFAULT_READ_SPEED; /* don't need atomic access here */
src->cdio = NULL; src->cdio = NULL;
@ -316,29 +304,35 @@ gst_cdio_cdda_src_finalize (GObject * obj)
src->cdio = NULL; src->cdio = NULL;
} }
G_OBJECT_CLASS (parent_class)->finalize (obj); G_OBJECT_CLASS (gst_cdio_cdda_src_parent_class)->finalize (obj);
} }
static void static void
gst_cdio_cdda_src_class_init (GstCdioCddaSrcClass * klass) gst_cdio_cdda_src_class_init (GstCdioCddaSrcClass * klass)
{ {
GstCddaBaseSrcClass *cddabasesrc_class = GST_CDDA_BASE_SRC_CLASS (klass); GstAudioCdSrcClass *audiocdsrc_class = GST_AUDIO_CD_SRC_CLASS (klass);
GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->set_property = gst_cdio_cdda_src_set_property; gobject_class->set_property = gst_cdio_cdda_src_set_property;
gobject_class->get_property = gst_cdio_cdda_src_get_property; gobject_class->get_property = gst_cdio_cdda_src_get_property;
gobject_class->finalize = gst_cdio_cdda_src_finalize; gobject_class->finalize = gst_cdio_cdda_src_finalize;
cddabasesrc_class->open = gst_cdio_cdda_src_open; audiocdsrc_class->open = gst_cdio_cdda_src_open;
cddabasesrc_class->close = gst_cdio_cdda_src_close; audiocdsrc_class->close = gst_cdio_cdda_src_close;
cddabasesrc_class->read_sector = gst_cdio_cdda_src_read_sector; audiocdsrc_class->read_sector = gst_cdio_cdda_src_read_sector;
cddabasesrc_class->probe_devices = gst_cdio_cdda_src_probe_devices; audiocdsrc_class->probe_devices = gst_cdio_cdda_src_probe_devices;
cddabasesrc_class->get_default_device = gst_cdio_cdda_src_get_default_device; audiocdsrc_class->get_default_device = gst_cdio_cdda_src_get_default_device;
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_READ_SPEED, g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_READ_SPEED,
g_param_spec_int ("read-speed", "Read speed", g_param_spec_int ("read-speed", "Read speed",
"Read from device at the specified speed (-1 = default)", -1, 100, "Read from device at the specified speed (-1 = default)", -1, 100,
DEFAULT_READ_SPEED, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); DEFAULT_READ_SPEED, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gst_element_class_set_details_simple (element_class, "CD audio source (CDDA)",
"Source/File",
"Read audio from CD using libcdio",
"Tim-Philipp Müller <tim centricular net>");
} }
static void static void

6
ext/cdio/gstcdiocddasrc.h
View file

@ -20,7 +20,7 @@
#ifndef __GST_CDIO_CDDA_SRC_H__ #ifndef __GST_CDIO_CDDA_SRC_H__
#define __GST_CDIO_CDDA_SRC_H__ #define __GST_CDIO_CDDA_SRC_H__
#include <gst/cdda/gstcddabasesrc.h> #include <gst/audio/gstaudiocdsrc.h>
#include <cdio/cdio.h> #include <cdio/cdio.h>
#define GST_TYPE_CDIO_CDDA_SRC (gst_cdio_cdda_src_get_type ()) #define GST_TYPE_CDIO_CDDA_SRC (gst_cdio_cdda_src_get_type ())
@ -34,7 +34,7 @@ typedef struct _GstCdioCddaSrcClass GstCdioCddaSrcClass;
struct _GstCdioCddaSrc struct _GstCdioCddaSrc
{ {
GstCddaBaseSrc cddabasesrc; GstAudioCdSrc audiocdsrc;
gint read_speed; /* ATOMIC */ gint read_speed; /* ATOMIC */
@ -43,7 +43,7 @@ struct _GstCdioCddaSrc
struct _GstCdioCddaSrcClass struct _GstCdioCddaSrcClass
{ {
GstCddaBaseSrcClass cddabasesrc_class; GstAudioCdSrcClass audiocdsrc_class;
}; };
GType gst_cdio_cdda_src_get_type (void); GType gst_cdio_cdda_src_get_type (void);