mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

souphttpsrc: If we had a stop position, allow for the server to finish our connection instead of just cancelling

Browse source 
Otherwise keep-alive does not make much sense and also the server will have
confusing things in the logs.
This commit is contained in:
Sebastian Dröge 2014-03-06 13:35:47 +01:00
parent 224239096d
commit 0c6f1ce998
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ext/soup/gstsouphttpsrc.c
View file

@ -1159,6 +1159,13 @@ gst_soup_http_src_got_chunk_cb (SoupMessage * msg, SoupBuffer * chunk,
GST_DEBUG_OBJECT (src, "got chunk, but not for current message"); GST_DEBUG_OBJECT (src, "got chunk, but not for current message");
return; return;
} }
if (G_UNLIKELY (!src->outbuf)) {
GST_DEBUG_OBJECT (src, "got chunk but we're not expecting one");
src->ret = GST_FLOW_OK;
gst_soup_http_src_cancel_message (src);
return;
}
src->have_body = FALSE; src->have_body = FALSE;
if (G_UNLIKELY (src->session_io_status != if (G_UNLIKELY (src->session_io_status !=
GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING)) { GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
@ -1426,11 +1433,21 @@ gst_soup_http_src_do_request (GstSoupHTTPSrc * src, const gchar * method,
if (src->ret == GST_FLOW_CUSTOM_ERROR) if (src->ret == GST_FLOW_CUSTOM_ERROR)
g_main_loop_run (src->loop); g_main_loop_run (src->loop);
} while (src->ret == GST_FLOW_CUSTOM_ERROR); } while (src->ret == GST_FLOW_CUSTOM_ERROR);
/* Let the request finish if we had a stop position and are there */
if (src->ret == GST_FLOW_OK && src->stop_position != -1
&& src->read_position >= src->stop_position) {
src->outbuf = NULL;
gst_soup_http_src_session_unpause_message (src);
g_main_loop_run (src->loop);
}
if (src->ret == GST_FLOW_CUSTOM_ERROR) if (src->ret == GST_FLOW_CUSTOM_ERROR)
src->ret = GST_FLOW_EOS; src->ret = GST_FLOW_EOS;
g_cond_signal (&src->request_finished_cond); g_cond_signal (&src->request_finished_cond);
return src->ret; return src->ret;
} }