mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-17 11:45:25 +00:00
Revert "souphttpsrc: reduce reading latency by using non-blocking read"
This reverts commit 8816764112.
It causes issues with the timeouts, and causes connections to be closed
without actual reason. Needs further investigation.
https://bugzilla.gnome.org/show_bug.cgi?id=773509
This commit is contained in:
Sebastian Dröge
parent
9ba6fb86d8
commit
60d30db912
2 changed files with 16 additions and 105 deletions
|
|
@ -77,7 +77,6 @@
|
|||
#endif
|
||||
#include <gst/gstelement.h>
|
||||
#include <gst/gst-i18n-plugin.h>
|
||||
#include <gio/gio.h>
|
||||
#include <libsoup/soup.h>
|
||||
#include "gstsouphttpsrc.h"
|
||||
#include "gstsouputils.h"
|
||||
|
|
@ -183,7 +182,6 @@ static void gst_soup_http_src_got_headers (GstSoupHTTPSrc * src,
|
|||
static void gst_soup_http_src_authenticate_cb (SoupSession * session,
|
||||
SoupMessage * msg, SoupAuth * auth, gboolean retrying,
|
||||
GstSoupHTTPSrc * src);
|
||||
static void gst_soup_http_src_destroy_input_stream (GstSoupHTTPSrc * src);
|
||||
|
||||
#define gst_soup_http_src_parent_class parent_class
|
||||
G_DEFINE_TYPE_WITH_CODE (GstSoupHTTPSrc, gst_soup_http_src, GST_TYPE_PUSH_SRC,
|
||||
|
|
@ -451,7 +449,10 @@ gst_soup_http_src_reset (GstSoupHTTPSrc * src)
|
|||
|
||||
src->ret = GST_FLOW_OK;
|
||||
g_cancellable_reset (src->cancellable);
|
||||
gst_soup_http_src_destroy_input_stream (src);
|
||||
if (src->input_stream) {
|
||||
g_object_unref (src->input_stream);
|
||||
src->input_stream = NULL;
|
||||
}
|
||||
|
||||
gst_caps_replace (&src->src_caps, NULL);
|
||||
g_free (src->iradio_name);
|
||||
|
|
@ -470,7 +471,6 @@ gst_soup_http_src_init (GstSoupHTTPSrc * src)
|
|||
g_mutex_init (&src->mutex);
|
||||
g_cond_init (&src->have_headers_cond);
|
||||
src->cancellable = g_cancellable_new ();
|
||||
src->poll_context = g_main_context_new ();
|
||||
src->location = NULL;
|
||||
src->redirection_uri = NULL;
|
||||
src->automatic_redirect = TRUE;
|
||||
|
|
@ -526,7 +526,6 @@ gst_soup_http_src_finalize (GObject * gobject)
|
|||
g_mutex_clear (&src->mutex);
|
||||
g_cond_clear (&src->have_headers_cond);
|
||||
g_object_unref (src->cancellable);
|
||||
g_main_context_unref (src->poll_context);
|
||||
g_free (src->location);
|
||||
g_free (src->redirection_uri);
|
||||
g_free (src->user_agent);
|
||||
|
|
@ -776,21 +775,6 @@ gst_soup_http_src_unicodify (const gchar * str)
|
|||
return gst_tag_freeform_string_to_utf8 (str, -1, env_vars);
|
||||
}
|
||||
|
||||
static void
|
||||
gst_soup_http_src_destroy_input_stream (GstSoupHTTPSrc * src)
|
||||
{
|
||||
if (src->input_stream) {
|
||||
if (src->poll_source) {
|
||||
g_source_destroy (src->poll_source);
|
||||
g_source_unref (src->poll_source);
|
||||
src->poll_source = NULL;
|
||||
}
|
||||
g_input_stream_close (src->input_stream, src->cancellable, NULL);
|
||||
g_object_unref (src->input_stream);
|
||||
src->input_stream = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gst_soup_http_src_cancel_message (GstSoupHTTPSrc * src)
|
||||
{
|
||||
|
|
@ -1401,25 +1385,11 @@ gst_soup_http_src_build_message (GstSoupHTTPSrc * src, const gchar * method)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
gst_soup_http_src_check_input_stream_interfaces (GstSoupHTTPSrc * src)
|
||||
{
|
||||
if (!src->input_stream)
|
||||
return;
|
||||
|
||||
src->has_pollable_interface = G_IS_POLLABLE_INPUT_STREAM (src->input_stream)
|
||||
&& g_pollable_input_stream_can_poll ((GPollableInputStream *)
|
||||
src->input_stream);
|
||||
}
|
||||
|
||||
static GstFlowReturn
|
||||
gst_soup_http_src_send_message (GstSoupHTTPSrc * src)
|
||||
{
|
||||
g_return_val_if_fail (src->msg != NULL, GST_FLOW_ERROR);
|
||||
|
||||
g_assert (src->input_stream == NULL);
|
||||
g_assert (src->poll_source == NULL);
|
||||
|
||||
/* FIXME We are ignoring the GError here, might be useful to debug */
|
||||
src->input_stream =
|
||||
soup_session_send (src->session, src->msg, src->cancellable, NULL);
|
||||
|
|
@ -1444,8 +1414,6 @@ gst_soup_http_src_send_message (GstSoupHTTPSrc * src)
|
|||
return GST_FLOW_ERROR;
|
||||
}
|
||||
|
||||
gst_soup_http_src_check_input_stream_interfaces (src);
|
||||
|
||||
return GST_FLOW_OK;
|
||||
}
|
||||
|
||||
|
|
@ -1554,38 +1522,6 @@ gst_soup_http_src_update_position (GstSoupHTTPSrc * src, gint64 bytes_read)
|
|||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
_gst_soup_http_src_data_available_callback (GObject * pollable_stream,
|
||||
gpointer udata)
|
||||
{
|
||||
GstSoupHTTPSrc *src = udata;
|
||||
|
||||
src->have_data = TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* Need to wait on a gsource to know when data is available */
|
||||
static gboolean
|
||||
gst_soup_http_src_wait_for_data (GstSoupHTTPSrc * src)
|
||||
{
|
||||
src->have_data = FALSE;
|
||||
|
||||
if (!src->poll_source) {
|
||||
src->poll_source =
|
||||
g_pollable_input_stream_create_source ((GPollableInputStream *)
|
||||
src->input_stream, src->cancellable);
|
||||
g_source_set_callback (src->poll_source,
|
||||
(GSourceFunc) _gst_soup_http_src_data_available_callback, src, NULL);
|
||||
g_source_attach (src->poll_source, src->poll_context);
|
||||
}
|
||||
|
||||
while (!src->have_data && !g_cancellable_is_cancelled (src->cancellable)) {
|
||||
g_main_context_iteration (src->poll_context, TRUE);
|
||||
}
|
||||
|
||||
return src->have_data;
|
||||
}
|
||||
|
||||
static GstFlowReturn
|
||||
gst_soup_http_src_read_buffer (GstSoupHTTPSrc * src, GstBuffer ** outbuf)
|
||||
{
|
||||
|
|
@ -1593,7 +1529,6 @@ gst_soup_http_src_read_buffer (GstSoupHTTPSrc * src, GstBuffer ** outbuf)
|
|||
GstMapInfo mapinfo;
|
||||
GstBaseSrc *bsrc;
|
||||
GstFlowReturn ret;
|
||||
GError *err = NULL;
|
||||
|
||||
bsrc = GST_BASE_SRC_CAST (src);
|
||||
|
||||
|
|
@ -1608,34 +1543,9 @@ gst_soup_http_src_read_buffer (GstSoupHTTPSrc * src, GstBuffer ** outbuf)
|
|||
return GST_FLOW_ERROR;
|
||||
}
|
||||
|
||||
if (src->has_pollable_interface) {
|
||||
while (1) {
|
||||
read_bytes =
|
||||
g_pollable_input_stream_read_nonblocking ((GPollableInputStream *)
|
||||
src->input_stream, mapinfo.data, mapinfo.size, src->cancellable,
|
||||
&err);
|
||||
if (read_bytes == -1) {
|
||||
if (err && g_error_matches (err, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) {
|
||||
g_error_free (err);
|
||||
err = NULL;
|
||||
|
||||
/* no data yet, wait */
|
||||
if (gst_soup_http_src_wait_for_data (src))
|
||||
/* retry */
|
||||
continue;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
read_bytes =
|
||||
g_input_stream_read (src->input_stream, mapinfo.data, mapinfo.size,
|
||||
src->cancellable, NULL);
|
||||
}
|
||||
|
||||
if (err)
|
||||
g_error_free (err);
|
||||
|
||||
read_bytes =
|
||||
g_input_stream_read (src->input_stream, mapinfo.data, mapinfo.size,
|
||||
src->cancellable, NULL);
|
||||
GST_DEBUG_OBJECT (src, "Read %" G_GSSIZE_FORMAT " bytes from http input",
|
||||
read_bytes);
|
||||
|
||||
|
|
@ -1710,7 +1620,11 @@ retry:
|
|||
|
||||
/* Check for pending position change */
|
||||
if (src->request_position != src->read_position) {
|
||||
gst_soup_http_src_destroy_input_stream (src);
|
||||
if (src->input_stream) {
|
||||
g_input_stream_close (src->input_stream, src->cancellable, NULL);
|
||||
g_object_unref (src->input_stream);
|
||||
src->input_stream = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if (g_cancellable_is_cancelled (src->cancellable)) {
|
||||
|
|
@ -1747,9 +1661,10 @@ done:
|
|||
gst_event_unref (http_headers_event);
|
||||
|
||||
g_mutex_lock (&src->mutex);
|
||||
/* Make sure the Range header is updated with the current position */
|
||||
src->read_position = -1;
|
||||
gst_soup_http_src_destroy_input_stream (src);
|
||||
if (src->input_stream) {
|
||||
g_object_unref (src->input_stream);
|
||||
src->input_stream = NULL;
|
||||
}
|
||||
g_mutex_unlock (&src->mutex);
|
||||
if (ret == GST_FLOW_CUSTOM_ERROR)
|
||||
goto retry;
|
||||
|
|
|
|||
|
|
@ -89,10 +89,6 @@ struct _GstSoupHTTPSrc {
|
|||
|
||||
GCancellable *cancellable;
|
||||
GInputStream *input_stream;
|
||||
gboolean has_pollable_interface;
|
||||
gboolean have_data;
|
||||
GMainContext *poll_context;
|
||||
GSource *poll_source;
|
||||
|
||||
gint reduce_blocksize_count;
|
||||
gint increase_blocksize_count;
|
||||
|
|
|
|||
Loading…
Reference in a new issue