mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 00:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux: Explicitly check for CUSTOM_ERROR when converting errors to EOS

Browse source 
We use things like CUSTOM_SUCCESS* in other places, and those are not errors
but should just be handled like OK.
This commit is contained in:
Sebastian Dröge 2015-07-07 19:48:23 +03:00
parent 4875ddf585
commit 153bb7b273
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/adaptivedemux/gstadaptivedemux.c
View file

@ -1931,7 +1931,7 @@ gst_adaptive_demux_stream_download_fragment (GstAdaptiveDemuxStream * stream)
stream->last_ret, gst_flow_get_name (stream->last_ret));
if (ret != GST_FLOW_OK) {
/* TODO check if we are truly stoping */
if (ret != GST_FLOW_ERROR && gst_adaptive_demux_is_live (demux)) {
if (ret == GST_FLOW_CUSTOM_ERROR && gst_adaptive_demux_is_live (demux)) {
if (++stream->download_error_count <= MAX_DOWNLOAD_ERROR_COUNT) {
/* looks like there is no way of knowing when a live stream has ended
* Have to assume we are falling behind and cause a manifest reload */
@ -1939,7 +1939,7 @@ gst_adaptive_demux_stream_download_fragment (GstAdaptiveDemuxStream * stream)
"Converting error of live stream to EOS");
return GST_FLOW_EOS;
}
} else if (ret != GST_FLOW_ERROR
} else if (ret == GST_FLOW_CUSTOM_ERROR
&& !gst_adaptive_demux_stream_has_next_fragment (demux, stream)) {
/* If this is the last fragment, consider failures EOS and not actual
* errors. Due to rounding errors in the durations, the last fragment