mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux2: Implement EXT-X-SERVER-CONTROL parsing

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3883>
This commit is contained in:
Jan Schmidt 2022-06-08 14:33:56 +10:00 committed by GStreamer Marge Bot
parent 07f51396af
commit 3ed6a23a4d
2 changed files with 63 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
subprojects/gst-plugins-good/ext/adaptivedemux2/hls/m3u8.c
View file

@ -380,6 +380,10 @@ gst_hls_media_playlist_new (const gchar * uri, const gchar * base_uri)
m3u8->duration = 0;
m3u8->skip_boundary = GST_CLOCK_TIME_NONE;
m3u8->hold_back = GST_CLOCK_TIME_NONE;
m3u8->part_hold_back = GST_CLOCK_TIME_NONE;
g_mutex_init (&m3u8->lock);
m3u8->ref_count = 1;
@ -417,6 +421,18 @@ gst_hls_media_playlist_dump (GstHLSMediaPlaylist * self)
GST_DEBUG ("duration : %" GST_TIME_FORMAT,
GST_TIME_ARGS (self->duration));
GST_DEBUG ("skip boundary : %" GST_TIME_FORMAT,
GST_TIME_ARGS (self->skip_boundary));
GST_DEBUG ("skip dateranges : %s", self->can_skip_dateranges ? "YES" : "NO");
GST_DEBUG ("hold back : %" GST_TIME_FORMAT,
GST_TIME_ARGS (self->hold_back));
GST_DEBUG ("part hold back : %" GST_TIME_FORMAT,
GST_TIME_ARGS (self->part_hold_back));
GST_DEBUG ("can block reloads: %s", self->can_block_reload ? "YES" : "NO");
GST_DEBUG ("Segments : %d", self->segments->len);
for (idx = 0; idx < self->segments->len; idx++) {
GstM3U8MediaSegment *segment = g_ptr_array_index (self->segments, idx);
@ -580,6 +596,42 @@ malformed_line:
}
}
static void
parse_server_control (GstHLSMediaPlaylist * self, gchar * data)
{
gchar *v, *a;
while (data != NULL && parse_attributes (&data, &a, &v)) {
if (strcmp (a, "CAN-SKIP-UNTIL") == 0) {
if (!time_from_double_in_string (v, NULL, &self->skip_boundary)) {
GST_WARNING ("Can't read Skip Boundary value");
goto malformed_line;
}
} else if (strcmp (a, "CAN-SKIP-DATERANGES") == 0) {
self->can_skip_dateranges = g_ascii_strcasecmp (v, "YES") == 0;
} else if (strcmp (a, "HOLD-BACK") == 0) {
if (!time_from_double_in_string (v, NULL, &self->hold_back)) {
GST_WARNING ("Can't read Hold-Back value");
goto malformed_line;
}
} else if (strcmp (a, "PART-HOLD-BACK") == 0) {
if (!time_from_double_in_string (v, NULL, &self->part_hold_back)) {
GST_WARNING ("Can't read Part-Hold-Back value");
goto malformed_line;
}
} else if (strcmp (a, "CAN-BLOCK-RELOAD") == 0) {
self->can_block_reload = g_ascii_strcasecmp (v, "YES") == 0;
}
}
return;
malformed_line:
{
GST_WARNING ("Invalid EXT-X-SERVER-CONTROL entry in playlist");
return;
}
}
/* Parse and create a new GstHLSMediaPlaylist */
GstHLSMediaPlaylist *
gst_hls_media_playlist_parse (gchar * data, const gchar * uri,
@ -905,6 +957,9 @@ gst_hls_media_playlist_parse (gchar * data, const gchar * uri,
}
}
}
} else if (g_str_has_prefix (data_ext_x, "SERVER-CONTROL:")) {
data += strlen ("#EXT-X-SERVER-CONTROL:");
parse_server_control (self, data);
} else {
GST_LOG ("Ignored line: %s", data);
}

8
subprojects/gst-plugins-good/ext/adaptivedemux2/hls/m3u8.h
View file

@ -112,6 +112,14 @@ struct _GstHLSMediaPlaylist
gboolean reloaded; /* If TRUE, this indicates that this playlist
* was reloaded but had identical content */
/* Server-Control directive values */
GstClockTime skip_boundary; /* Skip Boundary from CAN-SKIP-UNTIL */
gboolean can_skip_dateranges; /* TRUE if CAN-SKIP-DATERANGES was YES */
GstClockTime hold_back; /* Hold-Back value, if provided (or CLOCK_TIME_NONE) */
GstClockTime part_hold_back; /* Part-Hold-Back value, if provided (or CLOCK_TIME_NONE */
gboolean can_block_reload; /* TRUE if CAN-BLOCK-RELOAD was YES */
/*< private > */
GMutex lock;