mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
Revert "WIP revert soup"
This reverts commit fdac3a7a23
.
Was not supposed to be pushed but a local workaround for
https://bugzilla.gnome.org/show_bug.cgi?id=693911#c13
This commit is contained in:
parent
389e0abeb0
commit
4a2455b744
4 changed files with 317 additions and 497 deletions
|
@ -4,8 +4,8 @@ libgstsouphttpsrc_la_SOURCES = gstsouphttpsrc.c gstsouphttpclientsink.c gstsoupu
|
|||
|
||||
libgstsouphttpsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
|
||||
$(GST_CFLAGS) $(SOUP_CFLAGS) \
|
||||
-DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_26 \
|
||||
-DSOUP_VERSION_MAX_ALLOWED=SOUP_DEPRECATED_IN_2_26
|
||||
-DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_48 \
|
||||
-DSOUP_VERSION_MAX_ALLOWED=SOUP_DEPRECATED_IN_2_48
|
||||
libgstsouphttpsrc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ $(GST_BASE_LIBS) $(SOUP_LIBS)
|
||||
libgstsouphttpsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
libgstsouphttpsrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
|
||||
|
|
|
@ -264,8 +264,10 @@ gst_soup_http_client_sink_reset (GstSoupHttpClientSink * souphttpsink)
|
|||
|
||||
g_list_free_full (souphttpsink->streamheader_buffers,
|
||||
(GDestroyNotify) gst_buffer_unref);
|
||||
souphttpsink->streamheader_buffers = NULL;
|
||||
g_list_free_full (souphttpsink->sent_buffers,
|
||||
(GDestroyNotify) gst_buffer_unref);
|
||||
souphttpsink->sent_buffers = NULL;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -59,16 +59,9 @@ struct _GstSoupHTTPSrc {
|
|||
gchar *proxy_id; /* Authentication user id for proxy URI. */
|
||||
gchar *proxy_pw; /* Authentication user password for proxy URI. */
|
||||
gchar **cookies; /* HTTP request cookies. */
|
||||
GMainContext *context; /* I/O context. */
|
||||
GMainLoop *loop; /* Event loop. */
|
||||
SoupSession *session; /* Async context. */
|
||||
GstSoupHTTPSrcSessionIOStatus session_io_status;
|
||||
/* Async I/O status. */
|
||||
SoupMessage *msg; /* Request message. */
|
||||
GstFlowReturn ret; /* Return code from callback. */
|
||||
GstBuffer **outbuf; /* Return buffer allocated by callback. */
|
||||
gboolean interrupted; /* Signal unlock(). */
|
||||
gboolean retry; /* Should attempt to reconnect. */
|
||||
gint retry_count; /* Number of retries since we received data */
|
||||
gint max_retries; /* Maximum number of retries */
|
||||
gchar *method; /* HTTP method */
|
||||
|
@ -94,6 +87,13 @@ struct _GstSoupHTTPSrc {
|
|||
GTlsDatabase *tls_database;
|
||||
GTlsInteraction *tls_interaction;
|
||||
|
||||
GCancellable *cancellable;
|
||||
GInputStream *input_stream;
|
||||
gboolean has_pollable_interface;
|
||||
gboolean have_data;
|
||||
GMainContext *poll_context;
|
||||
GSource *poll_source;
|
||||
|
||||
/* Shoutcast/icecast metadata extraction handling. */
|
||||
gboolean iradio_mode;
|
||||
GstCaps *src_caps;
|
||||
|
@ -110,7 +110,7 @@ struct _GstSoupHTTPSrc {
|
|||
guint timeout;
|
||||
|
||||
GMutex mutex;
|
||||
GCond request_finished_cond;
|
||||
GCond have_headers_cond;
|
||||
|
||||
GstEvent *http_headers_event;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue