gst/id3demux/: On second thought, it might be wiser and more efficient not to do tag registration from a streaming th...

Original commit message from CVS:
* gst/id3demux/gstid3demux.c: (plugin_init):
* gst/id3demux/id3tags.c:
(id3demux_add_id3v2_frame_blob_to_taglist):
* gst/id3demux/id3tags.h:
On second thought, it might be wiser and more efficient
not to do tag registration from a streaming thread.
This commit is contained in:
Tim-Philipp Müller 2006-07-23 11:33:54 +00:00
parent 92e494c3b1
commit 87b522209f
4 changed files with 17 additions and 7 deletions

View file

@ -1,3 +1,12 @@
2006-07-23 Tim-Philipp Müller <tim at centricular dot net>
* gst/id3demux/gstid3demux.c: (plugin_init):
* gst/id3demux/id3tags.c:
(id3demux_add_id3v2_frame_blob_to_taglist):
* gst/id3demux/id3tags.h:
On second thought, it might be wiser and more efficient
not to do tag registration from a streaming thread.
2006-07-23 Tim-Philipp Müller <tim at centricular dot net>
* gst/id3demux/id3tags.c:

View file

@ -1090,6 +1090,11 @@ plugin_init (GstPlugin * plugin)
gst_tag_register_musicbrainz_tags ();
/* ensure private tag is registered */
gst_tag_register (GST_ID3_DEMUX_TAG_ID3V2_FRAME, GST_TAG_FLAG_META,
GST_TYPE_BUFFER, "ID3v2 frame", "unparsed id3v2 tag frame",
gst_tag_merge_use_first);
return gst_element_register (plugin, "id3demux",
GST_RANK_PRIMARY, GST_TYPE_ID3DEMUX);
}

View file

@ -330,8 +330,6 @@ convert_fid_to_v240 (gchar * frame_id)
}
#define GST_ID3_DEMUX_TAG_ID3V2_FRAME "private-id3v2-frame"
/* add unknown or unhandled ID3v2 frames to the taglist as binary blobs */
static void
id3demux_add_id3v2_frame_blob_to_taglist (ID3TagsWorking * work, guint size)
@ -342,11 +340,6 @@ id3demux_add_id3v2_frame_blob_to_taglist (ID3TagsWorking * work, guint size)
gchar *media_type;
guint frame_size;
/* ensure private tag is registered */
gst_tag_register (GST_ID3_DEMUX_TAG_ID3V2_FRAME, GST_TAG_FLAG_META,
GST_TYPE_BUFFER, "ID3v2 frame", "unparsed id3v2 tag frame",
gst_tag_merge_use_first);
frame_data = work->hdr.frame_data - ID3V2_HDR_SIZE;
frame_size = size + ID3V2_HDR_SIZE;

View file

@ -23,6 +23,9 @@
G_BEGIN_DECLS
/* private tag for storing unprocessed ID3v2 frames */
#define GST_ID3_DEMUX_TAG_ID3V2_FRAME "private-id3v2-frame"
#define ID3V1_TAG_SIZE 128
#define ID3V2_MARK_SIZE 3
#define ID3V2_HDR_SIZE 10