FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

id3v2frames: Handle private frames

Browse Source 
Handle PRIV ID3 tag having owner information (string)
and binary data, add to tag messages list.

https://bugzilla.gnome.org/show_bug.cgi?id=730926
This commit is contained in:
Ravi Kiran K N 2014-09-29 14:17:39 +05:30 committed by Tim-Philipp Müller
parent 93a92d7f70
commit df5725e683
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gst-libs/gst/tag/gstid3tag.c
View File

@ -113,6 +113,7 @@ static const GstTagEntryMatch tag_matches[] = {
{GST_TAG_PUBLISHER, "TPUB"}, {GST_TAG_PUBLISHER, "TPUB"},
{GST_TAG_INTERPRETED_BY, "TPE4"}, {GST_TAG_INTERPRETED_BY, "TPE4"},
{GST_TAG_MUSICAL_KEY, "TKEY"}, {GST_TAG_MUSICAL_KEY, "TKEY"},
{GST_TAG_PRIVATE_DATA, "PRIV"},
{NULL, NULL} {NULL, NULL}
}; };

47
gst-libs/gst/tag/id3v2frames.c
View File

@ -59,6 +59,7 @@ static gboolean
id3v2_genre_fields_to_taglist (ID3TagsWorking * work, const gchar * tag_name, id3v2_genre_fields_to_taglist (ID3TagsWorking * work, const gchar * tag_name,
GArray * tag_fields); GArray * tag_fields);
static gboolean parse_picture_frame (ID3TagsWorking * work); static gboolean parse_picture_frame (ID3TagsWorking * work);
static gboolean parse_private_frame_data (ID3TagsWorking * work);
#define ID3V2_ENCODING_ISO8859 0x00 #define ID3V2_ENCODING_ISO8859 0x00
#define ID3V2_ENCODING_UTF16 0x01 #define ID3V2_ENCODING_UTF16 0x01
@ -201,6 +202,9 @@ id3v2_parse_frame (ID3TagsWorking * work)
} else if (!strcmp (work->frame_id, "UFID")) { } else if (!strcmp (work->frame_id, "UFID")) {
/* Unique file identifier */ /* Unique file identifier */
tag_str = parse_unique_file_identifier (work, &tag_name); tag_str = parse_unique_file_identifier (work, &tag_name);
} else if (!strcmp (work->frame_id, "PRIV")) {
/* private frame */
result = parse_private_frame_data (work);
} }
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
if (work->frame_flags & ID3V2_FRAME_FORMAT_COMPRESSION) { if (work->frame_flags & ID3V2_FRAME_FORMAT_COMPRESSION) {
@ -462,6 +466,49 @@ parse_id_string (ID3TagsWorking * work, gchar ** p_str, gint * p_len,
return TRUE; return TRUE;
} }
static gboolean
parse_private_frame_data (ID3TagsWorking * work)
{
GstBuffer *binary_data = NULL;
GstStructure *owner_info = NULL;
guint8 *owner_str = NULL;
gsize owner_len;
GstSample *priv_frame = NULL;
if (work->parse_size == 0) {
/* private frame data not available */
return FALSE;
}
owner_str =
(guint8 *) memchr ((guint8 *) work->parse_data, 0, work->parse_size);
if (owner_str == NULL) {
GST_WARNING ("Invalid PRIV frame received");
return FALSE;
}
owner_len = (gsize) (owner_str - work->parse_data) + 1;
owner_info =
gst_structure_new ("ID3PrivateFrame", "owner", G_TYPE_STRING,
work->parse_data, NULL);
binary_data = gst_buffer_new_and_alloc (work->parse_size - owner_len);
gst_buffer_fill (binary_data, 0, work->parse_data + owner_len,
work->parse_size - owner_len);
priv_frame = gst_sample_new (binary_data, NULL, NULL, owner_info);
gst_tag_list_add (work->tags, GST_TAG_MERGE_APPEND,
GST_TAG_PRIVATE_DATA, priv_frame, NULL);
gst_sample_unref (priv_frame);
gst_buffer_unref (binary_data);
return TRUE;
}
static gchar * static gchar *
parse_unique_file_identifier (ID3TagsWorking * work, const gchar ** tag_name) parse_unique_file_identifier (ID3TagsWorking * work, const gchar ** tag_name)
{ {