diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2013-12-16 16:07:44 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2013-12-17 12:20:23 +0100 |
| commit | 967a3f1b2ff3cda343241f6917e24fc1c3747390 (patch) | |
| tree | 778bb2c80dd67d0c1a8171b94249ab0421d305ef | |
| parent | f88739cedf8885fde2e394f2f34727870a02f138 (diff) | |
| download | gstreamer-plugins-bad-967a3f1b2ff3cda343241f6917e24fc1c3747390.tar.gz | |
id3tag: Read image-description from the info structure, not the caps
| -rw-r--r-- | gst/id3tag/id3tag.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gst/id3tag/id3tag.c b/gst/id3tag/id3tag.c index 62bf7dd23..8e3b01578 100644 --- a/gst/id3tag/id3tag.c +++ b/gst/id3tag/id3tag.c @@ -726,10 +726,16 @@ add_image_tag (GstId3v2Tag * id3v2tag, const GstTagList * list, s = gst_caps_get_structure (caps, 0); mime_type = gst_structure_get_name (s); if (mime_type != NULL) { - const gchar *desc; + const gchar *desc = NULL; GstId3v2Frame frame; GstMapInfo mapinfo; int encoding; + const GstStructure *info_struct; + + info_struct = gst_sample_get_info (sample); + if (!info_struct + || !gst_structure_has_name (info_struct, "GstTagImageInfo")) + info_struct = NULL; /* APIC frame specifies "-->" if we're providing a URL to the image rather than directly embedding it */ @@ -741,7 +747,8 @@ add_image_tag (GstId3v2Tag * id3v2tag, const GstTagList * list, id3v2_frame_init (&frame, "APIC", 0); - desc = gst_structure_get_string (s, "image-description"); + if (info_struct) + desc = gst_structure_get_string (info_struct, "image-description"); if (!desc) desc = ""; encoding = id3v2_tag_string_encoding (id3v2tag, desc); @@ -752,12 +759,9 @@ add_image_tag (GstId3v2Tag * id3v2tag, const GstTagList * list, if (strcmp (tag, GST_TAG_PREVIEW_IMAGE) == 0) { id3v2_frame_write_uint8 (&frame, ID3V2_APIC_PICTURE_FILE_ICON); } else { - const GstStructure *info_struct; int image_type; - info_struct = gst_sample_get_info (sample); - if (info_struct - && gst_structure_has_name (info_struct, "GstTagImageInfo")) { + if (info_struct) { if (gst_structure_get (info_struct, "image-type", GST_TYPE_TAG_IMAGE_TYPE, &image_type, NULL)) { if (image_type > 0 && image_type <= 18) { |