formatting cleanups convert more stuff to the generic seeking/convert/query interface

Original commit message from CVS:
formatting cleanups
convert more stuff to the generic seeking/convert/query interface
This commit is contained in:
Wim Taymans 2002-10-31 00:06:48 +00:00
parent f5f94ecf02
commit 5207b79805
2 changed files with 407 additions and 431 deletions

View File

@ -83,37 +83,45 @@ gst_paranoia_mode_get_type (void)
{2, "2", "Full paranoia"}, {2, "2", "Full paranoia"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };
if (!paranoia_mode_type) { if (!paranoia_mode_type) {
paranoia_mode_type = g_enum_register_static ("GstParanoiaMode", paranoia_modes); paranoia_mode_type = g_enum_register_static ("GstParanoiaMode", paranoia_modes);
} }
return paranoia_mode_type; return paranoia_mode_type;
} }
#define GST_TYPE_PARANOIA_ENDIAN (gst_paranoia_endian_get_type())
static GType
gst_paranoia_endian_get_type (void)
{
static GType paranoia_endian_type = 0;
static GEnumValue paranoia_endians[] = {
{0, "0", "treat drive as little endian"},
{1, "1", "treat drive as big endian"},
{0, NULL, NULL},
};
if (!paranoia_endian_type) {
paranoia_endian_type = g_enum_register_static ("GstParanoiaEndian", paranoia_endians);
}
return paranoia_endian_type;
}
/********** Standard stuff for signals and arguments **********/ /********** Standard stuff for signals and arguments **********/
/* CDParanoia signals and args */ /* CDParanoia signals and args */
enum { enum
{
SMILIE_CHANGE, SMILIE_CHANGE,
TRANSPORT_ERROR, TRANSPORT_ERROR,
UNCORRECTED_ERROR, UNCORRECTED_ERROR,
LAST_SIGNAL LAST_SIGNAL
}; };
enum { enum
{
ARG_0, ARG_0,
ARG_LOCATION, ARG_LOCATION,
ARG_GENERIC_DEVICE, ARG_GENERIC_DEVICE,
/*
ARG_START_TRACK,
ARG_END_TRACK,
*/
ARG_LAST_TRACK,
ARG_CUR_TRACK,
/*
ARG_START_SECTOR,
ARG_END_SECTOR,
*/
ARG_CUR_SECTOR,
ARG_DEFAULT_SECTORS, ARG_DEFAULT_SECTORS,
ARG_SEARCH_OVERLAP, ARG_SEARCH_OVERLAP,
ARG_ENDIAN, ARG_ENDIAN,
@ -124,29 +132,31 @@ enum {
ARG_ABORT_ON_SKIP, ARG_ABORT_ON_SKIP,
ARG_PARANOIA_MODE, ARG_PARANOIA_MODE,
ARG_SMILIE, ARG_SMILIE,
ARG_NO_TRACKS, ARG_DISCID
ARG_DISCID,
ARG_OFFSETS,
ARG_TOTAL_TIME,
}; };
static void cdparanoia_class_init (CDParanoiaClass *klass); static void cdparanoia_class_init (CDParanoiaClass *klass);
static void cdparanoia_init (CDParanoia *cdparanoia); static void cdparanoia_init (CDParanoia *cdparanoia);
static void cdparanoia_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void cdparanoia_set_property (GObject *object, guint prop_id,
static void cdparanoia_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); const GValue *value, GParamSpec *pspec);
static void cdparanoia_get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec);
static GstBuffer* cdparanoia_get (GstPad *pad); static GstBuffer* cdparanoia_get (GstPad *pad);
static gboolean cdparanoia_event (GstPad *pad, GstEvent *event); static gboolean cdparanoia_event (GstPad *pad, GstEvent *event);
static const GstEventMask *cdparanoia_get_event_mask (GstPad *pad); static const GstEventMask*
static const GstFormat *cdparanoia_get_formats (GstPad *pad); cdparanoia_get_event_mask (GstPad *pad);
static const GstFormat*
cdparanoia_get_formats (GstPad *pad);
static gboolean cdparanoia_convert (GstPad *pad, static gboolean cdparanoia_convert (GstPad *pad,
GstFormat src_format, GstFormat src_format,
gint64 src_value, gint64 src_value,
GstFormat *dest_format, GstFormat *dest_format,
gint64 *dest_value); gint64 *dest_value);
static gboolean cdparanoia_query (GstPad *pad, GstPadQueryType type,
GstFormat *format, gint64 *value);
static GstElementStateReturn cdparanoia_change_state (GstElement *element); static GstElementStateReturn cdparanoia_change_state (GstElement *element);
@ -155,6 +165,7 @@ static GstElementClass *parent_class = NULL;
static guint cdparanoia_signals[LAST_SIGNAL] = { 0 }; static guint cdparanoia_signals[LAST_SIGNAL] = { 0 };
static GstFormat track_format; static GstFormat track_format;
static GstFormat sector_format;
GType GType
cdparanoia_get_type (void) cdparanoia_get_type (void)
@ -172,6 +183,7 @@ cdparanoia_get_type (void)
0, 0,
(GInstanceInitFunc) cdparanoia_init, (GInstanceInitFunc) cdparanoia_init,
}; };
cdparanoia_type = g_type_register_static (GST_TYPE_ELEMENT, "CDParanoia", &cdparanoia_info, 0); cdparanoia_type = g_type_register_static (GST_TYPE_ELEMENT, "CDParanoia", &cdparanoia_info, 0);
} }
return cdparanoia_type; return cdparanoia_type;
@ -183,6 +195,7 @@ cdparanoia_class_init (CDParanoiaClass *klass)
GObjectClass *gobject_class; GObjectClass *gobject_class;
GstElementClass *gstelement_class; GstElementClass *gstelement_class;
char *success = strerror_tr[0]; char *success = strerror_tr[0];
success = NULL; success = NULL;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
@ -205,75 +218,46 @@ cdparanoia_class_init (CDParanoiaClass *klass)
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LOCATION, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LOCATION,
g_param_spec_string ("location", "location", "location", g_param_spec_string ("location", "location", "location",
NULL, G_PARAM_READWRITE)); /* CHECKME */ NULL, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_GENERIC_DEVICE, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_GENERIC_DEVICE,
g_param_spec_string("generic_device","generic_device","generic_device", g_param_spec_string ("generic_device", "Generic device", "Use specified generic scsi device",
NULL, G_PARAM_READWRITE)); /* CHECKME */ NULL, G_PARAM_READWRITE));
#if 0
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_START_TRACK,
g_param_spec_int("start_track","start_track","start_track",
G_MININT,G_MAXINT,1,G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_END_TRACK,
g_param_spec_int("end_track","end_track","end_track",
G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */
#endif
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_LAST_TRACK,
g_param_spec_int("last_track","last_track","last_track",
G_MININT,G_MAXINT,0,G_PARAM_READABLE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_CUR_TRACK,
g_param_spec_int("cur_track","cur_track","cur_track",
G_MININT,G_MAXINT,0,G_PARAM_READABLE)); /* CHECKME */
#if 0
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_START_SECTOR,
g_param_spec_int("start_sector","start_sector","start_sector",
G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_END_SECTOR,
g_param_spec_int("end_sector","end_sector","end_sector",
G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */
#endif
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_CUR_SECTOR,
g_param_spec_int("cur_sector","cur_sector","cur_sector",
G_MININT,G_MAXINT,0,G_PARAM_READABLE)); /* CHECKME */
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DEFAULT_SECTORS, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DEFAULT_SECTORS,
g_param_spec_int("default_sectors","default_sectors","default_sectors", g_param_spec_int ("default_sectors", "Default sectors",
G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */ "Force default number of sectors in read to n sectors",
0, G_MAXINT, 0, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SEARCH_OVERLAP, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SEARCH_OVERLAP,
g_param_spec_int("search_overlap","search_overlap","search_overlap", g_param_spec_int ("search_overlap", "Search overlap",
G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */ "Force minimum overlap search during verification to n sectors",
0, G_MAXINT, 0, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ENDIAN, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ENDIAN,
g_param_spec_int("endian","endian","endian", g_param_spec_enum ("endian", "Endian", "Force endian on drive",
G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */ GST_TYPE_PARANOIA_ENDIAN, 0, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_READ_SPEED, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_READ_SPEED,
g_param_spec_int("read_speed","read_speed","read_speed", g_param_spec_int ("read_speed", "Read speed", "Read from device at specified speed",
G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */ G_MININT, G_MAXINT, 0, G_PARAM_READWRITE));
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_TOC_OFFSET, g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_TOC_OFFSET,
g_param_spec_int("toc_offset","toc_offset","toc_offset", g_param_spec_int("toc_offset", "TOC offset", "Add <n> sectors to the values reported",
G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */ G_MININT,G_MAXINT,0,G_PARAM_READWRITE));
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_TOC_BIAS, g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_TOC_BIAS,
g_param_spec_boolean("toc_bias","toc_bias","toc_bias", g_param_spec_boolean("toc_bias", "TOC bias",
TRUE,G_PARAM_READWRITE)); /* CHECKME */ "Assume that the beginning offset of track 1 as reported in the TOC "
"will be addressed as LBA 0. Necessary for some Toshiba drives to "
"get track boundaries",
TRUE,G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NEVER_SKIP, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NEVER_SKIP,
g_param_spec_boolean("never_skip","never_skip","never_skip", g_param_spec_int ("never_skip", "Never skip",
TRUE,G_PARAM_READWRITE)); /* CHECKME */ "never accept any less than perfect data reconstruction (don't allow "
"'V's) but if [n] is given, skip after [n] retries without progress.",
0, G_MAXINT, 0, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ABORT_ON_SKIP, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ABORT_ON_SKIP,
g_param_spec_boolean("abort_on_skip","abort_on_skip","abort_on_skip", g_param_spec_boolean ("abort_on_skip", "Abort on skip", "Abort on imperfect reads/skips",
TRUE,G_PARAM_READWRITE)); /* CHECKME */ TRUE, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PARANOIA_MODE, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PARANOIA_MODE,
g_param_spec_enum("paranoia_mode","paranoia_mode","paranoia_mode", g_param_spec_enum ("paranoia_mode", "Paranoia mode", "Type of checking to perform",
GST_TYPE_PARANOIA_MODE,0,G_PARAM_READWRITE)); /* CHECKME! */ GST_TYPE_PARANOIA_MODE, 0, G_PARAM_READWRITE));
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_NO_TRACKS,
g_param_spec_int("no_tracks","no_tracks","no_tracks",
0,G_MAXINT,0,G_PARAM_READABLE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DISCID, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DISCID,
g_param_spec_string("discid","discid","discid", g_param_spec_string ("discid", "discid", "The dics id",
NULL, G_PARAM_READABLE));
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_OFFSETS,
g_param_spec_string("offsets","offsets","offsets",
NULL, G_PARAM_READABLE));
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_TOTAL_TIME,
g_param_spec_string("total_time","total_time","total_time",
NULL, G_PARAM_READABLE)); NULL, G_PARAM_READABLE));
gobject_class->set_property = cdparanoia_set_property; gobject_class->set_property = cdparanoia_set_property;
@ -285,12 +269,13 @@ cdparanoia_class_init (CDParanoiaClass *klass)
static void static void
cdparanoia_init (CDParanoia *cdparanoia) cdparanoia_init (CDParanoia *cdparanoia)
{ {
cdparanoia->srcpad = gst_pad_new_from_template ( cdparanoia->srcpad =
GST_PAD_TEMPLATE_GET (cdparanoia_src_factory), "src"); gst_pad_new_from_template (GST_PAD_TEMPLATE_GET (cdparanoia_src_factory), "src");
gst_pad_set_get_function (cdparanoia->srcpad, cdparanoia_get); gst_pad_set_get_function (cdparanoia->srcpad, cdparanoia_get);
gst_pad_set_event_function (cdparanoia->srcpad, cdparanoia_event); gst_pad_set_event_function (cdparanoia->srcpad, cdparanoia_event);
gst_pad_set_event_mask_function (cdparanoia->srcpad, cdparanoia_get_event_mask); gst_pad_set_event_mask_function (cdparanoia->srcpad, cdparanoia_get_event_mask);
gst_pad_set_convert_function (cdparanoia->srcpad, cdparanoia_convert); gst_pad_set_convert_function (cdparanoia->srcpad, cdparanoia_convert);
gst_pad_set_query_function (cdparanoia->srcpad, cdparanoia_query);
gst_pad_set_formats_function (cdparanoia->srcpad, cdparanoia_get_formats); gst_pad_set_formats_function (cdparanoia->srcpad, cdparanoia_get_formats);
gst_element_add_pad (GST_ELEMENT (cdparanoia), cdparanoia->srcpad); gst_element_add_pad (GST_ELEMENT (cdparanoia), cdparanoia->srcpad);
@ -301,12 +286,11 @@ cdparanoia_init (CDParanoia *cdparanoia)
cdparanoia->end_sector = -1; cdparanoia->end_sector = -1;
cdparanoia->cur_sector = -1; cdparanoia->cur_sector = -1;
cdparanoia->start_track = -1; cdparanoia->start_track = -1;
cdparanoia->cur_track = -1;
cdparanoia->end_track = -1; cdparanoia->end_track = -1;
cdparanoia->last_track = -1; cdparanoia->last_track = -1;
cdparanoia->default_sectors = -1; cdparanoia->default_sectors = -1;
cdparanoia->search_overlap = -1; cdparanoia->search_overlap = -1;
cdparanoia->endian = -1; cdparanoia->endian = 0;
cdparanoia->read_speed = -1; cdparanoia->read_speed = -1;
cdparanoia->toc_offset = 0; cdparanoia->toc_offset = 0;
cdparanoia->toc_bias = FALSE; cdparanoia->toc_bias = FALSE;
@ -318,8 +302,6 @@ cdparanoia_init (CDParanoia *cdparanoia)
cdparanoia->seq = 0; cdparanoia->seq = 0;
cdparanoia->no_tracks = 0; cdparanoia->no_tracks = 0;
cdparanoia->discid=NULL;
cdparanoia->offsets=NULL;
cdparanoia->total_seconds = 0; cdparanoia->total_seconds = 0;
} }
@ -336,7 +318,8 @@ cdparanoia_set_property (GObject *object, guint prop_id, const GValue *value, GP
switch (prop_id) { switch (prop_id) {
case ARG_LOCATION: case ARG_LOCATION:
if (src->device) g_free (src->device); if (src->device)
g_free (src->device);
/* clear the filename if we get a NULL (is that possible?) */ /* clear the filename if we get a NULL (is that possible?) */
if (!g_ascii_strcasecmp (g_value_get_string (value), "")) if (!g_ascii_strcasecmp (g_value_get_string (value), ""))
src->device = NULL; src->device = NULL;
@ -346,7 +329,8 @@ cdparanoia_set_property (GObject *object, guint prop_id, const GValue *value, GP
break; break;
case ARG_GENERIC_DEVICE: case ARG_GENERIC_DEVICE:
if (src->generic_device) g_free (src->generic_device); if (src->generic_device)
g_free (src->generic_device);
/* reset the device if we get a NULL (is that possible?) */ /* reset the device if we get a NULL (is that possible?) */
if (!g_ascii_strcasecmp (g_value_get_string (value), "")) if (!g_ascii_strcasecmp (g_value_get_string (value), ""))
src->generic_device = NULL; src->generic_device = NULL;
@ -354,30 +338,6 @@ cdparanoia_set_property (GObject *object, guint prop_id, const GValue *value, GP
else else
src->generic_device = g_strdup (g_value_get_string (value)); src->generic_device = g_strdup (g_value_get_string (value));
break; break;
#if 0
case ARG_START_SECTOR:
src->start_sector = g_value_get_int (value);
src->cur_sector = src->start_sector;
paranoia_seek (src->p, src->start_sector, SEEK_SET);
break;
case ARG_END_SECTOR:
src->end_sector = g_value_get_int (value);
break;
case ARG_START_TRACK:
src->start_track = g_value_get_int (value);
/* Override the start_sector */
src->start_sector = cdda_track_firstsector (src->d, src->start_track);
src->cur_sector = src->start_sector;
paranoia_seek (src->p, src->start_sector, SEEK_SET);
break;
case ARG_END_TRACK:
src->end_track = g_value_get_int (value);
/* Override the end_sector */
src->end_sector = cdda_track_lastsector (src->d, src->end_track);
break;
#endif
case ARG_DEFAULT_SECTORS: case ARG_DEFAULT_SECTORS:
src->default_sectors = g_value_get_int (value); src->default_sectors = g_value_get_int (value);
break; break;
@ -385,7 +345,7 @@ cdparanoia_set_property (GObject *object, guint prop_id, const GValue *value, GP
src->search_overlap = g_value_get_int (value); src->search_overlap = g_value_get_int (value);
break; break;
case ARG_ENDIAN: case ARG_ENDIAN:
src->endian = g_value_get_int (value); src->endian = g_value_get_enum (value);
break; break;
case ARG_READ_SPEED: case ARG_READ_SPEED:
src->read_speed = g_value_get_int (value); src->read_speed = g_value_get_int (value);
@ -398,7 +358,7 @@ cdparanoia_set_property (GObject *object, guint prop_id, const GValue *value, GP
src->toc_bias = g_value_get_boolean (value); src->toc_bias = g_value_get_boolean (value);
break; break;
case ARG_NEVER_SKIP: case ARG_NEVER_SKIP:
src->never_skip = g_value_get_boolean (value); src->never_skip = g_value_get_int (value);
break; break;
case ARG_ABORT_ON_SKIP: case ARG_ABORT_ON_SKIP:
src->abort_on_skip = g_value_get_boolean (value); src->abort_on_skip = g_value_get_boolean (value);
@ -428,31 +388,6 @@ cdparanoia_get_property (GObject *object, guint prop_id, GValue *value, GParamSp
case ARG_GENERIC_DEVICE: case ARG_GENERIC_DEVICE:
g_value_set_string (value, src->generic_device); g_value_set_string (value, src->generic_device);
break; break;
#if 0
case ARG_START_SECTOR:
g_value_set_int (value, src->start_sector);
break;
case ARG_END_SECTOR:
g_value_set_int (value, src->end_sector);
break;
#endif
case ARG_CUR_SECTOR:
g_value_set_int (value, src->cur_sector);
break;
#if 0
case ARG_START_TRACK:
g_value_set_int (value, src->start_track);
break;
case ARG_END_TRACK:
g_value_set_int (value, src->end_track);
break;
#endif
case ARG_CUR_TRACK:
g_value_set_int (value, src->cur_track);
break;
case ARG_LAST_TRACK:
g_value_set_int (value, src->last_track);
break;
case ARG_DEFAULT_SECTORS: case ARG_DEFAULT_SECTORS:
g_value_set_int (value, src->default_sectors); g_value_set_int (value, src->default_sectors);
break; break;
@ -460,7 +395,7 @@ cdparanoia_get_property (GObject *object, guint prop_id, GValue *value, GParamSp
g_value_set_int (value, src->search_overlap); g_value_set_int (value, src->search_overlap);
break; break;
case ARG_ENDIAN: case ARG_ENDIAN:
g_value_set_int (value, src->endian); g_value_set_enum (value, src->endian);
break; break;
case ARG_READ_SPEED: case ARG_READ_SPEED:
g_value_set_int (value, src->read_speed); g_value_set_int (value, src->read_speed);
@ -472,7 +407,7 @@ cdparanoia_get_property (GObject *object, guint prop_id, GValue *value, GParamSp
g_value_set_boolean (value, src->toc_bias); g_value_set_boolean (value, src->toc_bias);
break; break;
case ARG_NEVER_SKIP: case ARG_NEVER_SKIP:
g_value_set_boolean (value, src->never_skip); g_value_set_int (value, src->never_skip);
break; break;
case ARG_ABORT_ON_SKIP: case ARG_ABORT_ON_SKIP:
g_value_set_boolean (value, src->abort_on_skip); g_value_set_boolean (value, src->abort_on_skip);
@ -480,25 +415,18 @@ cdparanoia_get_property (GObject *object, guint prop_id, GValue *value, GParamSp
case ARG_PARANOIA_MODE: case ARG_PARANOIA_MODE:
g_value_set_enum (value, src->paranoia_mode); g_value_set_enum (value, src->paranoia_mode);
break; break;
case ARG_NO_TRACKS:
g_value_set_int (value, src->no_tracks);
break;
case ARG_DISCID: case ARG_DISCID:
g_value_set_string (value, src->discid); g_value_set_string (value, src->discid);
break; break;
case ARG_OFFSETS:
g_value_set_string(value, src->offsets);
break;
case ARG_TOTAL_TIME:
g_value_set_string(value, src->total_seconds);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
} }
} }
static void cdparanoia_callback(long inpos, int function) { static void
cdparanoia_callback (long inpos, int function)
{
} }
static GstBuffer * static GstBuffer *
@ -513,12 +441,7 @@ cdparanoia_get (GstPad *pad)
g_return_val_if_fail (GST_FLAG_IS_SET (src, CDPARANOIA_OPEN), NULL); g_return_val_if_fail (GST_FLAG_IS_SET (src, CDPARANOIA_OPEN), NULL);
/* read a sector */ /* read a sector */
/* NOTE: if you have a patched cdparanoia, set this to 1 to save cycles */
#if 0
cdda_buf = paranoia_read (src->p, NULL);
#else
cdda_buf = paranoia_read (src->p, cdparanoia_callback); cdda_buf = paranoia_read (src->p, cdparanoia_callback);
#endif
/* update current sector and stop things if appropriate */ /* update current sector and stop things if appropriate */
src->cur_sector++; src->cur_sector++;
@ -528,10 +451,7 @@ cdparanoia_get (GstPad *pad)
gst_element_set_eos (GST_ELEMENT (src)); gst_element_set_eos (GST_ELEMENT (src));
buf = GST_BUFFER (gst_event_new (GST_EVENT_EOS)); buf = GST_BUFFER (gst_event_new (GST_EVENT_EOS));
} } else {
else {
src->cur_track = cdda_sector_gettrack( src->d, src->cur_sector );
/* have to copy the buffer for now since we don't own it... */ /* have to copy the buffer for now since we don't own it... */
/* FIXME must ask monty about allowing ownership transfer */ /* FIXME must ask monty about allowing ownership transfer */
buf = gst_buffer_new_and_alloc (CD_FRAMESIZE_RAW); buf = gst_buffer_new_and_alloc (CD_FRAMESIZE_RAW);
@ -554,13 +474,16 @@ typedef struct
byte m; byte m;
byte s; byte s;
byte f; byte f;
}toc_msf; }
toc_msf;
/* cdparanoia provides the toc in lba format dang we need it in msf so /* cdparanoia provides the toc in lba format dang we need it in msf so
* we have to convert it */ * we have to convert it */
static inline void lba_to_msf (const gint lba, byte *m, byte *s, byte *f) static inline void
lba_to_msf (const gint lba, byte *m, byte *s, byte *f)
{ {
gint lba2 = lba; gint lba2 = lba;
lba2 += CD_MSF_OFFSET; lba2 += CD_MSF_OFFSET;
lba2 &= 0xffffff; lba2 &= 0xffffff;
*m = lba2 / (CD_SECS * CD_FRAMES); *m = lba2 / (CD_SECS * CD_FRAMES);
@ -575,9 +498,9 @@ static void
lba_toc_to_msf_toc (TOC *lba_toc, toc_msf *msf_toc, gint tracks) lba_toc_to_msf_toc (TOC *lba_toc, toc_msf *msf_toc, gint tracks)
{ {
gint i; gint i;
for (i = 0; i <= tracks; i++) for (i = 0; i <= tracks; i++)
lba_to_msf(lba_toc[i].dwStartSector,&msf_toc[i].m, lba_to_msf (lba_toc[i].dwStartSector, &msf_toc[i].m, &msf_toc[i].s, &msf_toc[i].f);
&msf_toc[i].s, &msf_toc[i].f);
} }
/* the cddb hash function */ /* the cddb hash function */
@ -585,9 +508,9 @@ static guint
cddb_sum (gint n) cddb_sum (gint n)
{ {
guint ret; guint ret;
ret = 0; ret = 0;
while (n > 0) while (n > 0) {
{
ret += (n % 10); ret += (n % 10);
n /= 10; n /= 10;
} }
@ -599,33 +522,31 @@ cddb_discid(gchar *discid,toc_msf *toc, gint tracks)
{ {
guint i = 0, t = 0, n = 0; guint i = 0, t = 0, n = 0;
while (i < tracks) while (i < tracks) {
{
n = n + cddb_sum ((toc[i].m * 60) + toc[i].s); n = n + cddb_sum ((toc[i].m * 60) + toc[i].s);
i++; i++;
} }
t = ((toc[tracks].m * 60) + toc[tracks].s) - ((toc[0].m * 60) t = ((toc[tracks].m * 60) + toc[tracks].s) - ((toc[0].m * 60)
+ toc[0].s); + toc[0].s);
sprintf (discid, "%08x", ((n % 0xff) << 24 | t << 8 | tracks)); sprintf (discid, "%08x", ((n % 0xff) << 24 | t << 8 | tracks));
} }
/* get all the cddb info at once */ /* get all the cddb info at once */
static void static void
get_cddb_info(TOC *toc, gint tracks,gchar *discid, gchar *offsets, get_cddb_info (TOC *toc, gint tracks, gchar *discid, gint64 *offsets, gint64 *total_seconds)
gchar *total_seconds)
{ {
toc_msf msf_toc[MAXTRK]; toc_msf msf_toc[MAXTRK];
gint i; gint i;
gchar *p = offsets; gint64 *p = offsets;
lba_toc_to_msf_toc (toc, &msf_toc[0], tracks); lba_toc_to_msf_toc (toc, &msf_toc[0], tracks);
cddb_discid (discid, &msf_toc[0], tracks); cddb_discid (discid, &msf_toc[0], tracks);
for (i = 0; i < tracks; i++) for (i = 0; i < tracks; i++) {
p = (p + sprintf (p, " %d", msf_toc[i].f)) ; *p++ = msf_toc[i].f;
}
sprintf (total_seconds, "%d", msf_toc[tracks].f/75); *total_seconds = msf_toc[tracks].f / 75;
} }
@ -692,26 +613,15 @@ cdparanoia_open (CDParanoia *src)
/* set up some more stuff */ /* set up some more stuff */
src->no_tracks = src->d->tracks; src->no_tracks = src->d->tracks;
g_assert(src->discid == NULL);
g_assert(src->offsets == NULL);
g_assert(src->total_seconds == NULL);
/* I don't like this here i would prefer it under get_cddb_info but for somereason /* I don't like this here i would prefer it under get_cddb_info but for somereason
* when leaving the function it clobbers the allocated mem and all is lost bugger * when leaving the function it clobbers the allocated mem and all is lost bugger
*/ */
src->discid = g_new0(gchar,20) ;
/* FIXME convert to pad_query/convert */
src->offsets = g_new0(gchar,4096);
src->total_seconds = g_new0(gchar, 4);
get_cddb_info (&src->d->disc_toc[0], src->no_tracks, src->discid, get_cddb_info (&src->d->disc_toc[0], src->no_tracks, src->discid,
src->offsets,src->total_seconds); src->offsets, &src->total_seconds);
g_object_freeze_notify (G_OBJECT (src)); g_object_freeze_notify (G_OBJECT (src));
g_object_notify (G_OBJECT (src), "discid"); g_object_notify (G_OBJECT (src), "discid");
g_object_notify (G_OBJECT (src), "offsets");
g_object_notify (G_OBJECT (src), "total-time");
g_object_thaw_notify (G_OBJECT (src)); g_object_thaw_notify (G_OBJECT (src));
if (src->toc_bias) { if (src->toc_bias) {
@ -750,10 +660,14 @@ cdparanoia_open (CDParanoia *src)
return FALSE; return FALSE;
} }
if (src->paranoia_mode == 0) paranoia_mode = PARANOIA_MODE_DISABLE; if (src->paranoia_mode == 0)
else if (src->paranoia_mode == 1) paranoia_mode = PARANOIA_MODE_OVERLAP; paranoia_mode = PARANOIA_MODE_DISABLE;
else paranoia_mode = PARANOIA_MODE_FULL; else if (src->paranoia_mode == 1)
if (src->never_skip) paranoia_mode |= PARANOIA_MODE_NEVERSKIP; paranoia_mode = PARANOIA_MODE_OVERLAP;
else
paranoia_mode = PARANOIA_MODE_FULL;
if (src->never_skip)
paranoia_mode |= PARANOIA_MODE_NEVERSKIP;
paranoia_modeset (src->p, paranoia_mode); paranoia_modeset (src->p, paranoia_mode);
if (src->search_overlap != -1) { if (src->search_overlap != -1) {
@ -781,14 +695,7 @@ cdparanoia_close (CDParanoia *src)
paranoia_free (src->p); paranoia_free (src->p);
src->p = NULL; src->p = NULL;
g_free(src->discid); src->total_seconds = 0LL;
src->discid = NULL;
g_free(src->offsets);
src->offsets = NULL;
g_free(src->total_seconds);
src->total_seconds = NULL;
/* close the disc */ /* close the disc */
cdda_close (src->d); cdda_close (src->d);
src->d = NULL; src->d = NULL;
@ -848,8 +755,7 @@ cdparanoia_get_event_mask (GstPad *pad)
} }
static gboolean static gboolean
cdparanoia_event (GstPad *pad, cdparanoia_event (GstPad *pad, GstEvent *event)
GstEvent *event)
{ {
CDParanoia *src; CDParanoia *src;
gint64 offset, endoffset; gint64 offset, endoffset;
@ -862,11 +768,13 @@ cdparanoia_event (GstPad *pad,
format = GST_EVENT_SEEK_FORMAT (event); format = GST_EVENT_SEEK_FORMAT (event);
offset = GST_EVENT_SEEK_OFFSET (event); offset = GST_EVENT_SEEK_OFFSET (event);
if (format == GST_FORMAT_UNITS) { if (format == sector_format) {
start_sector = (int) offset; start_sector = (int) offset;
} else if (format == track_format) { }
else if (format == track_format) {
start_sector = cdda_track_firstsector (src->d, (int) offset); start_sector = cdda_track_firstsector (src->d, (int) offset);
} else { }
else {
goto error; goto error;
} }
@ -878,7 +786,6 @@ cdparanoia_event (GstPad *pad,
paranoia_seek (src->p, src->start_sector, SEEK_SET); paranoia_seek (src->p, src->start_sector, SEEK_SET);
GST_DEBUG (0, "seeked to %d", src->start_sector); GST_DEBUG (0, "seeked to %d", src->start_sector);
break; break;
case GST_SEEK_METHOD_CUR: case GST_SEEK_METHOD_CUR:
src->start_sector += start_sector; src->start_sector += start_sector;
src->cur_sector = src->start_sector; src->cur_sector = src->start_sector;
@ -886,25 +793,24 @@ cdparanoia_event (GstPad *pad,
paranoia_seek (src->p, src->start_sector, SEEK_SET); paranoia_seek (src->p, src->start_sector, SEEK_SET);
GST_DEBUG (0, "seeked to %d", src->start_sector); GST_DEBUG (0, "seeked to %d", src->start_sector);
break; break;
default: default:
break; break;
} }
break; break;
case GST_EVENT_SEEK_SEGMENT: case GST_EVENT_SEEK_SEGMENT:
format = GST_EVENT_SEEK_FORMAT (event); format = GST_EVENT_SEEK_FORMAT (event);
offset = GST_EVENT_SEEK_OFFSET (event); offset = GST_EVENT_SEEK_OFFSET (event);
endoffset = GST_EVENT_SEEK_ENDOFFSET (event); endoffset = GST_EVENT_SEEK_ENDOFFSET (event);
if (format == GST_FORMAT_UNITS) { if (format == sector_format) {
start_sector = (int) offset; start_sector = (int) offset;
end_sector = (int) endoffset; end_sector = (int) endoffset;
} else if (format == track_format) { }
else if (format == track_format) {
start_sector = cdda_track_firstsector (src->d, (int) offset); start_sector = cdda_track_firstsector (src->d, (int) offset);
end_sector = cdda_track_lastsector (src->d, (int) endoffset); end_sector = cdda_track_lastsector (src->d, (int) endoffset);
} else { }
else {
goto error; goto error;
} }
@ -916,37 +822,41 @@ cdparanoia_event (GstPad *pad,
paranoia_seek (src->p, src->start_sector, SEEK_SET); paranoia_seek (src->p, src->start_sector, SEEK_SET);
GST_DEBUG (0, "seeked from %d to %d", src->start_sector, src->end_sector); GST_DEBUG (0, "seeked from %d to %d", src->start_sector, src->end_sector);
break; break;
default: default:
goto error; goto error;
break; break;
} }
gst_event_unref (event);
return TRUE; return TRUE;
error: error:
g_print ("Event error\n"); g_print ("Event error\n");
gst_event_unref (event);
return FALSE; return FALSE;
} }
static const GstFormat * static const GstFormat *
cdparanoia_get_formats (GstPad *pad) cdparanoia_get_formats (GstPad *pad)
{ {
static const GstFormat formats[] = { static GstFormat formats[] = {
GST_FORMAT_TIME, GST_FORMAT_TIME,
GST_FORMAT_UNITS, GST_FORMAT_UNITS,
0,
0,
0 0
}; };
formats[2] = track_format;
formats[3] = sector_format;
return formats; return formats;
} }
static gboolean static gboolean
cdparanoia_convert (GstPad *pad, cdparanoia_convert (GstPad *pad,
GstFormat src_format, GstFormat src_format, gint64 src_value,
gint64 src_value, GstFormat *dest_format, gint64 *dest_value)
GstFormat *dest_format,
gint64 *dest_value)
{ {
gboolean res = TRUE; gboolean res = TRUE;
CDParanoia *src; CDParanoia *src;
@ -956,29 +866,95 @@ cdparanoia_convert (GstPad *pad,
switch (src_format) { switch (src_format) {
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
break; break;
case GST_FORMAT_UNITS:
break;
default: default:
if (src_format == track_format) {
switch (*dest_format) {
case GST_FORMAT_TIME:
*dest_value = src->offsets[src_value] / 75;
break;
case GST_FORMAT_UNITS:
break;
default:
break;
}
}
else if (src_format == sector_format) {
}
else
res = FALSE;
break; break;
} }
return res; return res;
} }
static gboolean
cdparanoia_query (GstPad *pad, GstPadQueryType type,
GstFormat *format, gint64 *value)
{
gboolean res = TRUE;
CDParanoia *src;
src = CDPARANOIA (gst_pad_get_parent (pad));
if (!GST_FLAG_IS_SET (src, CDPARANOIA_OPEN))
return FALSE;
switch (type) {
case GST_PAD_QUERY_TOTAL:
switch (*format) {
case GST_FORMAT_TIME:
*value = src->total_seconds;
break;
case GST_FORMAT_UNITS:
res = FALSE;
break;
default:
if (*format == track_format) {
*value = src->no_tracks;
}
else if (*format == sector_format) {
*value = cdda_disc_lastsector (src->d);
}
else
res = FALSE;
break;
}
break;
case GST_PAD_QUERY_POSITION:
switch (*format) {
default:
break;
}
break;
default:
res = FALSE;
break;
}
return res;
}
static gboolean static gboolean
plugin_init (GModule *module, GstPlugin *plugin) plugin_init (GModule *module, GstPlugin *plugin)
{ {
GstElementFactory *factory; GstElementFactory *factory;
/* create an elementfactory for the cdparanoia element */ /* create an elementfactory for the cdparanoia element */
factory = gst_element_factory_new ("cdparanoia", GST_TYPE_CDPARANOIA, factory = gst_element_factory_new ("cdparanoia",
GST_TYPE_CDPARANOIA,
&cdparanoia_details); &cdparanoia_details);
g_return_val_if_fail (factory != NULL, FALSE); g_return_val_if_fail (factory != NULL, FALSE);
/* register the source's caps */ /* register the source's caps */
gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (cdparanoia_src_factory)); gst_element_factory_add_pad_template (factory,
GST_PAD_TEMPLATE_GET (cdparanoia_src_factory));
/* Register the track format */ /* Register the track format */
track_format = gst_format_register ("track", "The CD track to select"); track_format = gst_format_register ("track", "CD track");
sector_format = gst_format_register ("sector", "CD sector");
/* and add the cdparanoia element factory to the plugin */ /* and add the cdparanoia element factory to the plugin */
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory)); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

View File

@ -74,7 +74,7 @@ struct _CDParanoia {
gchar *device; gchar *device;
gchar *generic_device; gchar *generic_device;
gint start_track, end_track, cur_track; gint start_track, end_track;
gint start_sector, end_sector; gint start_sector, end_sector;
gint last_track; gint last_track;
gint default_sectors; gint default_sectors;
@ -83,7 +83,7 @@ struct _CDParanoia {
gint read_speed; gint read_speed;
gint toc_offset; gint toc_offset;
gboolean toc_bias; gboolean toc_bias;
gboolean never_skip; gint never_skip;
gboolean abort_on_skip; gboolean abort_on_skip;
gint paranoia_mode; gint paranoia_mode;
@ -95,9 +95,9 @@ struct _CDParanoia {
/* hacks by Gordon Irving */ /* hacks by Gordon Irving */
gint no_tracks; gint no_tracks;
gchar *discid; gchar discid[20];
gchar *offsets; gint64 offsets[MAXTRK];
gchar *total_seconds; gint64 total_seconds;
}; };
struct _CDParanoiaClass { struct _CDParanoiaClass {