diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-11-27 14:44:33 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-11-27 14:44:49 +0100 |
commit | 7e3d69668e3f04110a651dee1850a1d0c885947b (patch) | |
tree | e55041237e21735e0849cb25aabf37937d6ea809 | |
parent | eddc8e1e58c0377ae392409d9afccea91ba1cd22 (diff) | |
parent | 59f2bf186400241c62a02044265d9ecab81c1749 (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Iaa608643f6626ed074a9fd374555cc5bc84659d5
-rw-r--r-- | src/gsttools/qgstappsrc.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/audio/qsoundeffect_pulse_p.h | 7 | ||||
-rw-r--r-- | src/multimedia/qmediaopenglhelper_p.h | 2 | ||||
-rw-r--r-- | src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h | 2 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowidget.cpp | 1 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowidget_p.h | 1 | ||||
-rw-r--r-- | src/plugins/alsa/qalsaaudioinput.h | 1 | ||||
-rw-r--r-- | src/plugins/alsa/qalsaaudiooutput.h | 1 | ||||
-rw-r--r-- | src/plugins/android/videonode/android_videonode.json | 2 | ||||
-rw-r--r-- | src/plugins/videonode/egl/egl.json | 2 | ||||
-rw-r--r-- | src/plugins/videonode/imx6/imx6.json | 2 | ||||
-rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp | 23 |
12 files changed, 24 insertions, 22 deletions
diff --git a/src/gsttools/qgstappsrc.cpp b/src/gsttools/qgstappsrc.cpp index 148366b3e..561a96fc8 100644 --- a/src/gsttools/qgstappsrc.cpp +++ b/src/gsttools/qgstappsrc.cpp @@ -141,7 +141,7 @@ void QGstAppSrc::pushDataToAppSrc() if (m_dataRequested && !m_enoughData) { qint64 size; - if (m_dataRequestSize == ~0) + if (m_dataRequestSize == ~0u) size = qMin(m_stream->bytesAvailable(), queueSize()); else size = qMin(m_stream->bytesAvailable(), (qint64)m_dataRequestSize); diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.h b/src/multimedia/audio/qsoundeffect_pulse_p.h index 9275d97ea..9846caee7 100644 --- a/src/multimedia/audio/qsoundeffect_pulse_p.h +++ b/src/multimedia/audio/qsoundeffect_pulse_p.h @@ -163,13 +163,6 @@ private: int m_position; QSoundEffectRef *m_ref; - enum ResourceStatus { - NoResources, - WaitingResources, - GrantedResources, - DeniedResources - }; - ResourceStatus m_resourceStatus; bool m_resourcesAvailable; QMediaPlayerResourceSetInterface *m_resources; diff --git a/src/multimedia/qmediaopenglhelper_p.h b/src/multimedia/qmediaopenglhelper_p.h index 0dbd79d47..bb445b693 100644 --- a/src/multimedia/qmediaopenglhelper_p.h +++ b/src/multimedia/qmediaopenglhelper_p.h @@ -47,7 +47,7 @@ #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> #endif diff --git a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h index c064f8ed8..8be77ff07 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h @@ -43,8 +43,6 @@ QT_BEGIN_NAMESPACE -const QLatin1String QSGVideoNodeFactoryPluginKey("sgvideonodes"); - class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNode : public QSGGeometryNode { public: diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index 8634907c6..439e77d08 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -306,7 +306,6 @@ QWindowVideoWidgetBackend::QWindowVideoWidgetBackend( : m_service(service) , m_windowControl(control) , m_widget(widget) - , m_aspectRatioMode(Qt::KeepAspectRatio) { connect(control, SIGNAL(brightnessChanged(int)), m_widget, SLOT(_q_brightnessChanged(int))); connect(control, SIGNAL(contrastChanged(int)), m_widget, SLOT(_q_contrastChanged(int))); diff --git a/src/multimediawidgets/qvideowidget_p.h b/src/multimediawidgets/qvideowidget_p.h index 578fb92af..f447d1f2e 100644 --- a/src/multimediawidgets/qvideowidget_p.h +++ b/src/multimediawidgets/qvideowidget_p.h @@ -208,7 +208,6 @@ private: QMediaService *m_service; QVideoWindowControl *m_windowControl; QWidget *m_widget; - Qt::AspectRatioMode m_aspectRatioMode; QSize m_pixelAspectRatio; }; diff --git a/src/plugins/alsa/qalsaaudioinput.h b/src/plugins/alsa/qalsaaudioinput.h index 5470c1b6d..abf67e2cd 100644 --- a/src/plugins/alsa/qalsaaudioinput.h +++ b/src/plugins/alsa/qalsaaudioinput.h @@ -153,7 +153,6 @@ private: snd_pcm_uframes_t period_frames; snd_pcm_access_t access; snd_pcm_format_t pcmformat; - snd_timestamp_t* timestamp; snd_pcm_hw_params_t *hwparams; qreal m_volume; }; diff --git a/src/plugins/alsa/qalsaaudiooutput.h b/src/plugins/alsa/qalsaaudiooutput.h index 5b9b45d38..2a245f38f 100644 --- a/src/plugins/alsa/qalsaaudiooutput.h +++ b/src/plugins/alsa/qalsaaudiooutput.h @@ -132,7 +132,6 @@ private: snd_pcm_t* handle; snd_pcm_access_t access; snd_pcm_format_t pcmformat; - snd_timestamp_t* timestamp; snd_pcm_hw_params_t *hwparams; qreal m_volume; }; diff --git a/src/plugins/android/videonode/android_videonode.json b/src/plugins/android/videonode/android_videonode.json index 08bb12c3f..9b359ebac 100644 --- a/src/plugins/android/videonode/android_videonode.json +++ b/src/plugins/android/videonode/android_videonode.json @@ -1,3 +1,3 @@ { - "Keys": ["sgvideonodes"] + "Keys": ["android"] } diff --git a/src/plugins/videonode/egl/egl.json b/src/plugins/videonode/egl/egl.json index 08bb12c3f..54a0519f5 100644 --- a/src/plugins/videonode/egl/egl.json +++ b/src/plugins/videonode/egl/egl.json @@ -1,3 +1,3 @@ { - "Keys": ["sgvideonodes"] + "Keys": ["egl"] } diff --git a/src/plugins/videonode/imx6/imx6.json b/src/plugins/videonode/imx6/imx6.json index 08bb12c3f..2a7fc50cc 100644 --- a/src/plugins/videonode/imx6/imx6.json +++ b/src/plugins/videonode/imx6/imx6.json @@ -1,3 +1,3 @@ { - "Keys": ["sgvideonodes"] + "Keys": ["imx6"] } diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp index 3b07e28c2..608aae5d1 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp @@ -55,10 +55,21 @@ QDeclarativeVideoRendererBackend::QDeclarativeVideoRendererBackend(QDeclarativeV QObject::connect(m_surface, SIGNAL(surfaceFormatChanged(QVideoSurfaceFormat)), 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); - if (plugin) - m_videoNodeFactories.append(plugin); + if (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 @@ -224,8 +235,12 @@ QSGNode *QDeclarativeVideoRendererBackend::updatePaintNode(QSGNode *oldNode, if (!videoNode) { foreach (QSGVideoNodeFactoryInterface* factory, m_videoNodeFactories) { videoNode = factory->createNode(m_surface->surfaceFormat()); - if (videoNode) + if (videoNode) { +#ifdef DEBUG_VIDEOITEM + qDebug() << "using video node from factory" << factory; +#endif break; + } } } } |