mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

souphttpsrc: EOS immediately if we have an empty seek segment

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=748316
This commit is contained in:
Sebastian Dröge 2015-10-14 15:53:26 +03:00
parent 21c6da6764
commit 51adc9d889
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/soup/gstsouphttpsrc.c
View file

@ -791,13 +791,13 @@ gst_soup_http_src_add_range_header (GstSoupHTTPSrc * src, guint64 offset,
guint64 stop_offset) guint64 stop_offset)
{ {
gchar buf[64]; gchar buf[64];
gint rc; gint rc;
soup_message_headers_remove (src->msg->request_headers, "Range"); soup_message_headers_remove (src->msg->request_headers, "Range");
if (offset || stop_offset != -1) { if (offset || stop_offset != -1) {
if (stop_offset != -1) { if (stop_offset != -1) {
/* FIXME: If stop_offset == 0, this will still download a single byte */ g_assert (offset != stop_offset);
rc = g_snprintf (buf, sizeof (buf), "bytes=%" G_GUINT64_FORMAT "-%" rc = g_snprintf (buf, sizeof (buf), "bytes=%" G_GUINT64_FORMAT "-%"
G_GUINT64_FORMAT, offset, (stop_offset > 0) ? stop_offset - 1 : G_GUINT64_FORMAT, offset, (stop_offset > 0) ? stop_offset - 1 :
stop_offset); stop_offset);
@ -1687,6 +1687,10 @@ gst_soup_http_src_do_request (GstSoupHTTPSrc * src, const gchar * method,
GST_LOG_OBJECT (src, "Running request for method: %s", method); GST_LOG_OBJECT (src, "Running request for method: %s", method);
if (src->msg && (src->request_position != src->read_position)) { if (src->msg && (src->request_position != src->read_position)) {
if (src->session_io_status == GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_IDLE) { if (src->session_io_status == GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_IDLE) {
/* EOS immediately if we have an empty segment */
if (src->request_position == src->stop_position)
return GST_FLOW_EOS;
gst_soup_http_src_add_range_header (src, src->request_position, gst_soup_http_src_add_range_header (src, src->request_position,
src->stop_position); src->stop_position);
} else { } else {
@ -1696,10 +1700,14 @@ gst_soup_http_src_do_request (GstSoupHTTPSrc * src, const gchar * method,
gst_soup_http_src_cancel_message (src); gst_soup_http_src_cancel_message (src);
} }
} }
if (!src->msg) if (!src->msg) {
if (!gst_soup_http_src_build_message (src, method)) { /* EOS immediately if we have an empty segment */
if (src->request_position == src->stop_position)
return GST_FLOW_EOS;
if (!gst_soup_http_src_build_message (src, method))
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
src->ret = GST_FLOW_CUSTOM_ERROR; src->ret = GST_FLOW_CUSTOM_ERROR;
src->outbuf = outbuf; src->outbuf = outbuf;
@ -1711,9 +1719,13 @@ gst_soup_http_src_do_request (GstSoupHTTPSrc * src, const gchar * method,
} }
if (src->retry) { if (src->retry) {
GST_INFO_OBJECT (src, "Reconnecting"); GST_INFO_OBJECT (src, "Reconnecting");
if (!gst_soup_http_src_build_message (src, method)) {
/* EOS immediately if we have an empty segment */
if (src->request_position == src->stop_position)
return GST_FLOW_EOS;
if (!gst_soup_http_src_build_message (src, method))
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
}
src->retry = FALSE; src->retry = FALSE;
continue; continue;
} }