slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.4.0' into 5.4

Browse Source 
Change-Id: Iec2c793710c95919975aa3c03144d915ca5fa84f
This commit is contained in:
Frederik Gladhorn
2014-11-21 13:45:17 +01:00
parent 2020b032e8 96407d8d89
commit f2b3363c11
6 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/multimedia/qmediaopenglhelper_p.h
View File

@@ -47,7 +47,7 @@
#include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLContext>
#if defined(Q_OS_WIN) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)) #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC))
#include <EGL/egl.h> #include <EGL/egl.h>
#endif #endif

2
src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h
View File

@@ -43,8 +43,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
const QLatin1String QSGVideoNodeFactoryPluginKey("sgvideonodes");
class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNode : public QSGGeometryNode class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNode : public QSGGeometryNode
{ {
public: public:

2
src/plugins/android/videonode/android_videonode.json
View File

@@ -1,3 +1,3 @@
{ {
"Keys": ["sgvideonodes"] "Keys": ["android"]
} }

2
src/plugins/videonode/egl/egl.json
View File

@@ -1,3 +1,3 @@
{ {
"Keys": ["sgvideonodes"] "Keys": ["egl"]
} }

2
src/plugins/videonode/imx6/imx6.json
View File

@@ -1,3 +1,3 @@
{ {
"Keys": ["sgvideonodes"] "Keys": ["imx6"]
} }

23
src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
View File

@@ -55,10 +55,21 @@ QDeclarativeVideoRendererBackend::QDeclarativeVideoRendererBackend(QDeclarativeV
QObject::connect(m_surface, SIGNAL(surfaceFormatChanged(QVideoSurfaceFormat)), QObject::connect(m_surface, SIGNAL(surfaceFormatChanged(QVideoSurfaceFormat)),
q, SLOT(_q_updateNativeSize()), Qt::QueuedConnection); q, SLOT(_q_updateNativeSize()), Qt::QueuedConnection);
foreach (QObject *instance, videoNodeFactoryLoader()->instances(QSGVideoNodeFactoryPluginKey)) { // Prioritize the plugin requested by the environment
QString requestedVideoNode = QString::fromLatin1(qgetenv("QT_VIDEONODE"));
foreach (const QString &key, videoNodeFactoryLoader()->keys()) {
QObject *instance = videoNodeFactoryLoader()->instance(key);
QSGVideoNodeFactoryInterface* plugin = qobject_cast<QSGVideoNodeFactoryInterface*>(instance); QSGVideoNodeFactoryInterface* plugin = qobject_cast<QSGVideoNodeFactoryInterface*>(instance);
if (plugin) if (plugin) {
m_videoNodeFactories.append(plugin); if (key == requestedVideoNode)
m_videoNodeFactories.prepend(plugin);
else
m_videoNodeFactories.append(plugin);
#ifdef DEBUG_VIDEOITEM
qDebug() << "found videonode plugin" << key << plugin;
#endif
}
} }
// Append existing node factories as fallback if we have no plugins // Append existing node factories as fallback if we have no plugins
@@ -224,8 +235,12 @@ QSGNode *QDeclarativeVideoRendererBackend::updatePaintNode(QSGNode *oldNode,
if (!videoNode) { if (!videoNode) {
foreach (QSGVideoNodeFactoryInterface* factory, m_videoNodeFactories) { foreach (QSGVideoNodeFactoryInterface* factory, m_videoNodeFactories) {
videoNode = factory->createNode(m_surface->surfaceFormat()); videoNode = factory->createNode(m_surface->surfaceFormat());
if (videoNode) if (videoNode) {
#ifdef DEBUG_VIDEOITEM
qDebug() << "using video node from factory" << factory;
#endif
break; break;
}
} }
} }
} }