mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-19 22:05:58 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: Use g_ascii_xdigit_value() instead of our own version of it

Browse source
This commit is contained in:
Sebastian Dröge 2014-02-12 14:10:02 +01:00
parent a84220a658
commit dc45d236d2
1 changed files with 5 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
ext/hls/m3u8.c
View file

@ -214,53 +214,6 @@ gst_m3u8_compare_playlist_by_bitrate (gconstpointer a, gconstpointer b)
return ((GstM3U8 *) (a))->bandwidth - ((GstM3U8 *) (b))->bandwidth;
}
static gint
hex_char_to_int (const gchar * v)
{
switch (*v) {
case '0':
return 0;
case '1':
return 1;
case '2':
return 2;
case '3':
return 3;
case '4':
return 4;
case '5':
return 5;
case '6':
return 6;
case '7':
return 7;
case '8':
return 8;
case '9':
return 9;
case 'A':
case 'a':
return 0xa;
case 'B':
case 'b':
return 0xb;
case 'C':
case 'c':
return 0xc;
case 'D':
case 'd':
return 0xd;
case 'E':
case 'e':
return 0xe;
case 'F':
case 'f':
return 0xf;
default:
return -1;
}
}
/*
* @data: a m3u8 playlist text data, taking ownership
*/
@ -451,14 +404,17 @@ gst_m3u8_update (GstM3U8 * self, gchar * data, gboolean * updated)
for (i = 0; i < 16; i++) {
gint h, l;
h = hex_char_to_int (ivp++);
l = hex_char_to_int (ivp++);
h = g_ascii_xdigit_value (*ivp);
ivp++;
l = g_ascii_xdigit_value (*ivp);
ivp++;
if (h == -1 || l == -1) {
i = -1;
break;
}
iv[i] = (h << 4) | l;
}
if (i == -1) {
GST_WARNING ("Can't read IV");
continue;