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

tag: id3v2: Port ID3 tag demuxer over to the new GstTagDemux in -base (now would be a good time to test re-importi...

Browse source 
Original commit message from CVS:
* gst-libs/gst/tag/gstid3demux.c:
* gst-libs/gst/tag/gstid3demux.h:
* gst-libs/gst/tag/id3v2.c:
* gst-libs/gst/tag/id3v2.h:
* gst-libs/gst/tag/id3v2frames.c:
Port ID3 tag demuxer over to the new GstTagDemux in -base
(now would be a good time to test re-importing your music
collection).
This commit is contained in:
Tim-Philipp Müller 2007-10-06 16:13:14 +00:00 committed by Tim-Philipp Müller
parent 0277ee0b79
commit 2ff93c3826
3 changed files with 39 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
gst-libs/gst/tag/id3v2.c
View file

@ -35,7 +35,7 @@ static ID3TagsResult
id3demux_id3v2_frames_to_tag_list (ID3TagsWorking * work, guint size); id3demux_id3v2_frames_to_tag_list (ID3TagsWorking * work, guint size);
guint guint
read_synch_uint (guint8 * data, guint size) read_synch_uint (const guint8 * data, guint size)
{ {
gint i; gint i;
guint result = 0; guint result = 0;
@ -62,50 +62,42 @@ read_synch_uint (guint8 * data, guint size)
return result; return result;
} }
ID3TagsResult guint
id3demux_read_id3v1_tag (GstBuffer * buffer, guint * id3v1_size, id3demux_calc_id3v2_tag_size (GstBuffer * buf)
GstTagList ** tags)
{ {
GstTagList *new_tags; guint8 *data, flags;
guint size;
guint8 *data; g_assert (buf != NULL);
g_assert (GST_BUFFER_SIZE (buf) >= ID3V2_HDR_SIZE);
g_return_val_if_fail (buffer != NULL, ID3TAGS_V1_BAD_SIZE); data = GST_BUFFER_DATA (buf);
data = GST_BUFFER_DATA (buffer); /* Check for 'ID3' string at start of buffer */
if (data[0] != 'I' || data[1] != 'D' || data[2] != '3') {
if (GST_BUFFER_SIZE (buffer) != ID3V1_TAG_SIZE) GST_DEBUG ("No ID3v2 tag in data");
return ID3TAGS_V1_BAD_SIZE; return 0;
/* Check that buffer starts with 'TAG' */
if (data[0] != 'T' || data[1] != 'A' || data[2] != 'G') {
if (id3v1_size)
*id3v1_size = 0;
GST_DEBUG ("No ID3v1 tag in data");
return ID3TAGS_READ_TAG;
} }
g_return_val_if_fail (tags != NULL, ID3TAGS_READ_TAG); /* Read the flags */
flags = data[5];
new_tags = gst_tag_list_new_from_id3v1 (GST_BUFFER_DATA (buffer)); /* Read the size from the header */
if (new_tags == NULL) size = read_synch_uint (data + 6, 4);
return ID3TAGS_BROKEN_TAG; if (size == 0)
return ID3V2_HDR_SIZE;
if (*tags) { size += ID3V2_HDR_SIZE;
GstTagList *merged;
merged = gst_tag_list_merge (*tags, new_tags, GST_TAG_MERGE_REPLACE); /* Expand the read size to include a footer if there is one */
gst_tag_list_free (*tags); if ((flags & ID3V2_HDR_FLAG_FOOTER))
gst_tag_list_free (new_tags); size += 10;
*tags = merged;
} else
*tags = new_tags;
if (id3v1_size) GST_DEBUG ("ID3v2 tag, size: %u bytes", size);
*id3v1_size = ID3V1_TAG_SIZE; return size;
return ID3TAGS_READ_TAG;
} }
/* caller must pass buffer with full ID3 tag */
ID3TagsResult ID3TagsResult
id3demux_read_id3v2_tag (GstBuffer * buffer, guint * id3v2_size, id3demux_read_id3v2_tag (GstBuffer * buffer, guint * id3v2_size,
GstTagList ** tags) GstTagList ** tags)
@ -117,49 +109,23 @@ id3demux_read_id3v2_tag (GstBuffer * buffer, guint * id3v2_size,
ID3TagsResult result; ID3TagsResult result;
guint16 version; guint16 version;
g_return_val_if_fail (buffer != NULL, ID3TAGS_MORE_DATA); read_size = id3demux_calc_id3v2_tag_size (buffer);
if (GST_BUFFER_SIZE (buffer) < ID3V2_MARK_SIZE) if (id3v2_size)
return ID3TAGS_MORE_DATA; /* Need more data to decide with */ *id3v2_size = read_size;
/* Ignore tag if it has no frames attached, but skip the header then */
if (read_size <= ID3V2_HDR_SIZE)
return ID3TAGS_BROKEN_TAG;
data = GST_BUFFER_DATA (buffer); data = GST_BUFFER_DATA (buffer);
/* Check for 'ID3' string at start of buffer */
if (data[0] != 'I' || data[1] != 'D' || data[2] != '3') {
if (id3v2_size)
*id3v2_size = 0;
GST_DEBUG ("No ID3v2 tag in data");
return ID3TAGS_READ_TAG;
}
/* OK, get enough data to read the entire header */
if (GST_BUFFER_SIZE (buffer) < ID3V2_HDR_SIZE)
return ID3TAGS_MORE_DATA; /* Need more data to decide with */
/* Read the version */ /* Read the version */
version = GST_READ_UINT16_BE (data + 3); version = GST_READ_UINT16_BE (data + 3);
/* Read the flags */ /* Read the flags */
flags = data[5]; flags = data[5];
/* Read the size from the header */
read_size = read_synch_uint (data + 6, 4);
if (read_size == 0) {
/* Tag has no frames attached. Ignore it, but skip the header */
if (id3v2_size)
*id3v2_size = ID3V2_HDR_SIZE;
return ID3TAGS_BROKEN_TAG;
}
read_size += ID3V2_HDR_SIZE;
/* Expand the read size to include a footer if there is one */
if (flags & ID3V2_HDR_FLAG_FOOTER) {
read_size += 10;
}
if (id3v2_size)
*id3v2_size = read_size;
/* Validate the version. At the moment, we only support up to 2.4.0 */ /* Validate the version. At the moment, we only support up to 2.4.0 */
if (ID3V2_VER_MAJOR (version) > 4 || ID3V2_VER_MINOR (version) > 0) { if (ID3V2_VER_MAJOR (version) > 4 || ID3V2_VER_MINOR (version) > 0) {
GST_WARNING ("ID3v2 tag is from revision 2.%d.%d, " GST_WARNING ("ID3v2 tag is from revision 2.%d.%d, "
@ -168,6 +134,7 @@ id3demux_read_id3v2_tag (GstBuffer * buffer, guint * id3v2_size,
return ID3TAGS_READ_TAG; return ID3TAGS_READ_TAG;
} }
/* This shouldn't really happen! Caller should have checked first */
if (GST_BUFFER_SIZE (buffer) < read_size) { if (GST_BUFFER_SIZE (buffer) < read_size) {
GST_DEBUG GST_DEBUG
("Found ID3v2 tag with revision 2.%d.%d - need %u more bytes to read", ("Found ID3v2 tag with revision 2.%d.%d - need %u more bytes to read",
@ -194,18 +161,7 @@ id3demux_read_id3v2_tag (GstBuffer * buffer, guint * id3v2_size,
result = id3demux_id3v2_frames_to_tag_list (&work, read_size); result = id3demux_id3v2_frames_to_tag_list (&work, read_size);
/* Actually read the tags */
if (work.tags != NULL) {
if (*tags) {
GstTagList *merged;
merged = gst_tag_list_merge (*tags, work.tags, GST_TAG_MERGE_REPLACE);
gst_tag_list_free (*tags);
gst_tag_list_free (work.tags);
*tags = merged;
} else
*tags = work.tags; *tags = work.tags;
}
if (work.prev_genre) if (work.prev_genre)
g_free (work.prev_genre); g_free (work.prev_genre);

9
gst-libs/gst/tag/id3v2.h
View file

@ -31,18 +31,17 @@ G_BEGIN_DECLS
#define ID3V2_HDR_SIZE 10 #define ID3V2_HDR_SIZE 10
typedef enum { typedef enum {
ID3TAGS_V1_BAD_SIZE,
ID3TAGS_MORE_DATA, ID3TAGS_MORE_DATA,
ID3TAGS_READ_TAG, ID3TAGS_READ_TAG,
ID3TAGS_BROKEN_TAG ID3TAGS_BROKEN_TAG
} ID3TagsResult; } ID3TagsResult;
/* From id3tags.c */ /* From id3tags.c */
ID3TagsResult id3demux_read_id3v1_tag (GstBuffer *buffer, guint *id3v1_size, guint id3demux_calc_id3v2_tag_size (GstBuffer * buf);
GstTagList **tags);
ID3TagsResult id3demux_read_id3v2_tag (GstBuffer *buffer, guint *id3v2_size, ID3TagsResult id3demux_read_id3v2_tag (GstBuffer *buffer, guint *id3v2_size,
GstTagList **tags); GstTagList **tags);
G_END_DECLS
guint read_synch_uint (const guint8 * data, guint size);
/* Things shared by id3tags.c and id3v2frames.c */ /* Things shared by id3tags.c and id3v2frames.c */
#define ID3V2_VERSION 0x0400 #define ID3V2_VERSION 0x0400
@ -119,4 +118,6 @@ enum {
/* From id3v2frames.c */ /* From id3v2frames.c */
gboolean id3demux_id3v2_parse_frame (ID3TagsWorking *work); gboolean id3demux_id3v2_parse_frame (ID3TagsWorking *work);
G_END_DECLS
#endif #endif

2
gst-libs/gst/tag/id3v2frames.c
View file

@ -61,8 +61,6 @@ static gboolean parse_picture_frame (ID3TagsWorking * work);
#define ID3V2_ENCODING_UTF16BE 0x02 #define ID3V2_ENCODING_UTF16BE 0x02
#define ID3V2_ENCODING_UTF8 0x03 #define ID3V2_ENCODING_UTF8 0x03
extern guint read_synch_uint (guint8 * data, guint size);
gboolean gboolean
id3demux_id3v2_parse_frame (ID3TagsWorking * work) id3demux_id3v2_parse_frame (ID3TagsWorking * work)
{ {