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

adaptivedemux: add some reasons on warning reporting

Browse source
This commit is contained in:
Matthew Waters 2017-04-07 16:32:40 +10:00
parent 6d256d9908
commit e212753094
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2408,7 +2408,7 @@ _src_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
stream->download_total_bytes += gst_buffer_get_size (buffer); stream->download_total_bytes += gst_buffer_get_size (buffer);
GST_DEBUG_OBJECT (stream->pad, "Received buffer of size %" G_GSIZE_FORMAT, GST_TRACE_OBJECT (stream->pad, "Received buffer of size %" G_GSIZE_FORMAT,
gst_buffer_get_size (buffer)); gst_buffer_get_size (buffer));
ret = klass->data_received (demux, stream, buffer); ret = klass->data_received (demux, stream, buffer);
@ -3760,7 +3760,8 @@ gst_adaptive_demux_updates_loop (GstAdaptiveDemux * demux)
/* update_failed_count is used only here, no need to protect it */ /* update_failed_count is used only here, no need to protect it */
demux->priv->update_failed_count++; demux->priv->update_failed_count++;
if (demux->priv->update_failed_count <= DEFAULT_FAILED_COUNT) { if (demux->priv->update_failed_count <= DEFAULT_FAILED_COUNT) {
GST_WARNING_OBJECT (demux, "Could not update the playlist"); GST_WARNING_OBJECT (demux, "Could not update the playlist, flow: %s",
gst_flow_get_name (ret));
next_update = gst_adaptive_demux_get_monotonic_time (demux) next_update = gst_adaptive_demux_get_monotonic_time (demux)
+ klass->get_manifest_update_interval (demux) * GST_USECOND; + klass->get_manifest_update_interval (demux) * GST_USECOND;
} else { } else {
@ -4029,9 +4030,10 @@ gst_adaptive_demux_update_manifest_default (GstAdaptiveDemux * demux)
GstFragment *download; GstFragment *download;
GstBuffer *buffer; GstBuffer *buffer;
GstFlowReturn ret; GstFlowReturn ret;
GError *error = NULL;
download = gst_uri_downloader_fetch_uri (demux->downloader, download = gst_uri_downloader_fetch_uri (demux->downloader,
demux->manifest_uri, NULL, TRUE, TRUE, TRUE, NULL); demux->manifest_uri, NULL, TRUE, TRUE, TRUE, &error);
if (download) { if (download) {
g_free (demux->manifest_uri); g_free (demux->manifest_uri);
g_free (demux->manifest_base_uri); g_free (demux->manifest_base_uri);
@ -4050,8 +4052,11 @@ gst_adaptive_demux_update_manifest_default (GstAdaptiveDemux * demux)
/* FIXME: Should the manifest uri vars be reverted to original /* FIXME: Should the manifest uri vars be reverted to original
* values if updating fails? */ * values if updating fails? */
} else { } else {
GST_WARNING_OBJECT (demux, "Failed to download manifest: %s",
error->message);
ret = GST_FLOW_NOT_LINKED; ret = GST_FLOW_NOT_LINKED;
} }
g_clear_error (&error);
return ret; return ret;
} }