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

flacparse: use new baseparse API and fix tag handling

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=679768
This commit is contained in:
Tim-Philipp Müller 2015-08-16 14:37:53 +01:00
parent e9aa4c7467
commit a042a98159
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst/audioparsers/gstflacparse.c
View file

@ -1141,21 +1141,16 @@ gst_flac_parse_handle_picture (GstFlacParse * flacparse, GstBuffer * buffer)
if (gst_byte_reader_get_pos (&reader) + img_len > map.size) if (gst_byte_reader_get_pos (&reader) + img_len > map.size)
goto error; goto error;
if (!flacparse->tags)
flacparse->tags = gst_tag_list_new_empty ();
GST_INFO_OBJECT (flacparse, "Got image of %d bytes", img_len); GST_INFO_OBJECT (flacparse, "Got image of %d bytes", img_len);
if (img_len > 0) { if (img_len > 0) {
if (flacparse->tags == NULL)
flacparse->tags = gst_tag_list_new_empty ();
gst_tag_list_add_id3_image (flacparse->tags, gst_tag_list_add_id3_image (flacparse->tags,
map.data + gst_byte_reader_get_pos (&reader), img_len, img_type); map.data + gst_byte_reader_get_pos (&reader), img_len, img_type);
} }
if (gst_tag_list_is_empty (flacparse->tags)) {
gst_tag_list_unref (flacparse->tags);
flacparse->tags = NULL;
}
gst_buffer_unmap (buffer, &map); gst_buffer_unmap (buffer, &map);
return TRUE; return TRUE;
@ -1704,30 +1699,24 @@ gst_flac_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
GstFlacParse *flacparse = GST_FLAC_PARSE (parse); GstFlacParse *flacparse = GST_FLAC_PARSE (parse);
if (!flacparse->sent_codec_tag) { if (!flacparse->sent_codec_tag) {
GstTagList *taglist;
GstCaps *caps; GstCaps *caps;
taglist = gst_tag_list_new_empty (); if (flacparse->tags == NULL)
flacparse->tags = gst_tag_list_new_empty ();
/* codec tag */ /* codec tag */
caps = gst_pad_get_current_caps (GST_BASE_PARSE_SRC_PAD (parse)); caps = gst_pad_get_current_caps (GST_BASE_PARSE_SRC_PAD (parse));
gst_pb_utils_add_codec_description_to_tag_list (taglist, gst_pb_utils_add_codec_description_to_tag_list (flacparse->tags,
GST_TAG_AUDIO_CODEC, caps); GST_TAG_AUDIO_CODEC, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (flacparse), /* Announce our pending tags */
gst_event_new_tag (taglist)); gst_base_parse_merge_tags (parse, flacparse->tags, GST_TAG_MERGE_REPLACE);
/* also signals the end of first-frame processing */ /* also signals the end of first-frame processing */
flacparse->sent_codec_tag = TRUE; flacparse->sent_codec_tag = TRUE;
} }
/* Push tags */
if (flacparse->tags) {
gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (flacparse),
gst_event_new_tag (flacparse->tags));
flacparse->tags = NULL;
}
/* Push toc */ /* Push toc */
if (flacparse->toc) { if (flacparse->toc) {
gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (flacparse), gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (flacparse),