From fc7937c73d5729066079484c32a9785bddd74bc5 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 8 Feb 2023 00:54:02 +0100 Subject: Fix required plugin check on gstreamer 1.22 GStreamer 1.22 merged the videoscale plugin into the videoconvertscale plugin. So we should check if the Element is still loadable instead of checking the plugin name. fixes #1352 --- src/voip/WebRTCSession.cpp | 96 ++++++++++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 34 deletions(-) (limited to 'src/voip/WebRTCSession.cpp') diff --git a/src/voip/WebRTCSession.cpp b/src/voip/WebRTCSession.cpp index 7760e2ea..001781e4 100644 --- a/src/voip/WebRTCSession.cpp +++ b/src/voip/WebRTCSession.cpp @@ -580,53 +580,81 @@ getMediaAttributes(const GstSDPMessage *sdp, } bool -WebRTCSession::havePlugins(bool isVideo, std::string *errorMessage) +WebRTCSession::havePlugins(bool isVideo, bool isX11Screenshare, std::string *errorMessage) { if (!initialised_ && !init(errorMessage)) return false; - if (!isVideo && haveVoicePlugins_) - return true; - if (isVideo && haveVideoPlugins_) + if (haveVoicePlugins_ && (!isVideo || haveVideoPlugins_) && + (!isX11Screenshare || haveX11ScreensharePlugins_)) return true; - const gchar *voicePlugins[] = {"audioconvert", - "audioresample", - "autodetect", - "dtls", - "nice", - "opus", - "playback", - "rtpmanager", - "srtp", - "volume", - "webrtc", - nullptr}; - - const gchar *videoPlugins[] = { - "compositor", "opengl", "qmlgl", "rtp", "videoconvert", "vpx", nullptr}; - - std::string strError("Missing GStreamer plugins: "); - const gchar **needed = isVideo ? videoPlugins : voicePlugins; - bool &havePlugins = isVideo ? haveVideoPlugins_ : haveVoicePlugins_; - havePlugins = true; + static constexpr std::initializer_list audio_elements = { + "audioconvert", + "audioresample", + "autoaudiosink", + "capsfilter", + "decodebin", + "opusenc", + "queue", + "rtpopuspay", + "volume", + "webrtcbin", + }; + + static constexpr std::initializer_list video_elements = { + "compositor", + "glcolorconvert", + "glsinkbin", + "glupload", + "qmlglsink", + "rtpvp8pay", + "tee", + "videoconvert", + "videoscale", + "vp8enc", + }; + static constexpr std::initializer_list screenshare_elements = { + "ximagesink", + "ximagesrc", + }; + + std::string strError("Missing GStreamer elements: "); GstRegistry *registry = gst_registry_get(); - for (guint i = 0; i < g_strv_length((gchar **)needed); i++) { - GstPlugin *plugin = gst_registry_find_plugin(registry, needed[i]); - if (!plugin) { - havePlugins = false; - strError += std::string(needed[i]) + " "; - continue; + + auto check_plugins = [&strError, + registry](const std::initializer_list &elements) { + bool havePlugins = true; + for (const auto &element : elements) { + GstPluginFeature *plugin = + gst_registry_find_feature(registry, element, GST_TYPE_ELEMENT_FACTORY); + if (!plugin) { + havePlugins = false; + strError += std::string(element) + " "; + continue; + } + gst_object_unref(plugin); } - gst_object_unref(plugin); - } - if (!havePlugins) { + + return havePlugins; + }; + + haveVoicePlugins_ = check_plugins(audio_elements); + + // check both elements at once + if (isVideo) + haveVideoPlugins_ = check_plugins(video_elements); + if (isX11Screenshare) + haveX11ScreensharePlugins_ = check_plugins(screenshare_elements); + + if (!haveVoicePlugins_ || (isVideo && !haveVideoPlugins_) || + (isX11Screenshare && !haveX11ScreensharePlugins_)) { nhlog::ui()->error(strError); if (errorMessage) *errorMessage = strError; return false; } - if (isVideo) { + if (isVideo || isX11Screenshare) { // load qmlglsink to register GStreamer's GstGLVideoItem QML type GstElement *qmlglsink = gst_element_factory_make("qmlglsink", nullptr); gst_object_unref(qmlglsink); -- cgit 1.5.1