diff options
13 files changed, 23 insertions, 5 deletions
diff --git a/examples/multimedia/audiooutput/doc/images/audiooutput-example.png b/examples/multimedia/audiooutput/doc/images/audiooutput-example.png Binary files differindex 5588fbb57..1abf5571f 100644 --- a/examples/multimedia/audiooutput/doc/images/audiooutput-example.png +++ b/examples/multimedia/audiooutput/doc/images/audiooutput-example.png diff --git a/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png b/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png Binary files differindex 5b29174c5..882180b21 100644 --- a/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png +++ b/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png diff --git a/examples/multimedia/spectrum/app/images/record.png b/examples/multimedia/spectrum/app/images/record.png Binary files differindex e7493aad9..184fce809 100644 --- a/examples/multimedia/spectrum/app/images/record.png +++ b/examples/multimedia/spectrum/app/images/record.png diff --git a/examples/multimedia/spectrum/doc/images/spectrum-demo.png b/examples/multimedia/spectrum/doc/images/spectrum-demo.png Binary files differindex 9ccb489a9..077cbb68d 100644 --- a/examples/multimedia/spectrum/doc/images/spectrum-demo.png +++ b/examples/multimedia/spectrum/doc/images/spectrum-demo.png diff --git a/examples/multimedia/video/qmlvideofx/images/qt-logo.png b/examples/multimedia/video/qmlvideofx/images/qt-logo.png Binary files differindex 7d3e97eb3..ecbff0ca3 100644 --- a/examples/multimedia/video/qmlvideofx/images/qt-logo.png +++ b/examples/multimedia/video/qmlvideofx/images/qt-logo.png diff --git a/src/multimedia/doc/src/images/annotatedurl.png b/src/multimedia/doc/src/images/annotatedurl.png Binary files differindex 38d86fb49..b6cf8637c 100644 --- a/src/multimedia/doc/src/images/annotatedurl.png +++ b/src/multimedia/doc/src/images/annotatedurl.png diff --git a/src/multimedia/doc/src/images/video-graphics-memory.png b/src/multimedia/doc/src/images/video-graphics-memory.png Binary files differindex 9479cce4c..4bea33322 100644 --- a/src/multimedia/doc/src/images/video-graphics-memory.png +++ b/src/multimedia/doc/src/images/video-graphics-memory.png diff --git a/src/multimedia/doc/src/images/video-qml-paint-rate.png b/src/multimedia/doc/src/images/video-qml-paint-rate.png Binary files differindex 1519ff64e..cb7d822d9 100644 --- a/src/multimedia/doc/src/images/video-qml-paint-rate.png +++ b/src/multimedia/doc/src/images/video-qml-paint-rate.png diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index acde6fe8e..761e488ba 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -82,6 +82,10 @@ ANDROID_FEATURES += \ android.hardware.camera.autofocus \ android.hardware.microphone +MODULE_WINRT_CAPABILITIES_DEVICE += \ + microphone \ + webcam + win32: LIBS_PRIVATE += -luuid HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp index a266e2226..9e1be9606 100644 --- a/src/plugins/directshow/camera/dscamerasession.cpp +++ b/src/plugins/directshow/camera/dscamerasession.cpp @@ -1098,9 +1098,19 @@ void DSCameraSession::disconnectGraph() pPin = NULL; } - m_filterGraph->RemoveFilter(m_nullRendererFilter); - m_filterGraph->RemoveFilter(m_previewFilter); - m_filterGraph->RemoveFilter(m_sourceFilter); + // To avoid increasing the memory usage every time the graph is re-connected it's + // important that all filters are released; also the ones added by the "Intelligent Connect". + IEnumFilters *enumFilters = NULL; + hr = m_filterGraph->EnumFilters(&enumFilters); + if (SUCCEEDED(hr)) { + IBaseFilter *filter = NULL; + while (enumFilters->Next(1, &filter, NULL) == S_OK) { + m_filterGraph->RemoveFilter(filter); + enumFilters->Reset(); + filter->Release(); + } + enumFilters->Release(); + } } static bool qt_frameRateRangeGreaterThan(const QCamera::FrameRateRange &r1, const QCamera::FrameRateRange &r2) diff --git a/src/plugins/directshow/player/directshowmediatype.cpp b/src/plugins/directshow/player/directshowmediatype.cpp index 984979c6e..cbe1753ae 100644 --- a/src/plugins/directshow/player/directshowmediatype.cpp +++ b/src/plugins/directshow/player/directshowmediatype.cpp @@ -198,11 +198,9 @@ QVideoSurfaceFormat::Direction DirectShowMediaType::scanLineDirection(QVideoFram case QVideoFrame::Format_BGR24: case QVideoFrame::Format_RGB565: case QVideoFrame::Format_RGB555: -#ifndef Q_OS_WINCE return bmiHeader.biHeight < 0 ? QVideoSurfaceFormat::TopToBottom : QVideoSurfaceFormat::BottomToTop; -#endif default: return QVideoSurfaceFormat::TopToBottom; } diff --git a/src/plugins/qnx/common/windowgrabber.cpp b/src/plugins/qnx/common/windowgrabber.cpp index 5f42096fb..ce5b45298 100644 --- a/src/plugins/qnx/common/windowgrabber.cpp +++ b/src/plugins/qnx/common/windowgrabber.cpp @@ -46,6 +46,7 @@ #include <qpa/qplatformnativeinterface.h> #include <QOpenGLContext> +#include <QOpenGLFunctions> #ifdef Q_OS_BLACKBERRY #include <bps/event.h> @@ -349,6 +350,9 @@ void WindowGrabber::checkForEglImageExtension() m_eglImageSupported = m_context->hasExtension(QByteArrayLiteral("GL_OES_EGL_image")) && eglExtensions.contains(QByteArrayLiteral("EGL_KHR_image")); + if (strstr(reinterpret_cast<const char*>(glGetString(GL_VENDOR)), "VMware")) + m_eglImageSupported = false; + m_eglImageCheck = true; } diff --git a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro index 2bed926b9..f59027bc2 100644 --- a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro +++ b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro @@ -5,10 +5,12 @@ QT += multimedia-private qml testlib HEADERS += \ ../../../../src/imports/multimedia/qdeclarativeaudio_p.h \ + ../../../../src/imports/multimedia/qdeclarativeplaylist_p.h \ ../../../../src/imports/multimedia/qdeclarativemediametadata_p.h SOURCES += \ tst_qdeclarativeaudio.cpp \ + ../../../../src/imports/multimedia/qdeclarativeplaylist.cpp \ ../../../../src/imports/multimedia/qdeclarativeaudio.cpp INCLUDEPATH += ../../../../src/imports/multimedia |
