mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 14:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/apetag/apedemux.c: Forward tags, too.

Browse source 
Original commit message from CVS:
* gst/apetag/apedemux.c: (gst_ape_demux_parse_tags),
(gst_ape_demux_stream_init):
Forward tags, too.
This commit is contained in:
Ronald S. Bultje 2004-12-04 12:05:34 +00:00
parent 4f3815cb3a
commit 0c3cca89fc
2 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-12-04 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/apetag/apedemux.c: (gst_ape_demux_parse_tags),
(gst_ape_demux_stream_init):
Forward tags, too.
2004-12-04 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/apetag/apedemux.c: (gst_ape_demux_stream_init):

31
gst/apetag/apedemux.c
View file

@ -421,7 +421,7 @@ gst_ape_demux_typefind (GstApeDemux * ape,
* Parse tags from a buffer.
*/
static void
static GstTagList *
gst_ape_demux_parse_tags (GstApeDemux * ape, guint8 * data, gint size)
{
GstTagList *taglist = gst_tag_list_new ();
@ -501,10 +501,13 @@ gst_ape_demux_parse_tags (GstApeDemux * ape, guint8 * data, gint size)
/* let people know */
if (have_tag) {
gst_element_found_tags (GST_ELEMENT (ape), taglist);
/*gst_pad_push (ape->srcpad, GST_DATA (gst_event_new_tag (taglist))); */
/* we'll push it over the srcpad later */
} else {
gst_tag_list_free (taglist);
taglist = NULL;
}
return taglist;
}
/*
@ -518,6 +521,7 @@ gst_ape_demux_stream_init (GstApeDemux * ape)
gboolean seekable = TRUE, res = TRUE;
guint8 *data;
guint32 size = 0;
GstTagList *taglist1 = NULL, *taglist2 = NULL, *taglist = NULL;
GST_LOG ("Initializing stream, stripping tags");
@ -568,7 +572,7 @@ gst_ape_demux_stream_init (GstApeDemux * ape)
goto the_city;
}
}
gst_ape_demux_parse_tags (ape, data, size);
taglist1 = gst_ape_demux_parse_tags (ape, data, size);
ape->start_off = size;
}
@ -633,7 +637,7 @@ gst_ape_demux_stream_init (GstApeDemux * ape)
data += 32;
size -= 32;
}
gst_ape_demux_parse_tags (ape, data, size);
taglist2 = gst_ape_demux_parse_tags (ape, data, size);
ape->end_off = size;
}
@ -671,6 +675,25 @@ gst_ape_demux_stream_init (GstApeDemux * ape)
the_city:
/* become rich & famous */
gst_bytestream_destroy (bs);
if (taglist1 || taglist2) {
if (res) {
/* merge */
if (taglist1 && taglist2) {
taglist = gst_tag_list_merge (taglist1, taglist2,
GST_TAG_MERGE_REPLACE);
gst_tag_list_free (taglist1);
gst_tag_list_free (taglist2);
} else {
taglist = taglist1 ? taglist1 : taglist2;
}
gst_pad_push (ape->srcpad, GST_DATA (gst_event_new_tag (taglist)));
} else {
if (taglist1)
gst_tag_list_free (taglist1);
if (taglist2)
gst_tag_list_free (taglist2);
}
}
return res;
}