mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: Handle errors when switching playlists properly

Browse source
This commit is contained in:
Sebastian Dröge 2014-03-30 18:52:38 +02:00
parent 89ca4535eb
commit b86e502a8b
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ext/hls/gsthlsdemux.c
View file

@ -382,6 +382,8 @@ gst_hls_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
/* Use I-frame variants for trick modes */ /* Use I-frame variants for trick modes */
if ((rate > 1.0 || rate < -1.0) && demux->segment.rate >= -1.0 if ((rate > 1.0 || rate < -1.0) && demux->segment.rate >= -1.0
&& demux->segment.rate <= 1.0) { && demux->segment.rate <= 1.0) {
GError *err = NULL;
GST_M3U8_CLIENT_LOCK (demux->client); GST_M3U8_CLIENT_LOCK (demux->client);
/* Switch to I-frame variant */ /* Switch to I-frame variant */
demux->client->main->current_variant = demux->client->main->current_variant =
@ -389,9 +391,16 @@ gst_hls_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
GST_M3U8_CLIENT_UNLOCK (demux->client); GST_M3U8_CLIENT_UNLOCK (demux->client);
gst_m3u8_client_set_current (demux->client, gst_m3u8_client_set_current (demux->client,
demux->client->main->iframe_lists->data); demux->client->main->iframe_lists->data);
gst_uri_downloader_reset (demux->downloader); gst_uri_downloader_reset (demux->downloader);
gst_hls_demux_update_playlist (demux, FALSE, NULL); if (!gst_hls_demux_update_playlist (demux, FALSE, &err)) {
g_rec_mutex_unlock (&demux->stream_lock);
gst_element_post_message (GST_ELEMENT_CAST (demux),
gst_message_new_error (GST_OBJECT_CAST (demux), err,
"Could not switch playlist"));
g_clear_error (&err);
gst_event_unref (event);
return FALSE;
}
demux->discont = TRUE; demux->discont = TRUE;
demux->do_typefind = TRUE; demux->do_typefind = TRUE;
@ -399,6 +408,8 @@ gst_hls_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
demux->current_download_rate * demux->bitrate_limit / ABS (rate)); demux->current_download_rate * demux->bitrate_limit / ABS (rate));
} else if (rate > -1.0 && rate <= 1.0 && (demux->segment.rate < -1.0 } else if (rate > -1.0 && rate <= 1.0 && (demux->segment.rate < -1.0
|| demux->segment.rate > 1.0)) { || demux->segment.rate > 1.0)) {
GError *err = NULL;
GST_M3U8_CLIENT_LOCK (demux->client); GST_M3U8_CLIENT_LOCK (demux->client);
/* Switch to normal variant */ /* Switch to normal variant */
demux->client->main->current_variant = demux->client->main->lists; demux->client->main->current_variant = demux->client->main->lists;
@ -407,7 +418,17 @@ gst_hls_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
demux->client->main->lists->data); demux->client->main->lists->data);
gst_uri_downloader_reset (demux->downloader); gst_uri_downloader_reset (demux->downloader);
gst_hls_demux_update_playlist (demux, FALSE, NULL);
if (!gst_hls_demux_update_playlist (demux, FALSE, &err)) {
g_rec_mutex_unlock (&demux->stream_lock);
gst_element_post_message (GST_ELEMENT_CAST (demux),
gst_message_new_error (GST_OBJECT_CAST (demux), err,
"Could not switch playlist"));
g_clear_error (&err);
gst_event_unref (event);
return FALSE;
}
demux->discont = TRUE; demux->discont = TRUE;
demux->do_typefind = TRUE; demux->do_typefind = TRUE;