mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-21 09:53:47 +00:00
ext/taglib/gstid3v2mux.cc: Make UTF-8 the default encoding when writing string tags (before, our UTF-8 strings would ...
Original commit message from CVS: * ext/taglib/gstid3v2mux.cc: Make UTF-8 the default encoding when writing string tags (before, our UTF-8 strings would automatically be converted to ISO-8859-1 by taglib and written as ISO-8859-1 fields if that was possible). * tests/check/elements/id3v2mux.c: (utf8_string_in_buf), (test_taglib_id3mux_check_tag_buffer), (identity_cb), (test_taglib_id3mux_with_tags): Add test case that makes sure our UTF-8 strings have actually been written into the tag as UTF-8.
This commit is contained in:
parent
5f47b3d281
commit
b22fbf9f20
3 changed files with 72 additions and 2 deletions
14
ChangeLog
14
ChangeLog
|
@ -1,3 +1,17 @@
|
||||||
|
2006-07-05 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
|
* ext/taglib/gstid3v2mux.cc:
|
||||||
|
Make UTF-8 the default encoding when writing string
|
||||||
|
tags (before, our UTF-8 strings would automatically
|
||||||
|
be converted to ISO-8859-1 by taglib and written as
|
||||||
|
ISO-8859-1 fields if that was possible).
|
||||||
|
|
||||||
|
* tests/check/elements/id3v2mux.c: (utf8_string_in_buf),
|
||||||
|
(test_taglib_id3mux_check_tag_buffer), (identity_cb),
|
||||||
|
(test_taglib_id3mux_with_tags):
|
||||||
|
Add test case that makes sure our UTF-8 strings have
|
||||||
|
actually been written into the tag as UTF-8.
|
||||||
|
|
||||||
2006-07-04 Tim-Philipp Müller <tim at centricular dot net>
|
2006-07-04 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
* configure.ac:
|
* configure.ac:
|
||||||
|
|
|
@ -408,6 +408,10 @@ gst_id3v2_mux_render_tag (GstTagLibMux * mux, GstTagList * taglist)
|
||||||
GstBuffer *buf;
|
GstBuffer *buf;
|
||||||
guint tag_size;
|
guint tag_size;
|
||||||
|
|
||||||
|
/* write all strings as UTF-8 by default */
|
||||||
|
TagLib::ID3v2::FrameFactory::instance ()->
|
||||||
|
setDefaultTextEncoding (TagLib::String::UTF8);
|
||||||
|
|
||||||
/* Render the tag */
|
/* Render the tag */
|
||||||
gst_tag_list_foreach (taglist, add_one_tag, &id3v2tag);
|
gst_tag_list_foreach (taglist, add_one_tag, &id3v2tag);
|
||||||
|
|
||||||
|
|
|
@ -102,6 +102,38 @@ test_taglib_id3mux_create_tags (guint32 mask)
|
||||||
return tags;
|
return tags;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
utf8_string_in_buf (GstBuffer * buf, const gchar * s)
|
||||||
|
{
|
||||||
|
gint i, len;
|
||||||
|
|
||||||
|
len = strlen (s);
|
||||||
|
for (i = 0; i < (GST_BUFFER_SIZE (buf) - len); ++i) {
|
||||||
|
if (memcmp (GST_BUFFER_DATA (buf) + i, s, len) == 0) {
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
test_taglib_id3mux_check_tag_buffer (GstBuffer * buf, guint32 mask)
|
||||||
|
{
|
||||||
|
/* make sure our UTF-8 string hasn't been put into the tag as ISO-8859-1 */
|
||||||
|
if (mask & (1 << 0)) {
|
||||||
|
fail_unless (utf8_string_in_buf (buf, TEST_ARTIST));
|
||||||
|
}
|
||||||
|
/* make sure our UTF-8 string hasn't been put into the tag as ISO-8859-1 */
|
||||||
|
if (mask & (1 << 1)) {
|
||||||
|
fail_unless (utf8_string_in_buf (buf, TEST_TITLE));
|
||||||
|
}
|
||||||
|
/* make sure our UTF-8 string hasn't been put into the tag as ISO-8859-1 */
|
||||||
|
if (mask & (1 << 2)) {
|
||||||
|
fail_unless (utf8_string_in_buf (buf, TEST_ALBUM));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
test_taglib_id3mux_check_tags (GstTagList * tags, guint32 mask)
|
test_taglib_id3mux_check_tags (GstTagList * tags, guint32 mask)
|
||||||
{
|
{
|
||||||
|
@ -276,15 +308,24 @@ test_taglib_id3mux_check_output_buffer (GstBuffer * buf)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
identity_cb (GstElement * identity, GstBuffer * buf, GstBuffer ** p_tagbuf)
|
||||||
|
{
|
||||||
|
if (*p_tagbuf == NULL) {
|
||||||
|
*p_tagbuf = gst_buffer_ref (buf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
test_taglib_id3mux_with_tags (GstTagList * tags, guint32 mask)
|
test_taglib_id3mux_with_tags (GstTagList * tags, guint32 mask)
|
||||||
{
|
{
|
||||||
GstMessage *msg;
|
GstMessage *msg;
|
||||||
GstTagList *tags_read = NULL;
|
GstTagList *tags_read = NULL;
|
||||||
GstElement *pipeline, *id3mux, *id3demux, *fakesrc;
|
GstElement *pipeline, *id3mux, *id3demux, *fakesrc, *identity;
|
||||||
GstBus *bus;
|
GstBus *bus;
|
||||||
guint64 offset;
|
guint64 offset;
|
||||||
GstBuffer *outbuf = NULL;
|
GstBuffer *outbuf = NULL;
|
||||||
|
GstBuffer *tagbuf = NULL;
|
||||||
|
|
||||||
pipeline = gst_pipeline_new ("pipeline");
|
pipeline = gst_pipeline_new ("pipeline");
|
||||||
g_assert (pipeline != NULL);
|
g_assert (pipeline != NULL);
|
||||||
|
@ -295,6 +336,9 @@ test_taglib_id3mux_with_tags (GstTagList * tags, guint32 mask)
|
||||||
id3mux = gst_element_factory_make ("id3v2mux", "id3v2mux");
|
id3mux = gst_element_factory_make ("id3v2mux", "id3v2mux");
|
||||||
g_assert (id3mux != NULL);
|
g_assert (id3mux != NULL);
|
||||||
|
|
||||||
|
identity = gst_element_factory_make ("identity", "identity");
|
||||||
|
g_assert (identity != NULL);
|
||||||
|
|
||||||
id3demux = gst_element_factory_make ("id3demux", "id3demux");
|
id3demux = gst_element_factory_make ("id3demux", "id3demux");
|
||||||
g_assert (id3demux != NULL);
|
g_assert (id3demux != NULL);
|
||||||
|
|
||||||
|
@ -304,12 +348,13 @@ test_taglib_id3mux_with_tags (GstTagList * tags, guint32 mask)
|
||||||
|
|
||||||
gst_bin_add (GST_BIN (pipeline), fakesrc);
|
gst_bin_add (GST_BIN (pipeline), fakesrc);
|
||||||
gst_bin_add (GST_BIN (pipeline), id3mux);
|
gst_bin_add (GST_BIN (pipeline), id3mux);
|
||||||
|
gst_bin_add (GST_BIN (pipeline), identity);
|
||||||
gst_bin_add (GST_BIN (pipeline), id3demux);
|
gst_bin_add (GST_BIN (pipeline), id3demux);
|
||||||
|
|
||||||
gst_tag_setter_merge_tags (GST_TAG_SETTER (id3mux), tags,
|
gst_tag_setter_merge_tags (GST_TAG_SETTER (id3mux), tags,
|
||||||
GST_TAG_MERGE_APPEND);
|
GST_TAG_MERGE_APPEND);
|
||||||
|
|
||||||
gst_element_link_many (fakesrc, id3mux, id3demux, NULL);
|
gst_element_link_many (fakesrc, id3mux, identity, id3demux, NULL);
|
||||||
|
|
||||||
/* set up source */
|
/* set up source */
|
||||||
g_object_set (fakesrc, "signal-handoffs", TRUE, "can-activate-pull", FALSE,
|
g_object_set (fakesrc, "signal-handoffs", TRUE, "can-activate-pull", FALSE,
|
||||||
|
@ -319,6 +364,9 @@ test_taglib_id3mux_with_tags (GstTagList * tags, guint32 mask)
|
||||||
offset = 0;
|
offset = 0;
|
||||||
g_signal_connect (fakesrc, "handoff", G_CALLBACK (fill_mp3_buffer), &offset);
|
g_signal_connect (fakesrc, "handoff", G_CALLBACK (fill_mp3_buffer), &offset);
|
||||||
|
|
||||||
|
/* set up identity to catch tag buffer */
|
||||||
|
g_signal_connect (identity, "handoff", G_CALLBACK (identity_cb), &tagbuf);
|
||||||
|
|
||||||
gst_element_set_state (pipeline, GST_STATE_PLAYING);
|
gst_element_set_state (pipeline, GST_STATE_PLAYING);
|
||||||
fail_unless (gst_element_get_state (pipeline, NULL, NULL,
|
fail_unless (gst_element_get_state (pipeline, NULL, NULL,
|
||||||
-1) == GST_STATE_CHANGE_SUCCESS);
|
-1) == GST_STATE_CHANGE_SUCCESS);
|
||||||
|
@ -350,6 +398,10 @@ test_taglib_id3mux_with_tags (GstTagList * tags, guint32 mask)
|
||||||
test_taglib_id3mux_check_tags (tags_read, mask);
|
test_taglib_id3mux_check_tags (tags_read, mask);
|
||||||
gst_tag_list_free (tags_read);
|
gst_tag_list_free (tags_read);
|
||||||
|
|
||||||
|
fail_unless (tagbuf != NULL);
|
||||||
|
test_taglib_id3mux_check_tag_buffer (tagbuf, mask);
|
||||||
|
gst_buffer_unref (tagbuf);
|
||||||
|
|
||||||
GST_LOG ("Waiting for EOS ...");
|
GST_LOG ("Waiting for EOS ...");
|
||||||
msg = gst_bus_poll (bus, GST_MESSAGE_EOS | GST_MESSAGE_ERROR, -1);
|
msg = gst_bus_poll (bus, GST_MESSAGE_EOS | GST_MESSAGE_ERROR, -1);
|
||||||
if (GST_MESSAGE_TYPE (msg) == GST_MESSAGE_ERROR) {
|
if (GST_MESSAGE_TYPE (msg) == GST_MESSAGE_ERROR) {
|
||||||
|
|
Loading…
Reference in a new issue