config.tests/directshow/main.cpp

@@ -43,13 +43,6 @@
 #include <d3d9.h>
 #include <vmr9.h>
 
-#pragma include_alias("dxtrans.h","qedit.h")
-#define __IDxtCompositor_INTERFACE_DEFINED__
-#define __IDxtAlphaSetter_INTERFACE_DEFINED__
-#define __IDxtJpeg_INTERFACE_DEFINED__
-#define __IDxtKey_INTERFACE_DEFINED__
-#include <qedit.h>
-
 int main(int, char**)
 {
     return 0;

examples/multimediawidgets/camera/camera.cpp

@@ -46,6 +46,7 @@
 #include <QMediaService>
 #include <QMediaRecorder>
 #include <QCameraViewfinder>
+#include <QMediaMetaData>
 
 #include <QMessageBox>
 #include <QPalette>

examples/multimediawidgets/player/player.cpp

@@ -47,9 +47,9 @@
 #include <QMediaService>
 #include <QMediaPlaylist>
 #include <QVideoProbe>
+#include <QMediaMetaData>
 #include <QtWidgets>
 
-
 Player::Player(QWidget *parent)
     : QWidget(parent)
     , videoWidget(0)

src/imports/multimedia/qdeclarativecamerafocus.cpp

@@ -179,7 +179,10 @@ bool QDeclarativeCameraFocus::isFocusModeSupported(QDeclarativeCamera::FocusMode
 
 void QDeclarativeCameraFocus::setFocusMode(QDeclarativeCamera::FocusMode mode)
 {
-    m_focus->setFocusMode(QCameraFocus::FocusModes(int(mode)));
+    if (mode != focusMode()) {
+        m_focus->setFocusMode(QCameraFocus::FocusModes(int(mode)));
+        emit focusModeChanged(focusMode());
+    }
 }
 /*!
     \property QDeclarativeCameraFocus::focusPointMode

src/imports/multimedia/qdeclarativemediametadata_p.h

@@ -54,6 +54,7 @@
 //
 
 #include <QtQml/qqml.h>
+#include <QtMultimedia/qmediametadata.h>
 #include "qmediaobject.h"
 
 QT_BEGIN_NAMESPACE

src/multimedia/playback/playlistfileparser.cpp

@@ -43,7 +43,7 @@
 #include <qfileinfo.h>
 #include <QtNetwork/QNetworkReply>
 #include "qmediaobject_p.h"
-#include "qmultimedia.h"
+#include "qmediametadata.h"
 
 QT_BEGIN_NAMESPACE
 

src/multimedia/qmultimedia.h

@@ -47,7 +47,6 @@
 #include <QtCore/qstring.h>
 
 #include <QtMultimedia/qtmultimediadefs.h>
-#include <QtMultimedia/qmediametadata.h>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/android/mediaplayer/qandroidmetadatareadercontrol.cpp

@@ -42,6 +42,7 @@
 #include "qandroidmetadatareadercontrol.h"
 
 #include "jmediametadataretriever.h"
+#include <QtMultimedia/qmediametadata.h>
 #include <qsize.h>
 #include <QDate>
 

src/plugins/android/mediaplayer/qandroidvideorendercontrol.cpp

@@ -182,7 +182,8 @@ void QAndroidVideoRendererControl::setSurface(QAbstractVideoSurface *surface)
 
     m_surface = surface;
 
-    m_useImage = !m_surface->supportedPixelFormats(QAbstractVideoBuffer::GLTextureHandle).contains(QVideoFrame::Format_BGR32);
+    if (m_surface)
+        m_useImage = !m_surface->supportedPixelFormats(QAbstractVideoBuffer::GLTextureHandle).contains(QVideoFrame::Format_BGR32);
 }
 
 jobject QAndroidVideoRendererControl::surfaceHolder()

src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm

@@ -42,7 +42,7 @@
 #include "avfmediaplayermetadatacontrol.h"
 #include "avfmediaplayersession.h"
 
-#include <QtMultimedia/qmultimedia.h>
+#include <QtMultimedia/qmediametadata.h>
 
 #import <AVFoundation/AVFoundation.h>
 

src/plugins/blackberry/mediaplayer/bbmetadatareadercontrol.cpp

@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "bbmetadatareadercontrol.h"
+#include <QtMultimedia/qmediametadata.h>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/directshow/camera/dscamerasession.cpp

@@ -656,6 +656,10 @@ HRESULT DSCameraSession::getPin(IBaseFilter *pFilter, PIN_DIRECTION PinDir, IPin
 
 bool DSCameraSession::createFilterGraph()
 {
+    // Previously containered in <qedit.h>.
+    static const IID iID_ISampleGrabber = { 0x6B652FFF, 0x11FE, 0x4fce, { 0x92, 0xAD, 0x02, 0x66, 0xB5, 0xD7, 0xC7, 0x8F } };
+    static const CLSID cLSID_SampleGrabber = { 0xC1F400A0, 0x3F08, 0x11d3, { 0x9F, 0x0B, 0x00, 0x60, 0x08, 0x03, 0x9E, 0x37 } };
+
     HRESULT hr;
     IMoniker* pMoniker = NULL;
     ICreateDevEnum* pDevEnum = NULL;
@@ -752,14 +756,14 @@ bool DSCameraSession::createFilterGraph()
     }
 
     // Sample grabber filter
-    hr = CoCreateInstance(CLSID_SampleGrabber, NULL,CLSCTX_INPROC,
+    hr = CoCreateInstance(cLSID_SampleGrabber, NULL,CLSCTX_INPROC,
                           IID_IBaseFilter, (void**)&pSG_Filter);
     if (FAILED(hr)) {
         qWarning() << "failed to create sample grabber";
         return false;
     }
 
-    hr = pSG_Filter->QueryInterface(IID_ISampleGrabber, (void**)&pSG);
+    hr = pSG_Filter->QueryInterface(iID_ISampleGrabber, (void**)&pSG);
     if (FAILED(hr)) {
         qWarning() << "failed to get sample grabber";
         return false;

src/plugins/directshow/camera/dscamerasession.h

@@ -69,7 +69,6 @@
 #define __IDxtAlphaSetter_INTERFACE_DEFINED__
 #define __IDxtJpeg_INTERFACE_DEFINED__
 #define __IDxtKey_INTERFACE_DEFINED__
-#include <qedit.h>
 
 struct ICaptureGraphBuilder2;
 struct ISampleGrabber;

src/plugins/directshow/directshow.pro

@@ -24,4 +24,5 @@ win32-g++ {
 include(camera/camera.pri)
 
 OTHER_FILES += \
-    directshow.json
+    directshow.json \
+    directshow_camera.json

src/plugins/directshow/directshow_camera.json

+{
+    "Keys": ["org.qt-project.qt.camera"]
+}

src/plugins/directshow/dsserviceplugin.h

@@ -54,7 +54,13 @@ class DSServicePlugin
     Q_OBJECT
     Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
     Q_INTERFACES(QMediaServiceFeaturesInterface)
+    // The player service provided by the WMF-plugin should preferably be used.
+    // DirectShow should then only provide the camera (see QTBUG-29172, QTBUG-29175).
+#ifdef QMEDIA_DIRECTSHOW_PLAYER
     Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "directshow.json")
+#else
+    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "directshow_camera.json")
+#endif
 
 public:
     QMediaService* create(QString const& key);

src/plugins/directshow/player/directshowmetadatacontrol.cpp

@@ -44,9 +44,9 @@
 #include <qnetwork.h>
 
 #include "directshowmetadatacontrol.h"
-
 #include "directshowplayerservice.h"
 
+#include <QtMultimedia/qmediametadata.h>
 #include <QtCore/qcoreapplication.h>
 
 #ifndef QT_NO_WMSDK

src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp

@@ -46,6 +46,7 @@
 #include <private/qgstvideobuffer_p.h>
 #include <private/qvideosurfacegstsink_p.h>
 #include <private/qgstutils_p.h>
+#include <QtMultimedia/qmediametadata.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qbuffer.h>
 #include <QtGui/qimagereader.h>

src/plugins/gstreamer/camerabin/camerabinmetadata.cpp

@@ -41,6 +41,8 @@
 
 #include "camerabinmetadata.h"
 
+#include <QtMultimedia/qmediametadata.h>
+
 #include <gst/gst.h>
 #include <gst/gstversion.h>
 

src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp

@@ -41,6 +41,8 @@
 
 #include "qgstreamercapturemetadatacontrol.h"
 
+#include <QtMultimedia/qmediametadata.h>
+
 #include <gst/gst.h>
 #include <gst/gstversion.h>