From 6c2f9f0f52d35a722b11af69cd85f6c066df7d61 Mon Sep 17 00:00:00 2001 From: Jonas Rabbe Date: Wed, 28 Mar 2012 15:58:59 +1000 Subject: [PATCH] Moved video plugins around to prevent accidental unloading If several different plugins are located in the same place, and are loaded by different instances of QFactoryLoader, like we use, then plugins that are used elsewhere can be unloaded. By ensuring that the plugins are alone in their directory, then they will not have this problem. Change-Id: Id95b81ddf46435278fe43a4769e2d39f6b973a84 Reviewed-by: Dmytro Poplavskiy Reviewed-by: Mithra Pattison --- src/gsttools/qvideosurfacegstsink.cpp | 2 +- src/imports/multimedia/qdeclarativevideooutput.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gsttools/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp index c1f2792..1d6a105 100644 --- a/src/gsttools/qvideosurfacegstsink.cpp +++ b/src/gsttools/qvideosurfacegstsink.cpp @@ -58,7 +58,7 @@ //#define DEBUG_VIDEO_SURFACE_SINK Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, bufferPoolLoader, - (QGstBufferPoolInterface_iid, QLatin1String("video"), Qt::CaseInsensitive)) + (QGstBufferPoolInterface_iid, QLatin1String("video/bufferpool"), Qt::CaseInsensitive)) QVideoSurfaceGstDelegate::QVideoSurfaceGstDelegate( diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp index be592bb..de0740d 100644 --- a/src/imports/multimedia/qdeclarativevideooutput.cpp +++ b/src/imports/multimedia/qdeclarativevideooutput.cpp @@ -59,7 +59,7 @@ Q_DECLARE_METATYPE(QAbstractVideoSurface*) QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, videoNodeFactoryLoader, - (QSGVideoNodeFactoryInterface_iid, QLatin1String("video"), Qt::CaseInsensitive)) + (QSGVideoNodeFactoryInterface_iid, QLatin1String("video/videonode"), Qt::CaseInsensitive)) class QSGVideoItemSurface : public QAbstractVideoSurface { -- 2.7.4