mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

id3tag: Read image-description from the info structure, not the caps

Browse source
This commit is contained in:
Sebastian Dröge 2013-12-16 16:07:44 +01:00
parent 588b0e342b
commit a27d8d00a6
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/id3tag/id3tag.c
View file

@ -726,10 +726,16 @@ add_image_tag (GstId3v2Tag * id3v2tag, const GstTagList * list,
s = gst_caps_get_structure (caps, 0); s = gst_caps_get_structure (caps, 0);
mime_type = gst_structure_get_name (s); mime_type = gst_structure_get_name (s);
if (mime_type != NULL) { if (mime_type != NULL) {
const gchar *desc; const gchar *desc = NULL;
GstId3v2Frame frame; GstId3v2Frame frame;
GstMapInfo mapinfo; GstMapInfo mapinfo;
int encoding; 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 /* APIC frame specifies "-->" if we're providing a URL to the image
rather than directly embedding it */ rather than directly embedding it */
@ -741,7 +747,8 @@ add_image_tag (GstId3v2Tag * id3v2tag, const GstTagList * list,
id3v2_frame_init (&frame, "APIC", 0); 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) if (!desc)
desc = ""; desc = "";
encoding = id3v2_tag_string_encoding (id3v2tag, 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) { if (strcmp (tag, GST_TAG_PREVIEW_IMAGE) == 0) {
id3v2_frame_write_uint8 (&frame, ID3V2_APIC_PICTURE_FILE_ICON); id3v2_frame_write_uint8 (&frame, ID3V2_APIC_PICTURE_FILE_ICON);
} else { } else {
const GstStructure *info_struct;
int image_type; int image_type;
info_struct = gst_sample_get_info (sample); if (info_struct) {
if (info_struct
&& gst_structure_has_name (info_struct, "GstTagImageInfo")) {
if (gst_structure_get (info_struct, "image-type", if (gst_structure_get (info_struct, "image-type",
GST_TYPE_TAG_IMAGE_TYPE, &image_type, NULL)) { GST_TYPE_TAG_IMAGE_TYPE, &image_type, NULL)) {
if (image_type > 0 && image_type <= 18) { if (image_type > 0 && image_type <= 18) {