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

hlsdemux: handle more error cases

Browse source 
Handle some more error cases:

1) When the source element fails to go to ready
2) When decryption fails
3) When there is no source to handle a specific URI
4) When the URI is invalid
This commit is contained in:
Thiago Santos 2014-04-29 18:14:14 -03:00
parent 4431388cab
commit 4ab1d9f21f
1 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
ext/hls/gsthlsdemux.c
View file

@ -927,7 +927,8 @@ _src_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
return ret; return ret;
key_failed: key_failed:
/* TODO ERROR here */ /* TODO Raise this error to the user */
GST_WARNING_OBJECT (demux, "Failed to decrypt data");
demux->last_ret = GST_FLOW_ERROR; demux->last_ret = GST_FLOW_ERROR;
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
@ -1071,15 +1072,13 @@ switch_pads (GstHLSDemux * demux)
} }
} }
static gboolean static void
gst_hls_demux_configure_src_pad (GstHLSDemux * demux) gst_hls_demux_configure_src_pad (GstHLSDemux * demux)
{ {
if (G_UNLIKELY (!demux->srcpad || demux->new_playlist)) { if (G_UNLIKELY (!demux->srcpad || demux->new_playlist)) {
switch_pads (demux); switch_pads (demux);
demux->need_segment = TRUE; demux->need_segment = TRUE;
} }
return TRUE;
} }
static void static void
@ -1773,12 +1772,12 @@ decrypt_error:
return NULL; return NULL;
} }
static void static gboolean
gst_hls_demux_update_source (GstHLSDemux * demux, const gchar * uri, gst_hls_demux_update_source (GstHLSDemux * demux, const gchar * uri,
const gchar * referer) const gchar * referer)
{ {
if (!gst_uri_is_valid (uri)) /* TODO error out */ if (!gst_uri_is_valid (uri))
return; return FALSE;
if (demux->src != NULL) { if (demux->src != NULL) {
gchar *old_protocol, *new_protocol; gchar *old_protocol, *new_protocol;
@ -1815,6 +1814,10 @@ gst_hls_demux_update_source (GstHLSDemux * demux, const gchar * uri,
GObjectClass *gobject_class; GObjectClass *gobject_class;
demux->src = gst_element_make_from_uri (GST_URI_SRC, uri, NULL, NULL); demux->src = gst_element_make_from_uri (GST_URI_SRC, uri, NULL, NULL);
if (demux->src == NULL) {
GST_WARNING_OBJECT (demux, "No element to handle uri: %s", uri);
return FALSE;
}
gobject_class = G_OBJECT_GET_CLASS (demux->src); gobject_class = G_OBJECT_GET_CLASS (demux->src);
@ -1839,6 +1842,7 @@ gst_hls_demux_update_source (GstHLSDemux * demux, const gchar * uri,
gst_element_set_locked_state (demux->src, TRUE); gst_element_set_locked_state (demux->src, TRUE);
gst_bin_add (GST_BIN_CAST (demux), demux->src); gst_bin_add (GST_BIN_CAST (demux), demux->src);
} }
return TRUE;
} }
static gboolean static gboolean
@ -1875,23 +1879,31 @@ gst_hls_demux_get_next_fragment (GstHLSDemux * demux,
demux->current_key = key; demux->current_key = key;
demux->current_iv = iv; demux->current_iv = iv;
gst_hls_demux_update_source (demux, next_fragment_uri, if (!gst_hls_demux_update_source (demux, next_fragment_uri,
demux->client->main ? demux->client->main->uri : NULL); demux->client->main ? demux->client->main->uri : NULL)) {
if (!gst_hls_demux_configure_src_pad (demux)) { *err = g_error_new (GST_CORE_ERROR, GST_CORE_ERROR_MISSING_PLUGIN,
*end_of_playlist = FALSE; "Missing plugin to handle URI: '%s'", next_fragment_uri);
g_mutex_unlock (&demux->fragment_download_lock);
return FALSE; return FALSE;
} }
gst_element_set_state (demux->src, GST_STATE_READY); /* TODO check return */ gst_hls_demux_configure_src_pad (demux);
gst_element_send_event (demux->src, gst_event_new_seek (1.0, GST_FORMAT_BYTES,
(GstSeekFlags) GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, range_start,
GST_SEEK_TYPE_SET, range_end));
demux->download_start_time = g_get_monotonic_time (); if (gst_element_set_state (demux->src,
gst_element_sync_state_with_parent (demux->src); GST_STATE_READY) != GST_STATE_CHANGE_FAILURE) {
gst_element_send_event (demux->src, gst_event_new_seek (1.0,
GST_FORMAT_BYTES, (GstSeekFlags) GST_SEEK_FLAG_FLUSH,
GST_SEEK_TYPE_SET, range_start, GST_SEEK_TYPE_SET, range_end));
/* wait for the fragment to be completely downloaded */ demux->download_start_time = g_get_monotonic_time ();
g_cond_wait (&demux->fragment_download_cond, &demux->fragment_download_lock); gst_element_sync_state_with_parent (demux->src);
/* wait for the fragment to be completely downloaded */
g_cond_wait (&demux->fragment_download_cond,
&demux->fragment_download_lock);
} else {
demux->last_ret = GST_FLOW_CUSTOM_ERROR;
}
g_mutex_unlock (&demux->fragment_download_lock); g_mutex_unlock (&demux->fragment_download_lock);
if (demux->last_ret != GST_FLOW_OK) { if (demux->last_ret != GST_FLOW_OK) {