Commit 66bbbfb7 authored by Jan Schmidt's avatar Jan Schmidt
Browse files

gst/id3demux/id3v2frames.c: If strings in text fields are marked ISO8859-1,...

gst/id3demux/id3v2frames.c: If strings in text fields are marked ISO8859-1, but contain valid UTF-8 already, then han...

Original commit message from CVS:
* gst/id3demux/id3v2frames.c: (parse_text_identification_frame),
(parse_insert_string_field):
If strings in text fields are marked ISO8859-1, but contain
valid UTF-8 already, then handle them as UTF-8 and ignore
the encoding. (#351794)
parent ad67773c
2006-08-22 Jan Schmidt <thaytan@mad.scientist.com>
* gst/id3demux/id3v2frames.c: (parse_text_identification_frame),
(parse_insert_string_field):
If strings in text fields are marked ISO8859-1, but contain
valid UTF-8 already, then handle them as UTF-8 and ignore
the encoding. (#351794)
2006-08-22 Tim-Philipp Müller <tim at centricular dot net>
* ext/flac/gstflacdec.c: (gst_flac_dec_scan_got_frame),
......
......@@ -273,12 +273,12 @@ parse_text_identification_frame (ID3TagsWorking * work)
work->parse_size - 1, &fields);
if (fields) {
if (fields->len > 0) {
GST_LOG ("Read %d fields from Text ID frame of size %d. First is '%s'",
fields->len, work->parse_size - 1,
GST_LOG ("Read %d fields from Text ID frame of size %d with encoding %d"
". First is '%s'", fields->len, work->parse_size - 1, encoding,
g_array_index (fields, gchar *, 0));
} else {
GST_LOG ("Read %d fields from Text ID frame of size %d", fields->len,
work->parse_size - 1);
GST_LOG ("Read 0 fields from Text ID frame of size %d with encoding %d",
work->parse_size - 1, encoding);
}
}
......@@ -911,8 +911,11 @@ parse_insert_string_field (guint8 encoding, gchar * data, gint data_size,
break;
case ID3V2_ENCODING_ISO8859:
field = g_convert (data, data_size, "UTF-8", "ISO-8859-1",
NULL, NULL, NULL);
if (g_utf8_validate (data, data_size, NULL))
field = g_strndup (data, data_size);
else
field = g_convert (data, data_size, "UTF-8", "ISO-8859-1",
NULL, NULL, NULL);
break;
default:
field = g_strndup (data, data_size);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment