mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

wpesrc: Switch URI handler to web+... protocols

Browse source 
The web://http:// URIs were not compliant with RFC 3986. Using web+http://
allows us to use the GstUri parser to pass down a valid URI to `wpevideosrc`.

Corresponding change for the CEF source element:
8d499495dd

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2856>
This commit is contained in:
Philippe Normand 2022-08-10 11:12:37 +01:00 committed by GStreamer Marge Bot
parent 16a3fc3c6d
commit 90d46c1748
1 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
subprojects/gst-plugins-bad/ext/wpe/gstwpesrcbin.cpp
View file

@ -48,10 +48,14 @@
* ### Show the GStreamer website homepage as played with GstPlayer in a GTK+ window * ### Show the GStreamer website homepage as played with GstPlayer in a GTK+ window
* *
* ``` * ```
* gst-play-1.0 --videosink gtkglsink wpe://https://gstreamer.freedesktop.org * export GST_PLUGIN_FEATURE_RANK="wpesrc:MAX"
* gst-play-1.0 --videosink gtkglsink web+https://gstreamer.freedesktop.org
* ``` * ```
* *
* The `web://` URI protocol is also supported, as an alias to `wpe://`. Since: 1.20 * Until 1.20 the `web://` URI protocol was supported, along with `wpe://`.
*
* The supported URI protocols are `web+http://`, `web+https://` and `web+file://`.
* Since: 1.22
* *
* ### Composite WPE with a video stream in a single OpenGL scene * ### Composite WPE with a video stream in a single OpenGL scene
* *
@ -134,7 +138,6 @@ struct _GstWpeSrc
GstElement *video_src; GstElement *video_src;
GHashTable *audio_src_pads; GHashTable *audio_src_pads;
GstFlowCombiner *flow_combiner; GstFlowCombiner *flow_combiner;
gchar *uri;
}; };
enum enum
@ -377,7 +380,7 @@ gst_wpe_src_uri_get_type (GType)
static const gchar *const * static const gchar *const *
gst_wpe_src_get_protocols (GType) gst_wpe_src_get_protocols (GType)
{ {
static const char *protocols[] = { "wpe", "web", NULL }; static const gchar *protocols[] = {"web+http", "web+https", "web+file", NULL};
return protocols; return protocols;
} }
@ -385,22 +388,36 @@ static gchar *
gst_wpe_src_get_uri (GstURIHandler * handler) gst_wpe_src_get_uri (GstURIHandler * handler)
{ {
GstWpeSrc *src = GST_WPE_SRC (handler); GstWpeSrc *src = GST_WPE_SRC (handler);
gchar *ret = NULL;
return g_strdup (src->uri); g_object_get(src->video_src, "location", &ret, NULL);
return ret;
} }
static gboolean static gboolean
gst_wpe_src_set_uri (GstURIHandler * handler, const gchar * uri, gst_wpe_src_set_uri (GstURIHandler * handler, const gchar * uristr,
GError ** error) GError ** error)
{ {
gboolean res = TRUE;
gchar *location;
GstWpeSrc *src = GST_WPE_SRC (handler); GstWpeSrc *src = GST_WPE_SRC (handler);
const gchar *protocol;
GstUri *uri;
if (src->uri) { protocol = gst_uri_get_protocol (uristr);
g_free (src->uri); g_return_val_if_fail (g_str_has_prefix (protocol, "web+"), FALSE);
}
src->uri = g_strdup (uri); uri = gst_uri_from_string (uristr);
gst_wpe_src_set_location(src, uri + 6); gst_uri_set_scheme (uri, protocol + 4);
return TRUE;
location = gst_uri_to_string (uri);
gst_wpe_src_set_location (src, location);
gst_uri_unref (uri);
g_free (location);
return res;
} }
static void static void
@ -484,7 +501,6 @@ gst_wpe_src_finalize (GObject *object)
g_hash_table_unref (src->audio_src_pads); g_hash_table_unref (src->audio_src_pads);
gst_flow_combiner_free (src->flow_combiner); gst_flow_combiner_free (src->flow_combiner);
gst_object_unref (src->fd_allocator); gst_object_unref (src->fd_allocator);
g_free (src->uri);
GST_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); GST_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
} }