mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

Use new utility functions in libgsttag to process coverart (#512333).

Browse source 
Original commit message from CVS:
* ext/flac/gstflacdec.c: (gst_flac_extract_picture_buffer):
* gst/id3demux/id3v2frames.c: (parse_picture_frame):
Use new utility functions in libgsttag to process coverart (#512333).
This commit is contained in:
Tim-Philipp Müller 2008-06-04 10:42:46 +00:00
parent ef66d037f1
commit 21c48f1a1d
3 changed files with 20 additions and 192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-06-04 Tim-Philipp Müller <tim.muller at collabora co uk>
* ext/flac/gstflacdec.c: (gst_flac_extract_picture_buffer):
* gst/id3demux/id3v2frames.c: (parse_picture_frame):
Use new utility functions in libgsttag to process coverart (#512333).
2008-06-04 Sebastian Dröge <slomo@circular-chaos.org> 2008-06-04 Sebastian Dröge <slomo@circular-chaos.org>
* ext/flac/gstflacdec.c: (gst_flac_dec_write): * ext/flac/gstflacdec.c: (gst_flac_dec_write):

117
ext/flac/gstflacdec.c
View file

@ -635,130 +635,31 @@ gst_flac_dec_scan_for_last_block (GstFlacDec * flacdec, gint64 * samples)
/* FIXME: remove ifndef once we depend on flac >= 1.2.x */ /* FIXME: remove ifndef once we depend on flac >= 1.2.x */
#ifndef LEGACY_FLAC #ifndef LEGACY_FLAC
static gchar *
gst_flac_normalize_picture_mime_type (const gchar * old_mime_type,
gboolean * is_pic_uri)
{
gchar *mime_str;
g_return_val_if_fail (old_mime_type != NULL, NULL);
/* Make lower-case */
mime_str = g_ascii_strdown (old_mime_type, -1);
/* Fix up 'jpg' => 'jpeg' in mime/media type */
if (g_ascii_strcasecmp (mime_str, "jpg") == 0 ||
g_ascii_strcasecmp (mime_str, "image/jpg") == 0) {
g_free (mime_str);
mime_str = g_strdup ("image/jpeg");
}
/* Check if the picture is a URI reference */
*is_pic_uri = (strcmp (mime_str, "-->") == 0);
if (!(*is_pic_uri) && *mime_str && strchr (mime_str, '/') == NULL) {
gchar *tmp = g_strdup_printf ("image/%s", mime_str);
g_free (mime_str);
mime_str = tmp;
}
return mime_str;
}
static void static void
gst_flac_extract_picture_buffer (GstFlacDec * flacdec, gst_flac_extract_picture_buffer (GstFlacDec * dec,
const FLAC__StreamMetadata * metadata) const FLAC__StreamMetadata * metadata)
{ {
/* Most of this is copied from gst/id3demux/id3v2frames.c */
gchar *mime_type;
GstBuffer *image;
GstCaps *image_caps;
FLAC__StreamMetadata_Picture picture; FLAC__StreamMetadata_Picture picture;
GstTagList *tags;
gboolean is_pic_uri;
g_return_if_fail (metadata->type == FLAC__METADATA_TYPE_PICTURE); g_return_if_fail (metadata->type == FLAC__METADATA_TYPE_PICTURE);
GST_LOG ("Got PICTURE block"); GST_LOG ("Got PICTURE block");
picture = metadata->data.picture; picture = metadata->data.picture;
is_pic_uri = FALSE; GST_DEBUG ("declared MIME type is: '%s'", GST_STR_NULL (picture.mime_type));
mime_type = gst_flac_normalize_picture_mime_type (picture.mime_type,
&is_pic_uri);
GST_DEBUG ("PICTURE MIME-type is: \"%s\"", mime_type);
GST_DEBUG ("image data is %u bytes", picture.data_length); GST_DEBUG ("image data is %u bytes", picture.data_length);
if (is_pic_uri) { tags = gst_tag_list_new ();
gchar *uri;
uri = g_strndup ((gchar *) picture.data, picture.data_length); gst_tag_list_add_id3_image (tags, (guint8 *) picture.data,
GST_DEBUG ("image URI: %s", uri); picture.data_length, picture.type);
image = gst_buffer_new (); if (!gst_tag_list_is_empty (tags)) {
GST_BUFFER_MALLOCDATA (image) = (guint8 *) uri; /* take ownership */ gst_element_found_tags_for_pad (GST_ELEMENT (dec), dec->srcpad, tags);
GST_BUFFER_DATA (image) = (guint8 *) uri;
GST_BUFFER_SIZE (image) = picture.data_length;
image_caps = gst_caps_new_simple ("text/uri-list", NULL);
}
else {
image = gst_buffer_new_and_alloc (picture.data_length);
memcpy (GST_BUFFER_DATA (image), picture.data, picture.data_length);
/* if possible use GStreamer media type rather than declared type */
image_caps = gst_type_find_helper_for_buffer (NULL, image, NULL);
if (image_caps) {
GST_DEBUG ("Found GStreamer media type: %" GST_PTR_FORMAT, image_caps);
} else if (mime_type && *mime_type) {
GST_DEBUG ("No GStreamer media type found, using declared type: \"%s\"",
mime_type);
image_caps = gst_caps_new_simple (mime_type, NULL);
} else {
GST_DEBUG ("Empty declared mime type, ignoring image frame");
image = NULL;
image_caps = NULL;
}
}
g_free (mime_type);
if (image && image_caps) {
GstTagList *tags = gst_tag_list_new ();
if (picture.type == 1 || picture.type == 2) {
/* file icon for preview. Don't add image-type to caps, since it only
* makes sense for there to be one of these. */
gst_buffer_set_caps (image, image_caps);
gst_tag_list_add (tags, GST_TAG_MERGE_APPEND,
GST_TAG_PREVIEW_IMAGE, image, NULL);
} else {
GstTagImageType gst_tag_pic_type = GST_TAG_IMAGE_TYPE_UNDEFINED;
if (picture.type >= 0x03 && picture.type <= 0x14)
gst_tag_pic_type = (GstTagImageType) ((gint) (picture.type) - 2);
gst_structure_set (gst_caps_get_structure (image_caps, 0),
"image-type", GST_TYPE_TAG_IMAGE_TYPE, gst_tag_pic_type, NULL);
gst_buffer_set_caps (image, image_caps);
gst_tag_list_add (tags, GST_TAG_MERGE_APPEND, GST_TAG_IMAGE, image, NULL);
}
gst_caps_unref (image_caps);
gst_buffer_unref (image);
/* Announce discovered tags */
gst_element_found_tags_for_pad (GST_ELEMENT (flacdec), flacdec->srcpad,
tags);
} else { } else {
if (image)
gst_buffer_unref (image);
GST_DEBUG ("problem parsing PICTURE block, skipping"); GST_DEBUG ("problem parsing PICTURE block, skipping");
gst_tag_list_free (tags);
} }
} }
#endif /* LEGACY_FLAC */ #endif /* LEGACY_FLAC */

89
gst/id3demux/id3v2frames.c
View file

@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2 -*- */ /* -*- Mode: C; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2 -*- */
/* Copyright 2006 Tim-Philipp Müller <tim centricular net> /* Copyright 2006-2008 Tim-Philipp Müller <tim centricular net>
* Copyright 2005 Jan Schmidt <thaytan@mad.scientist.com> * Copyright 2005 Jan Schmidt <thaytan@mad.scientist.com>
* Copyright 2002,2003 Scott Wheeler <wheeler@kde.org> (portions from taglib) * Copyright 2002,2003 Scott Wheeler <wheeler@kde.org> (portions from taglib)
* *
@ -493,11 +493,8 @@ scan_encoded_string (guint8 encoding, gchar * data, gint data_size)
static gboolean static gboolean
parse_picture_frame (ID3TagsWorking * work) parse_picture_frame (ID3TagsWorking * work)
{ {
GstBuffer *image = NULL;
GstCaps *image_caps = NULL;
gboolean is_pic_uri = FALSE;
guint8 txt_encoding, pic_type; guint8 txt_encoding, pic_type;
gchar *c, *mime_str = NULL; gchar *mime_str = NULL;
gint len, datalen; gint len, datalen;
GST_LOG ("APIC frame (ID3v2.%u)", ID3V2_VER_MAJOR (work->hdr.version)); GST_LOG ("APIC frame (ID3v2.%u)", ID3V2_VER_MAJOR (work->hdr.version));
@ -524,29 +521,6 @@ parse_picture_frame (ID3TagsWorking * work)
++len; /* for string terminator */ ++len; /* for string terminator */
} }
/* Fix up 'jpg' => 'jpeg' in mime/media type */
if (mime_str != NULL &&
(g_ascii_strcasecmp (mime_str, "jpg") == 0 ||
g_ascii_strcasecmp (mime_str, "image/jpg") == 0)) {
g_free (mime_str);
mime_str = g_strdup ("jpeg");
}
/* Make lower-case */
for (c = mime_str; c != NULL && *c != '\0'; ++c) {
*c = g_ascii_tolower (*c);
}
is_pic_uri = (mime_str != NULL && strcmp (mime_str, "-->") == 0);
if (mime_str && *mime_str && strchr (mime_str, '/') == NULL && !is_pic_uri) {
gchar *tmp;
tmp = g_strdup_printf ("image/%s", mime_str);
g_free (mime_str);
mime_str = tmp;
}
if (work->parse_size < len + 1 + 1 + 1) if (work->parse_size < len + 1 + 1 + 1)
goto not_enough_data; goto not_enough_data;
@ -584,62 +558,9 @@ parse_picture_frame (ID3TagsWorking * work)
if (work->parse_size <= 0) if (work->parse_size <= 0)
goto not_enough_data; goto not_enough_data;
if (is_pic_uri) { if (!gst_tag_list_add_id3_image (work->tags, (guint8 *) work->parse_data,
gchar *uri; work->parse_size, pic_type)) {
goto error;
uri = g_strndup ((gchar *) work->parse_data, work->parse_size);
GST_DEBUG ("image URI: %s", uri);
image = gst_buffer_new ();
GST_BUFFER_MALLOCDATA (image) = (guint8 *) uri; /* take ownership */
GST_BUFFER_DATA (image) = (guint8 *) uri;
GST_BUFFER_SIZE (image) = work->parse_size;
image_caps = gst_caps_new_simple ("text/uri-list", NULL);
} else {
image = gst_buffer_new_and_alloc (work->parse_size);
memcpy (GST_BUFFER_DATA (image), work->parse_data, work->parse_size);
/* if possible use GStreamer media type rather than declared type */
image_caps = gst_type_find_helper_for_buffer (NULL, image, NULL);
if (image_caps) {
GST_DEBUG ("Found GStreamer media type: %" GST_PTR_FORMAT, image_caps);
} else if (mime_str && *mime_str) {
GST_DEBUG ("No GStreamer media type found, using declared type");
image_caps = gst_caps_new_simple (mime_str, NULL);
} else {
GST_DEBUG ("Empty declared mime type, ignoring image frame");
image = NULL;
image_caps = NULL;
goto error;
}
}
if (image && image_caps) {
if (pic_type == 0x01 || pic_type == 0x02) {
/* file icon for preview. Don't add image-type to caps, since there
* is only supposed to be one of these. */
gst_buffer_set_caps (image, image_caps);
gst_tag_list_add (work->tags, GST_TAG_MERGE_APPEND,
GST_TAG_PREVIEW_IMAGE, image, NULL);
} else {
GstTagImageType gst_tag_pic_type = GST_TAG_IMAGE_TYPE_UNDEFINED;
/* Remap the ID3v2 APIC type our ImageType enum */
if (pic_type >= 0x3 && pic_type <= 0x14)
gst_tag_pic_type = (GstTagImageType) (pic_type - 2);
gst_structure_set (gst_caps_get_structure (image_caps, 0),
"image-type", GST_TYPE_TAG_IMAGE_TYPE, gst_tag_pic_type, NULL);
gst_buffer_set_caps (image, image_caps);
gst_tag_list_add (work->tags, GST_TAG_MERGE_APPEND,
GST_TAG_IMAGE, image, NULL);
}
gst_caps_unref (image_caps);
gst_buffer_unref (image);
} }
g_free (mime_str); g_free (mime_str);