diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-06-19 09:53:00 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-06-19 18:34:05 +0200 |
| commit | 1e795ccce1f36c62717847a121c9e3bc3d269bf5 (patch) | |
| tree | 63f716abba6f383ea4f558997f2956c2a22b0aad | |
| parent | 213883eb5127b447ec23d8a5d7b28d572b77adf8 (diff) | |
| download | gstreamer-plugins-bad-1e795ccce1f36c62717847a121c9e3bc3d269bf5.tar.gz | |
hlsdemux: Propagate error messages from the source element up in the hierarchy
Instead of inventing our own generic error strings which are mostly useless.
| -rw-r--r-- | ext/hls/gsthlsdemux.c | 17 | ||||
| -rw-r--r-- | ext/hls/gsthlsdemux.h | 1 |
2 files changed, 15 insertions, 3 deletions
diff --git a/ext/hls/gsthlsdemux.c b/ext/hls/gsthlsdemux.c index a366abf52..13ea0479e 100644 --- a/ext/hls/gsthlsdemux.c +++ b/ext/hls/gsthlsdemux.c @@ -365,6 +365,8 @@ gst_hls_demux_handle_message (GstBin * bin, GstMessage * msg) /* error, but ask to retry */ g_mutex_lock (&demux->fragment_download_lock); demux->last_ret = GST_FLOW_CUSTOM_ERROR; + g_clear_error (&demux->last_error); + demux->last_error = g_error_copy (err); g_cond_signal (&demux->fragment_download_cond); g_mutex_unlock (&demux->fragment_download_lock); @@ -1311,6 +1313,8 @@ gst_hls_demux_reset (GstHLSDemux * demux, gboolean dispose) gst_element_set_state (demux->src, GST_STATE_NULL); } + g_clear_error (&demux->last_error); + if (demux->adapter) gst_adapter_clear (demux->adapter); if (demux->pending_buffer) @@ -1978,6 +1982,7 @@ gst_hls_demux_get_next_fragment (GstHLSDemux * demux, /* Reset last flow return */ demux->last_ret = GST_FLOW_OK; + g_clear_error (&demux->last_error); if (!gst_hls_demux_update_source (demux, next_fragment_uri, demux->client->main ? demux->client->main->uri : NULL, @@ -2028,9 +2033,15 @@ gst_hls_demux_get_next_fragment (GstHLSDemux * demux, if (demux->last_ret != GST_FLOW_OK) { gst_element_set_state (demux->src, GST_STATE_NULL); - if (*err == NULL) - *err = g_error_new (GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_FAILED, - "Failed to download fragment"); + if (*err == NULL) { + if (demux->last_error) { + *err = demux->last_error; + demux->last_error = NULL; + } else { + *err = g_error_new (GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_FAILED, + "Failed to download fragment"); + } + } } else { gst_element_set_state (demux->src, GST_STATE_READY); if (demux->segment.rate > 0) diff --git a/ext/hls/gsthlsdemux.h b/ext/hls/gsthlsdemux.h index 988965c40..5b8e69b51 100644 --- a/ext/hls/gsthlsdemux.h +++ b/ext/hls/gsthlsdemux.h @@ -125,6 +125,7 @@ struct _GstHLSDemux gint64 download_total_time; gint64 download_total_bytes; GstFlowReturn last_ret; + GError *last_error; /* decryption tooling */ #ifdef HAVE_NETTLE |