d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 12:38:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix required plugin check on gstreamer 1.22

Browse source 
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
This commit is contained in:
Nicolas Werner 2023-02-08 00:54:02 +01:00
parent 50f5fc6637
commit fc7937c73d
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 78 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/voip/CallManager.cpp
View file

@ -193,9 +193,8 @@ CallManager::sendInvite(const QString &roomid, CallType callType, unsigned int w
auto roomInfo = cache::singleRoomInfo(roomid.toStdString()); auto roomInfo = cache::singleRoomInfo(roomid.toStdString());
std::string errorMessage; std::string errorMessage;
if (!session_.havePlugins(false, &errorMessage) || if (!session_.havePlugins(
((callType == CallType::VIDEO || callType == CallType::SCREEN) && callType != CallType::VOICE, callType == CallType::SCREEN, &errorMessage)) {
!session_.havePlugins(true, &errorMessage))) {
emit ChatPage::instance()->showNotification(QString::fromStdString(errorMessage)); emit ChatPage::instance()->showNotification(QString::fromStdString(errorMessage));
return; return;
} }
@ -469,8 +468,8 @@ CallManager::acceptInvite()
stopRingtone(); stopRingtone();
std::string errorMessage; std::string errorMessage;
if (!session_.havePlugins(false, &errorMessage) || if (!session_.havePlugins(
(callType_ == CallType::VIDEO && !session_.havePlugins(true, &errorMessage))) { callType_ != CallType::VOICE, callType_ == CallType::SCREEN, &errorMessage)) {
emit ChatPage::instance()->showNotification(QString::fromStdString(errorMessage)); emit ChatPage::instance()->showNotification(QString::fromStdString(errorMessage));
hangUp(CallHangUp::Reason::UserMediaFailed); hangUp(CallHangUp::Reason::UserMediaFailed);
return; return;

92
src/voip/WebRTCSession.cpp
View file

@ -580,53 +580,81 @@ getMediaAttributes(const GstSDPMessage *sdp,
} }
bool bool
WebRTCSession::havePlugins(bool isVideo, std::string *errorMessage) WebRTCSession::havePlugins(bool isVideo, bool isX11Screenshare, std::string *errorMessage)
{ {
if (!initialised_ && !init(errorMessage)) if (!initialised_ && !init(errorMessage))
return false; return false;
if (!isVideo && haveVoicePlugins_) if (haveVoicePlugins_ && (!isVideo || haveVideoPlugins_) &&
return true; (!isX11Screenshare || haveX11ScreensharePlugins_))
if (isVideo && haveVideoPlugins_)
return true; return true;
const gchar *voicePlugins[] = {"audioconvert", static constexpr std::initializer_list<const char *> audio_elements = {
"audioresample", "audioconvert",
"autodetect", "audioresample",
"dtls", "autoaudiosink",
"nice", "capsfilter",
"opus", "decodebin",
"playback", "opusenc",
"rtpmanager", "queue",
"srtp", "rtpopuspay",
"volume", "volume",
"webrtc", "webrtcbin",
nullptr}; };
const gchar *videoPlugins[] = { static constexpr std::initializer_list<const char *> video_elements = {
"compositor", "opengl", "qmlgl", "rtp", "videoconvert", "vpx", nullptr}; "compositor",
"glcolorconvert",
"glsinkbin",
"glupload",
"qmlglsink",
"rtpvp8pay",
"tee",
"videoconvert",
"videoscale",
"vp8enc",
};
static constexpr std::initializer_list<const char *> screenshare_elements = {
"ximagesink",
"ximagesrc",
};
std::string strError("Missing GStreamer plugins: "); std::string strError("Missing GStreamer elements: ");
const gchar **needed = isVideo ? videoPlugins : voicePlugins;
bool &havePlugins = isVideo ? haveVideoPlugins_ : haveVoicePlugins_;
havePlugins = true;
GstRegistry *registry = gst_registry_get(); 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]); auto check_plugins = [&strError,
if (!plugin) { registry](const std::initializer_list<const char *> &elements) {
havePlugins = false; bool havePlugins = true;
strError += std::string(needed[i]) + " "; for (const auto &element : elements) {
continue; 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);
} return havePlugins;
if (!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); nhlog::ui()->error(strError);
if (errorMessage) if (errorMessage)
*errorMessage = strError; *errorMessage = strError;
return false; return false;
} }
if (isVideo) { if (isVideo || isX11Screenshare) {
// load qmlglsink to register GStreamer's GstGLVideoItem QML type // load qmlglsink to register GStreamer's GstGLVideoItem QML type
GstElement *qmlglsink = gst_element_factory_make("qmlglsink", nullptr); GstElement *qmlglsink = gst_element_factory_make("qmlglsink", nullptr);
gst_object_unref(qmlglsink); gst_object_unref(qmlglsink);

27
src/voip/WebRTCSession.h
View file

@ -54,7 +54,7 @@ public:
return instance; return instance;
} }
bool havePlugins(bool isVideo, std::string *errorMessage = nullptr); bool havePlugins(bool isVideo, bool isX11Screenshare, std::string *errorMessage = nullptr);
webrtc::CallType callType() const { return callType_; } webrtc::CallType callType() const { return callType_; }
webrtc::State state() const { return state_; } webrtc::State state() const { return state_; }
bool haveLocalPiP() const; bool haveLocalPiP() const;
@ -93,18 +93,19 @@ private:
WebRTCSession(); WebRTCSession();
CallDevices &devices_; CallDevices &devices_;
bool initialised_ = false; bool initialised_ = false;
bool haveVoicePlugins_ = false; bool haveVoicePlugins_ = false;
bool haveVideoPlugins_ = false; bool haveVideoPlugins_ = false;
webrtc::CallType callType_ = webrtc::CallType::VOICE; bool haveX11ScreensharePlugins_ = false;
webrtc::State state_ = webrtc::State::DISCONNECTED; webrtc::CallType callType_ = webrtc::CallType::VOICE;
bool isOffering_ = false; webrtc::State state_ = webrtc::State::DISCONNECTED;
bool isRemoteVideoRecvOnly_ = false; bool isOffering_ = false;
bool isRemoteVideoSendOnly_ = false; bool isRemoteVideoRecvOnly_ = false;
QQuickItem *videoItem_ = nullptr; bool isRemoteVideoSendOnly_ = false;
GstElement *pipe_ = nullptr; QQuickItem *videoItem_ = nullptr;
GstElement *webrtc_ = nullptr; GstElement *pipe_ = nullptr;
unsigned int busWatchId_ = 0; GstElement *webrtc_ = nullptr;
unsigned int busWatchId_ = 0;
std::vector<std::string> turnServers_; std::vector<std::string> turnServers_;
uint32_t shareWindowId_ = 0; uint32_t shareWindowId_ = 0;