diff options
author | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-23 08:44:50 +0300 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-23 08:47:15 +0300 |
commit | 0d3434fd0491d8d37dc0286b9d8ec8a454ba726b (patch) | |
tree | 329557ed14a161827817765b0ccc6298fcf146b4 /src/plugins/gstreamer | |
parent | 01c9322bfe918b886468eb520d77b21b6d8c0c11 (diff) | |
parent | 62eeaba645d0f7c42246a0b026c532919a5b0454 (diff) | |
download | qtmultimedia-0d3434fd0491d8d37dc0286b9d8ec8a454ba726b.tar.gz |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
Diffstat (limited to 'src/plugins/gstreamer')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp index b810e2b02..2d3c7c2ea 100644 --- a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp @@ -66,8 +66,19 @@ QMediaService* CameraBinServicePlugin::create(const QString &key) { QGstUtils::initializeGst(); - if (key == QLatin1String(Q_MEDIASERVICE_CAMERA)) + if (key == QLatin1String(Q_MEDIASERVICE_CAMERA)) { + if (!CameraBinService::isCameraBinAvailable()) { + guint major, minor, micro, nano; + gst_version(&major, &minor, µ, &nano); + qWarning("Error: cannot create camera service, the 'camerabin' plugin is missing for " + "GStreamer %u.%u." + "\nPlease install the 'bad' GStreamer plugin package.", + major, minor); + return Q_NULLPTR; + } + return new CameraBinService(sourceFactory()); + } qWarning() << "Gstreamer camerabin service plugin: unsupported key:" << key; return 0; |