diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | examples/multimedia/video/qmlvideofx/shaders/ripple.fsh | 2 | ||||
-rw-r--r-- | examples/multimedia/video/qmlvideofx/shaders/wobble.fsh | 2 | ||||
-rw-r--r-- | src/multimedia/video/qvideoprobe.h | 2 | ||||
-rw-r--r-- | src/multimediawidgets/qpaintervideosurface.cpp | 2 | ||||
-rw-r--r-- | src/plugins/directshow/dsserviceplugin.cpp | 15 | ||||
-rw-r--r-- | src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp | 2 |
7 files changed, 16 insertions, 11 deletions
diff --git a/.qmake.conf b/.qmake.conf index ccd239ad1..35f43d513 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.4.1 +MODULE_VERSION = 5.4.2 diff --git a/examples/multimedia/video/qmlvideofx/shaders/ripple.fsh b/examples/multimedia/video/qmlvideofx/shaders/ripple.fsh index 428c041c7..75d60e645 100644 --- a/examples/multimedia/video/qmlvideofx/shaders/ripple.fsh +++ b/examples/multimedia/video/qmlvideofx/shaders/ripple.fsh @@ -39,7 +39,7 @@ ** ****************************************************************************/ -// Based on http://blog.qt.digia.com/blog/2011/03/22/the-convenient-power-of-qml-scene-graph/ +// Based on http://blog.qt.io/blog/2011/03/22/the-convenient-power-of-qml-scene-graph/ uniform float dividerValue; uniform float targetWidth; diff --git a/examples/multimedia/video/qmlvideofx/shaders/wobble.fsh b/examples/multimedia/video/qmlvideofx/shaders/wobble.fsh index dea8810f6..a49ea6f7e 100644 --- a/examples/multimedia/video/qmlvideofx/shaders/wobble.fsh +++ b/examples/multimedia/video/qmlvideofx/shaders/wobble.fsh @@ -39,7 +39,7 @@ ** ****************************************************************************/ -// Based on http://blog.qt.digia.com/blog/2011/03/22/the-convenient-power-of-qml-scene-graph/ +// Based on http://blog.qt.io/blog/2011/03/22/the-convenient-power-of-qml-scene-graph/ uniform float amplitude; uniform float dividerValue; diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h index 6fbb688a1..f1475d697 100644 --- a/src/multimedia/video/qvideoprobe.h +++ b/src/multimedia/video/qvideoprobe.h @@ -34,7 +34,7 @@ #ifndef QVIDEOPROBE_H #define QVIDEOPROBE_H -#include <QObject> +#include <QtCore/QObject> #include <QtMultimedia/qvideoframe.h> QT_BEGIN_NAMESPACE diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 2ab5dcbf5..13306fd87 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -141,8 +141,8 @@ QAbstractVideoSurface::Error QVideoSurfaceGenericPainter::start(const QVideoSurf bool ok = m_imageFormat != QImage::Format_Invalid && !m_imageSize.isEmpty(); #ifndef QT_NO_OPENGL if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) -#endif ok &= format.pixelFormat() != QVideoFrame::Format_RGB24; +#endif if (ok) return QAbstractVideoSurface::NoError; } else if (t == QAbstractVideoBuffer::QPixmapHandle) { diff --git a/src/plugins/directshow/dsserviceplugin.cpp b/src/plugins/directshow/dsserviceplugin.cpp index b59cd1dc5..f28f274e2 100644 --- a/src/plugins/directshow/dsserviceplugin.cpp +++ b/src/plugins/directshow/dsserviceplugin.cpp @@ -39,6 +39,7 @@ #include "dsvideodevicecontrol.h" #ifdef QMEDIA_DIRECTSHOW_CAMERA +#include <QtCore/QElapsedTimer> #include <dshow.h> #include "dscameraservice.h" #endif @@ -121,8 +122,7 @@ QByteArray DSServicePlugin::defaultDevice(const QByteArray &service) const { #ifdef QMEDIA_DIRECTSHOW_CAMERA if (service == Q_MEDIASERVICE_CAMERA) { - if (m_cameraDevices.isEmpty()) - updateDevices(); + updateDevices(); return m_defaultCameraDevice; } @@ -135,8 +135,7 @@ QList<QByteArray> DSServicePlugin::devices(const QByteArray &service) const { #ifdef QMEDIA_DIRECTSHOW_CAMERA if (service == Q_MEDIASERVICE_CAMERA) { - if (m_cameraDevices.isEmpty()) - updateDevices(); + updateDevices(); return m_cameraDevices; } @@ -149,8 +148,7 @@ QString DSServicePlugin::deviceDescription(const QByteArray &service, const QByt { #ifdef QMEDIA_DIRECTSHOW_CAMERA if (service == Q_MEDIASERVICE_CAMERA) { - if (m_cameraDevices.isEmpty()) - updateDevices(); + updateDevices(); for (int i=0; i<m_cameraDevices.count(); i++) if (m_cameraDevices[i] == device) @@ -164,6 +162,10 @@ QString DSServicePlugin::deviceDescription(const QByteArray &service, const QByt void DSServicePlugin::updateDevices() const { + static QElapsedTimer timer; + if (timer.isValid() && timer.elapsed() < 500) // ms + return; + addRefCount(); m_defaultCameraDevice.clear(); @@ -176,6 +178,7 @@ void DSServicePlugin::updateDevices() const } releaseRefCount(); + timer.restart(); } #endif diff --git a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp index 4f8f03836..625cf6824 100644 --- a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp +++ b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp @@ -453,7 +453,9 @@ QList<QByteArray> QWindowsAudioDeviceInfo::availableDevices(QAudio::Mode mode) pPropBag->Release(); pMoniker->Release(); } + pEnum->Release(); } + pDevEnum->Release(); } CoUninitialize(); #else // Q_OS_WINCE |