diff options
author | Thibault Saunier <tsaunier@igalia.com> | 2021-03-10 17:27:52 -0300 |
---|---|---|
committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-05-19 13:41:15 +0000 |
commit | cb4f6c877e593d0e2aeea16f5c80b84e31c5927a (patch) | |
tree | a6cd010aed062ea260ca026831c5bd8f7ea399d8 /ext/wpe/WPEThreadedView.cpp | |
parent | be1c154f33133904632e4f5eb1850090f5212874 (diff) | |
download | gstreamer-plugins-bad-cb4f6c877e593d0e2aeea16f5c80b84e31c5927a.tar.gz |
wpe: Move wpesrc to wpevideosrc and add a wrapper bin `wpesrc`
Currently the bin contains a single element but we are going
to implement audio support and expose extra pads for audio
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2252>
Diffstat (limited to 'ext/wpe/WPEThreadedView.cpp')
-rw-r--r-- | ext/wpe/WPEThreadedView.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/wpe/WPEThreadedView.cpp b/ext/wpe/WPEThreadedView.cpp index f4588e5b3..e95b2bb5d 100644 --- a/ext/wpe/WPEThreadedView.cpp +++ b/ext/wpe/WPEThreadedView.cpp @@ -35,8 +35,8 @@ #include <wpe/unstable/fdo-shm.h> #endif -GST_DEBUG_CATEGORY_EXTERN (wpe_src_debug); -#define GST_CAT_DEFAULT wpe_src_debug +GST_DEBUG_CATEGORY_EXTERN (wpe_view_debug); +#define GST_CAT_DEFAULT wpe_view_debug #if defined(WPE_FDO_CHECK_VERSION) && WPE_FDO_CHECK_VERSION(1, 3, 0) #define USE_DEPRECATED_FDO_EGL_IMAGE 0 @@ -165,7 +165,7 @@ gpointer WPEContextThread::s_viewThread(gpointer data) return nullptr; } -WPEView* WPEContextThread::createWPEView(GstWpeSrc* src, GstGLContext* context, GstGLDisplay* display, int width, int height) +WPEView* WPEContextThread::createWPEView(GstWpeVideoSrc* src, GstGLContext* context, GstGLDisplay* display, int width, int height) { GST_DEBUG("context %p display %p, size (%d,%d)", context, display, width, height); @@ -199,7 +199,7 @@ WPEView* WPEContextThread::createWPEView(GstWpeSrc* src, GstGLContext* context, static gboolean s_loadFailed(WebKitWebView*, WebKitLoadEvent, gchar* failing_uri, GError* error, gpointer data) { - GstWpeSrc* src = GST_WPE_SRC(data); + GstWpeVideoSrc* src = GST_WPE_VIDEO_SRC(data); if (g_error_matches(error, WEBKIT_NETWORK_ERROR, WEBKIT_NETWORK_ERROR_CANCELLED)) { GST_INFO_OBJECT (src, "Loading cancelled."); @@ -231,7 +231,7 @@ static void s_loadProgressChaned(GObject* object, GParamSpec*, gpointer data) gst_object_unref (bus); } -WPEView::WPEView(WebKitWebContext* web_context, GstWpeSrc* src, GstGLContext* context, GstGLDisplay* display, int width, int height) +WPEView::WPEView(WebKitWebContext* web_context, GstWpeVideoSrc* src, GstGLContext* context, GstGLDisplay* display, int width, int height) { g_mutex_init(&threading.ready_mutex); g_cond_init(&threading.ready_cond); @@ -292,7 +292,7 @@ WPEView::WPEView(WebKitWebContext* web_context, GstWpeSrc* src, GstGLContext* co g_signal_connect(webkit.view, "load-failed-with-tls-errors", G_CALLBACK(s_loadFailedWithTLSErrors), src); g_signal_connect(webkit.view, "notify::estimated-load-progress", G_CALLBACK(s_loadProgressChaned), src); - gst_wpe_src_configure_web_view(src, webkit.view); + gst_wpe_video_src_configure_web_view(src, webkit.view); gchar* location; gboolean drawBackground = TRUE; |