mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-06 06:22:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

typefindfunctions: only typefind text with a BOM as text/utf16 or text/utf32

Browse source 
We added the utf typefinder because the mp3 typefinder was a tad
overzealous when it came to typefinding things as mp3, and replaced
it with even more overzealous utf16/32 typefinders.

Fixes unit test.
This commit is contained in:
Tim-Philipp Müller 2011-12-09 01:31:20 +00:00
parent 91bbfbd819
commit debe9caa36
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/typefind/gsttypefindfunctions.c
View file

@ -281,7 +281,7 @@ check_utf32 (const guint8 * data, gint len, gint endianness)
static void static void
unicode_type_find (GstTypeFind * tf, const GstUnicodeTester * tester, unicode_type_find (GstTypeFind * tf, const GstUnicodeTester * tester,
guint n_tester, const char *media_type) guint n_tester, const char *media_type, gboolean require_bom)
{ {
size_t n; size_t n;
gint len = 4; gint len = 4;
@ -313,6 +313,8 @@ unicode_type_find (GstTypeFind * tf, const GstUnicodeTester * tester,
if (!memcmp (data, tester[n].bom, tester[n].bomlen)) if (!memcmp (data, tester[n].bom, tester[n].bomlen))
bom_boost = tester[n].boost; bom_boost = tester[n].boost;
} }
if (require_bom && bom_boost == 0)
continue;
if (!(*tester[n].checker) (data, len, tester[n].endianness)) if (!(*tester[n].checker) (data, len, tester[n].endianness))
continue; continue;
tmpprob = GST_TYPE_FIND_POSSIBLE - 20 + bom_boost; tmpprob = GST_TYPE_FIND_POSSIBLE - 20 + bom_boost;
@ -342,7 +344,7 @@ utf16_type_find (GstTypeFind * tf, gpointer unused)
{2, "\xfe\xff", check_utf16, 20, G_BIG_ENDIAN}, {2, "\xfe\xff", check_utf16, 20, G_BIG_ENDIAN},
}; };
unicode_type_find (tf, utf16tester, G_N_ELEMENTS (utf16tester), unicode_type_find (tf, utf16tester, G_N_ELEMENTS (utf16tester),
"text/utf-16"); "text/utf-16", TRUE);
} }
static GstStaticCaps utf32_caps = GST_STATIC_CAPS ("text/utf-32"); static GstStaticCaps utf32_caps = GST_STATIC_CAPS ("text/utf-32");
@ -357,7 +359,7 @@ utf32_type_find (GstTypeFind * tf, gpointer unused)
{4, "\x00\x00\xfe\xff", check_utf32, 20, G_BIG_ENDIAN} {4, "\x00\x00\xfe\xff", check_utf32, 20, G_BIG_ENDIAN}
}; };
unicode_type_find (tf, utf32tester, G_N_ELEMENTS (utf32tester), unicode_type_find (tf, utf32tester, G_N_ELEMENTS (utf32tester),
"text/utf-32"); "text/utf-32", TRUE);
} }
/*** text/uri-list ***/ /*** text/uri-list ***/