mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-30 07:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

flacenc: Fix handling of image tags

Browse source 
The caps should be used to get the mimetype and there is
only an info structure for the GstSample if the image-type
is not NONE.
This commit is contained in:
Sebastian Dröge 2013-07-28 18:09:33 +02:00
parent 2fa5c708f3
commit c12c9e7632
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ext/flac/gstflacenc.c
View file

@ -615,6 +615,7 @@ gst_flac_enc_set_metadata (GstFlacEnc * flacenc, GstAudioInfo * info,
if (n_images + n_preview_images > 0) { if (n_images + n_preview_images > 0) {
GstSample *sample; GstSample *sample;
GstBuffer *buffer; GstBuffer *buffer;
GstCaps *caps;
const GstStructure *structure; const GstStructure *structure;
GstTagImageType image_type = GST_TAG_IMAGE_TYPE_NONE; GstTagImageType image_type = GST_TAG_IMAGE_TYPE_NONE;
gint i; gint i;
@ -631,16 +632,22 @@ gst_flac_enc_set_metadata (GstFlacEnc * flacenc, GstAudioInfo * info,
} }
structure = gst_sample_get_info (sample); structure = gst_sample_get_info (sample);
if (!structure) { caps = gst_sample_get_caps (sample);
GST_ERROR_OBJECT (flacenc, "No image tag info"); if (!caps) {
GST_FIXME_OBJECT (flacenc, "Image tag without caps");
gst_sample_unref (sample);
continue; continue;
} }
flacenc->meta[entries] = flacenc->meta[entries] =
FLAC__metadata_object_new (FLAC__METADATA_TYPE_PICTURE); FLAC__metadata_object_new (FLAC__METADATA_TYPE_PICTURE);
gst_structure_get (structure, "image-type", GST_TYPE_TAG_IMAGE_TYPE, if (structure)
&image_type, NULL); gst_structure_get (structure, "image-type", GST_TYPE_TAG_IMAGE_TYPE,
&image_type, NULL);
else
image_type = GST_TAG_IMAGE_TYPE_NONE;
/* Convert to ID3v2 APIC image type */ /* Convert to ID3v2 APIC image type */
if (image_type == GST_TAG_IMAGE_TYPE_NONE) if (image_type == GST_TAG_IMAGE_TYPE_NONE)
image_type = (i < n_images) ? 0x00 : 0x01; image_type = (i < n_images) ? 0x00 : 0x01;
@ -655,6 +662,9 @@ gst_flac_enc_set_metadata (GstFlacEnc * flacenc, GstAudioInfo * info,
/* FIXME: There's no way to set the picture type in libFLAC */ /* FIXME: There's no way to set the picture type in libFLAC */
flacenc->meta[entries]->data.picture.type = image_type; flacenc->meta[entries]->data.picture.type = image_type;
structure = gst_caps_get_structure (caps, 0);
FLAC__metadata_object_picture_set_mime_type (flacenc->meta[entries], FLAC__metadata_object_picture_set_mime_type (flacenc->meta[entries],
(char *) gst_structure_get_name (structure), TRUE); (char *) gst_structure_get_name (structure), TRUE);