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

cdio: use gst_tag_freeform_string_to_utf8() for CD-TEXT strings

Browse source 
They're probably not going to be UTF-8, but ISO-8859-1 or somesuch
if they're not plain ASCII.
This commit is contained in:
Tim-Philipp Müller 2012-11-11 20:42:42 +00:00
parent cf3e901996
commit c4335cf663
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/cdio/Makefile.am
View file

@ -11,7 +11,7 @@ libgstcdio_la_CFLAGS = \
$(CDIO_CFLAGS) $(CDIO_CFLAGS)
libgstcdio_la_LIBADD = \ libgstcdio_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) -lgsttag-$(GST_API_VERSION) \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(CDIO_LIBS) $(CDIO_LIBS)

24
ext/cdio/gstcdio.c
View file

@ -23,6 +23,7 @@
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/tag/tag.h>
static gboolean plugin_init (GstPlugin * plugin); static gboolean plugin_init (GstPlugin * plugin);
@ -31,7 +32,7 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
cdio, cdio,
"Read audio from audio CDs", "Read audio from audio CDs",
plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
#include "gstcdio.h" #include "gstcdio.h"
#include "gstcdiocddasrc.h" #include "gstcdiocddasrc.h"
@ -44,7 +45,9 @@ void
gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track, gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track,
cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags)
{ {
const gchar *vars[] = { "GST_CDTEXT_TAG_ENCODING", "GST_TAG_ENCODING", NULL };
const gchar *txt; const gchar *txt;
gchar *txt_utf8;
#if LIBCDIO_VERSION_NUM > 83 #if LIBCDIO_VERSION_NUM > 83
txt = cdtext_get_const (cdtext, field, track); txt = cdtext_get_const (cdtext, field, track);
@ -56,19 +59,26 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track,
return; return;
} }
/* FIXME: beautify strings (they might be all uppercase for example)? */ /* The character encoding is not specified, and there is no provision
/* FIXME: what encoding are these strings in? Let's hope ASCII or UTF-8 */ * for indicating in the CD-Text data which encoding is in use.. */
if (!g_utf8_validate (txt, -1, NULL)) { txt_utf8 = gst_tag_freeform_string_to_utf8 (txt, -1, vars);
GST_WARNING_OBJECT (src, "CD-TEXT string is not UTF-8! (%s)", gst_tag);
if (txt_utf8 == NULL) {
GST_WARNING_OBJECT (src, "CD-TEXT %s could not be converted to UTF-8, "
"try setting the GST_CDTEXT_TAG_ENCODING or GST_TAG_ENCODING "
"environment variable", gst_tag);
return; return;
} }
/* FIXME: beautify strings (they might be all uppercase for example)? */
if (*p_tags == NULL) if (*p_tags == NULL)
*p_tags = gst_tag_list_new_empty (); *p_tags = gst_tag_list_new_empty ();
gst_tag_list_add (*p_tags, GST_TAG_MERGE_REPLACE, gst_tag, txt, NULL); gst_tag_list_add (*p_tags, GST_TAG_MERGE_REPLACE, gst_tag, txt_utf8, NULL);
GST_DEBUG_OBJECT (src, "CD-TEXT: %s = %s", gst_tag, txt); GST_DEBUG_OBJECT (src, "CD-TEXT: %s = %s", gst_tag, txt_utf8);
g_free (txt_utf8);
} }
GstTagList * GstTagList *