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

tag: xmp: Remove extra chars from end of xmp packet

Browse Source 
Windows picture viewer is unhappy with extra trailing chars at the
end of the xmppacket footer. So remove them as they aren't needed.
This commit is contained in:
Thiago Santos 2011-06-29 09:59:05 -03:00
parent dc79c42484
commit 96d2120c2b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gst-libs/gst/tag/gstxmptag.c
View File

@ -1317,7 +1317,7 @@ gst_tag_list_from_xmp_buffer (const GstBuffer * buffer)
if (*xp1 != '>') if (*xp1 != '>')
goto missing_header; goto missing_header;
max_ft_len = 1 + strlen ("<?xpacket end=\".\"?>\n"); max_ft_len = 1 + strlen ("<?xpacket end=\".\"?>");
if (len < max_ft_len) if (len < max_ft_len)
goto missing_footer; goto missing_footer;
@ -1848,11 +1848,11 @@ gst_tag_list_to_xmp_buffer_full (const GstTagList * list, gboolean read_only,
" " " " "\n"); " " " " "\n");
} }
} }
g_string_append_printf (data, "<?xpacket end=\"%c\"?>\n", g_string_append_printf (data, "<?xpacket end=\"%c\"?>",
(read_only ? 'r' : 'w')); (read_only ? 'r' : 'w'));
buffer = gst_buffer_new (); buffer = gst_buffer_new ();
GST_BUFFER_SIZE (buffer) = data->len + 1; GST_BUFFER_SIZE (buffer) = data->len;
GST_BUFFER_DATA (buffer) = (guint8 *) g_string_free (data, FALSE); GST_BUFFER_DATA (buffer) = (guint8 *) g_string_free (data, FALSE);
GST_BUFFER_MALLOCDATA (buffer) = GST_BUFFER_DATA (buffer); GST_BUFFER_MALLOCDATA (buffer) = GST_BUFFER_DATA (buffer);

3
tests/check/libs/tag.c
View File

@ -793,8 +793,7 @@ GST_START_TEST (test_xmp_parsing)
"<?xpacket begin=\"\xEF\xBB\xBF\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>" "<?xpacket begin=\"\xEF\xBB\xBF\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>"
"<x:xmpmeta xmlns:x=\"adobe:ns:meta/\" x:xmptk=\"GStreamer\">" "<x:xmpmeta xmlns:x=\"adobe:ns:meta/\" x:xmptk=\"GStreamer\">"
"<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\">"; "<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\">";
const gchar *xmp_footer = const gchar *xmp_footer = "</rdf:RDF>" "</x:xmpmeta>" "<?xpacket end=\"r\"?>";
"</rdf:RDF>" "</x:xmpmeta>" "<?xpacket end=\"r\"?>\n";
struct struct
{ {
const gchar *xmp_data; const gchar *xmp_data;