Commit a042a981 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠

flacparse: use new baseparse API and fix tag handling

https://bugzilla.gnome.org/show_bug.cgi?id=679768
parent e9aa4c74
......@@ -1141,21 +1141,16 @@ gst_flac_parse_handle_picture (GstFlacParse * flacparse, GstBuffer * buffer)
if (gst_byte_reader_get_pos (&reader) + img_len > map.size)
goto error;
if (!flacparse->tags)
flacparse->tags = gst_tag_list_new_empty ();
GST_INFO_OBJECT (flacparse, "Got image of %d bytes", img_len);
if (img_len > 0) {
if (flacparse->tags == NULL)
flacparse->tags = gst_tag_list_new_empty ();
gst_tag_list_add_id3_image (flacparse->tags,
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);
return TRUE;
......@@ -1704,30 +1699,24 @@ gst_flac_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
GstFlacParse *flacparse = GST_FLAC_PARSE (parse);
if (!flacparse->sent_codec_tag) {
GstTagList *taglist;
GstCaps *caps;
taglist = gst_tag_list_new_empty ();
if (flacparse->tags == NULL)
flacparse->tags = gst_tag_list_new_empty ();
/* codec tag */
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_caps_unref (caps);
gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (flacparse),
gst_event_new_tag (taglist));
/* Announce our pending tags */
gst_base_parse_merge_tags (parse, flacparse->tags, GST_TAG_MERGE_REPLACE);
/* also signals the end of first-frame processing */
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 */
if (flacparse->toc) {
gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (flacparse),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment