11 files changed, 317 insertions, 686 deletions

diff --git a/src/plugins/wmf/mftvideo.cpp b/src/plugins/wmf/mftvideo.cpp
index b141d49a2..1b3c5bbca 100644
--- a/src/plugins/wmf/mftvideo.cpp
+++ b/src/plugins/wmf/mftvideo.cpp
@@ -52,6 +52,7 @@ MFTransform::MFTransform():
     m_inputType(0),
     m_outputType(0),
     m_sample(0),
+    m_videoSinkTypeHandler(0),
     m_bytesPerLine(0)
 {
 }
@@ -64,8 +65,8 @@ MFTransform::~MFTransform()
     if (m_outputType)
         m_outputType->Release();
 
-    for (int i = 0; i < m_mediaTypes.size(); ++i)
-        m_mediaTypes[i]->Release();
+    if (m_videoSinkTypeHandler)
+        m_videoSinkTypeHandler->Release();
 }
 
 void MFTransform::addProbe(MFVideoProbeControl *probe)
@@ -84,12 +85,18 @@ void MFTransform::removeProbe(MFVideoProbeControl *probe)
     m_videoProbes.removeOne(probe);
 }
 
-void MFTransform::addSupportedMediaType(IMFMediaType *type)
+void MFTransform::setVideoSink(IUnknown *videoSink)
 {
-    if (!type)
-        return;
-    QMutexLocker locker(&m_mutex);
-    m_mediaTypes.append(type);
+    // This transform supports the same input types as the video sink.
+    // Store its type handler interface in order to report the correct supported types.
+
+    if (m_videoSinkTypeHandler) {
+        m_videoSinkTypeHandler->Release();
+        m_videoSinkTypeHandler = NULL;
+    }
+
+    if (videoSink)
+        videoSink->QueryInterface(IID_PPV_ARGS(&m_videoSinkTypeHandler));
 }
 
 STDMETHODIMP MFTransform::QueryInterface(REFIID riid, void** ppv)
@@ -165,9 +172,12 @@ STDMETHODIMP MFTransform::GetInputStreamInfo(DWORD dwInputStreamID, MFT_INPUT_ST
 
     pStreamInfo->cbSize = 0;
     pStreamInfo->hnsMaxLatency = 0;
-    pStreamInfo->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER;
     pStreamInfo->cbMaxLookahead = 0;
     pStreamInfo->cbAlignment = 0;
+    pStreamInfo->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES
+                            | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER
+                            | MFT_INPUT_STREAM_PROCESSES_IN_PLACE;
+
     return S_OK;
 }
 
@@ -182,8 +192,11 @@ STDMETHODIMP MFTransform::GetOutputStreamInfo(DWORD dwOutputStreamID, MFT_OUTPUT
         return E_POINTER;
 
     pStreamInfo->cbSize = 0;
-    pStreamInfo->dwFlags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER;
     pStreamInfo->cbAlignment = 0;
+    pStreamInfo->dwFlags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES
+                            | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER
+                            | MFT_OUTPUT_STREAM_PROVIDES_SAMPLES
+                            | MFT_OUTPUT_STREAM_DISCARDABLE;
 
     return S_OK;
 }
@@ -228,20 +241,42 @@ STDMETHODIMP MFTransform::AddInputStreams(DWORD cStreams, DWORD *adwStreamIDs)
 
 STDMETHODIMP MFTransform::GetInputAvailableType(DWORD dwInputStreamID, DWORD dwTypeIndex, IMFMediaType **ppType)
 {
-    // This MFT does not have a list of preferred input types
-    Q_UNUSED(dwInputStreamID);
-    Q_UNUSED(dwTypeIndex);
-    Q_UNUSED(ppType);
-    return E_NOTIMPL;
+    // We support the same input types as the video sink
+    if (!m_videoSinkTypeHandler)
+        return E_NOTIMPL;
+
+    if (dwInputStreamID > 0)
+        return MF_E_INVALIDSTREAMNUMBER;
+
+    if (!ppType)
+        return E_POINTER;
+
+    return m_videoSinkTypeHandler->GetMediaTypeByIndex(dwTypeIndex, ppType);
 }
 
-STDMETHODIMP MFTransform::GetOutputAvailableType(DWORD dwOutputStreamID,DWORD dwTypeIndex, IMFMediaType **ppType)
+STDMETHODIMP MFTransform::GetOutputAvailableType(DWORD dwOutputStreamID, DWORD dwTypeIndex, IMFMediaType **ppType)
 {
-    // This MFT does not have a list of preferred output types
-    Q_UNUSED(dwOutputStreamID);
-    Q_UNUSED(dwTypeIndex);
-    Q_UNUSED(ppType);
-    return E_NOTIMPL;
+    // Since we don't modify the samples, the output type must be the same as the input type.
+    // Report our input type as the only available output type.
+
+    if (dwOutputStreamID > 0)
+        return MF_E_INVALIDSTREAMNUMBER;
+
+    if (!ppType)
+        return E_POINTER;
+
+    // Input type must be set first
+    if (!m_inputType)
+        return MF_E_TRANSFORM_TYPE_NOT_SET;
+
+    if (dwTypeIndex > 0)
+        return MF_E_NO_MORE_TYPES;
+
+    // Return a copy to make sure our type is not modified
+    if (FAILED(MFCreateMediaType(ppType)))
+        return E_OUTOFMEMORY;
+
+    return m_inputType->CopyAllItems(*ppType);
 }
 
 STDMETHODIMP MFTransform::SetInputType(DWORD dwInputStreamID, IMFMediaType *pType, DWORD dwFlags)
@@ -257,17 +292,14 @@ STDMETHODIMP MFTransform::SetInputType(DWORD dwInputStreamID, IMFMediaType *pTyp
     if (!isMediaTypeSupported(pType))
         return MF_E_INVALIDMEDIATYPE;
 
-    DWORD flags = 0;
-    if (pType && !m_inputType && m_outputType && m_outputType->IsEqual(pType, &flags) != S_OK)
-        return MF_E_INVALIDMEDIATYPE;
-
     if (dwFlags == MFT_SET_TYPE_TEST_ONLY)
         return pType ? S_OK : E_POINTER;
 
     if (m_inputType) {
         m_inputType->Release();
         // Input type has changed, discard output type (if it's set) so it's reset later on
-        if (m_outputType &&  m_outputType->IsEqual(pType, &flags) != S_OK) {
+        DWORD flags = 0;
+        if (m_outputType && m_outputType->IsEqual(pType, &flags) != S_OK) {
             m_outputType->Release();
             m_outputType = 0;
         }
@@ -286,29 +318,27 @@ STDMETHODIMP MFTransform::SetOutputType(DWORD dwOutputStreamID, IMFMediaType *pT
     if (dwOutputStreamID > 0)
         return MF_E_INVALIDSTREAMNUMBER;
 
+    if (dwFlags == MFT_SET_TYPE_TEST_ONLY && !pType)
+        return E_POINTER;
+
     QMutexLocker locker(&m_mutex);
 
+    // Input type must be set first
+    if (!m_inputType)
+        return MF_E_TRANSFORM_TYPE_NOT_SET;
+
     if (m_sample)
         return MF_E_TRANSFORM_CANNOT_CHANGE_MEDIATYPE_WHILE_PROCESSING;
 
-    if (!isMediaTypeSupported(pType))
-        return MF_E_INVALIDMEDIATYPE;
-
     DWORD flags = 0;
-    if (pType && !m_outputType && m_inputType && m_inputType->IsEqual(pType, &flags) != S_OK)
+    if (pType && m_inputType->IsEqual(pType, &flags) != S_OK)
         return MF_E_INVALIDMEDIATYPE;
 
     if (dwFlags == MFT_SET_TYPE_TEST_ONLY)
         return pType ? S_OK : E_POINTER;
 
-    if (m_outputType) {
+    if (m_outputType)
         m_outputType->Release();
-        // Output type has changed, discard input type (if it's set) so it's reset later on
-        if (m_inputType &&  m_inputType->IsEqual(pType, &flags) != S_OK) {
-            m_inputType->Release();
-            m_inputType = 0;
-        }
-    }
 
     m_outputType = pType;
 
@@ -333,10 +363,11 @@ STDMETHODIMP MFTransform::GetInputCurrentType(DWORD dwInputStreamID, IMFMediaTyp
     if (!m_inputType)
         return MF_E_TRANSFORM_TYPE_NOT_SET;
 
-    *ppType = m_inputType;
-    (*ppType)->AddRef();
+    // Return a copy to make sure our type is not modified
+    if (FAILED(MFCreateMediaType(ppType)))
+        return E_OUTOFMEMORY;
 
-    return S_OK;
+    return m_inputType->CopyAllItems(*ppType);
 }
 
 STDMETHODIMP MFTransform::GetOutputCurrentType(DWORD dwOutputStreamID, IMFMediaType **ppType)
@@ -349,19 +380,14 @@ STDMETHODIMP MFTransform::GetOutputCurrentType(DWORD dwOutputStreamID, IMFMediaT
 
     QMutexLocker locker(&m_mutex);
 
-    if (!m_outputType) {
-        if (m_inputType) {
-            *ppType = m_inputType;
-            (*ppType)->AddRef();
-            return S_OK;
-        }
+    if (!m_outputType)
         return MF_E_TRANSFORM_TYPE_NOT_SET;
-    }
 
-    *ppType = m_outputType;
-    (*ppType)->AddRef();
+    // Return a copy to make sure our type is not modified
+    if (FAILED(MFCreateMediaType(ppType)))
+        return E_OUTOFMEMORY;
 
-    return S_OK;
+    return m_outputType->CopyAllItems(*ppType);
 }
 
 STDMETHODIMP MFTransform::GetInputStatus(DWORD dwInputStreamID, DWORD *pdwFlags)
@@ -374,7 +400,7 @@ STDMETHODIMP MFTransform::GetInputStatus(DWORD dwInputStreamID, DWORD *pdwFlags)
 
     QMutexLocker locker(&m_mutex);
 
-    if (!m_inputType)
+    if (!m_inputType || !m_outputType)
         return MF_E_TRANSFORM_TYPE_NOT_SET;
 
     if (m_sample)
@@ -392,7 +418,7 @@ STDMETHODIMP MFTransform::GetOutputStatus(DWORD *pdwFlags)
 
     QMutexLocker locker(&m_mutex);
 
-    if (!m_outputType)
+    if (!m_inputType || !m_outputType)
         return MF_E_TRANSFORM_TYPE_NOT_SET;
 
     if (m_sample)
@@ -464,7 +490,7 @@ STDMETHODIMP MFTransform::ProcessInput(DWORD dwInputStreamID, IMFSample *pSample
 
     QMutexLocker locker(&m_mutex);
 
-    if (!m_inputType || !m_outputType)
+    if (!m_inputType)
         return MF_E_TRANSFORM_TYPE_NOT_SET;
 
     if (m_sample)
@@ -485,23 +511,11 @@ STDMETHODIMP MFTransform::ProcessInput(DWORD dwInputStreamID, IMFSample *pSample
     m_sample = pSample;
     m_sample->AddRef();
 
-    QMutexLocker lockerProbe(&m_videoProbeMutex);
-
-    if (!m_videoProbes.isEmpty()) {
-        QVideoFrame frame = makeVideoFrame();
-
-        foreach (MFVideoProbeControl* probe, m_videoProbes)
-            probe->bufferProbed(frame);
-    }
-
     return S_OK;
 }
 
 STDMETHODIMP MFTransform::ProcessOutput(DWORD dwFlags, DWORD cOutputBufferCount, MFT_OUTPUT_DATA_BUFFER *pOutputSamples, DWORD *pdwStatus)
 {
-    if (dwFlags != 0)
-        return E_INVALIDARG;
-
     if (pOutputSamples == NULL || pdwStatus == NULL)
         return E_POINTER;
 
@@ -510,57 +524,44 @@ STDMETHODIMP MFTransform::ProcessOutput(DWORD dwFlags, DWORD cOutputBufferCount,
 
     QMutexLocker locker(&m_mutex);
 
-    if (!m_sample)
-        return MF_E_TRANSFORM_NEED_MORE_INPUT;
+    if (!m_inputType)
+        return MF_E_TRANSFORM_TYPE_NOT_SET;
+
+    if (!m_outputType) {
+        pOutputSamples[0].dwStatus = MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE;
+        return MF_E_TRANSFORM_STREAM_CHANGE;
+    }
 
     IMFMediaBuffer *input = NULL;
     IMFMediaBuffer *output = NULL;
 
-    DWORD sampleLength = 0;
-    m_sample->GetTotalLength(&sampleLength);
-
-    // If the sample length is null, it means we're getting DXVA buffers.
-    // In that case just pass on the sample we got as input.
-    // Otherwise we need to copy the input buffer into the buffer the sink
-    // is giving us.
-    if (pOutputSamples[0].pSample && sampleLength > 0) {
-
-        if (FAILED(m_sample->ConvertToContiguousBuffer(&input)))
-            goto done;
-
-        if (FAILED(pOutputSamples[0].pSample->ConvertToContiguousBuffer(&output)))
-            goto done;
-
-        DWORD inputLength = 0;
-        DWORD outputLength = 0;
-        input->GetMaxLength(&inputLength);
-        output->GetMaxLength(&outputLength);
+    if (dwFlags == MFT_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER)
+        goto done;
+    else if (dwFlags != 0)
+        return E_INVALIDARG;
 
-        if (outputLength < inputLength) {
-            pOutputSamples[0].pSample->RemoveAllBuffers();
-            output->Release();
-            output = NULL;
-            if (SUCCEEDED(MFCreateMemoryBuffer(inputLength, &output)))
-                pOutputSamples[0].pSample->AddBuffer(output);
-        }
+    if (!m_sample)
+        return MF_E_TRANSFORM_NEED_MORE_INPUT;
 
-        if (output)
-            m_sample->CopyToBuffer(output);
+    // Since the MFT_OUTPUT_STREAM_PROVIDES_SAMPLES flag is set, the client
+    // should not be providing samples here
+    if (pOutputSamples[0].pSample != NULL)
+        return E_INVALIDARG;
 
-        LONGLONG hnsDuration = 0;
-        LONGLONG hnsTime = 0;
-        if (SUCCEEDED(m_sample->GetSampleDuration(&hnsDuration)))
-            pOutputSamples[0].pSample->SetSampleDuration(hnsDuration);
-        if (SUCCEEDED(m_sample->GetSampleTime(&hnsTime)))
-            pOutputSamples[0].pSample->SetSampleTime(hnsTime);
+    pOutputSamples[0].pSample = m_sample;
+    pOutputSamples[0].pSample->AddRef();
 
+    // Send video frame to probes
+    // We do it here (instead of inside ProcessInput) to make sure samples discarded by the renderer
+    // are not sent.
+    m_videoProbeMutex.lock();
+    if (!m_videoProbes.isEmpty()) {
+        QVideoFrame frame = makeVideoFrame();
 
-    } else {
-        if (pOutputSamples[0].pSample)
-            pOutputSamples[0].pSample->Release();
-        pOutputSamples[0].pSample = m_sample;
-        pOutputSamples[0].pSample->AddRef();
+        foreach (MFVideoProbeControl* probe, m_videoProbes)
+            probe->bufferProbed(frame);
     }
+    m_videoProbeMutex.unlock();
 
 done:
     pOutputSamples[0].dwStatus = 0;
@@ -728,16 +729,10 @@ QByteArray MFTransform::dataFromBuffer(IMFMediaBuffer *buffer, int height, int *
 
 bool MFTransform::isMediaTypeSupported(IMFMediaType *type)
 {
-    // if the list is empty, it supports all formats
-    if (!type || m_mediaTypes.isEmpty())
+    // If we don't have the video sink's type handler,
+    // assume it supports anything...
+    if (!m_videoSinkTypeHandler || !type)
         return true;
 
-    for (int i = 0; i < m_mediaTypes.size(); ++i) {
-        DWORD flags = 0;
-        m_mediaTypes.at(i)->IsEqual(type, &flags);
-        if (flags & MF_MEDIATYPE_EQUAL_FORMAT_TYPES)
-            return true;
-    }
-
-    return false;
+    return m_videoSinkTypeHandler->IsMediaTypeSupported(type, NULL) == S_OK;
 }
diff --git a/src/plugins/wmf/mftvideo.h b/src/plugins/wmf/mftvideo.h
index 1a188c4db..c37c8f700 100644
--- a/src/plugins/wmf/mftvideo.h
+++ b/src/plugins/wmf/mftvideo.h
@@ -53,7 +53,7 @@ public:
     void addProbe(MFVideoProbeControl* probe);
     void removeProbe(MFVideoProbeControl* probe);
 
-    void addSupportedMediaType(IMFMediaType *type);
+    void setVideoSink(IUnknown *videoSink);
 
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID iid, void** ppv);
@@ -99,7 +99,7 @@ private:
     IMFSample *m_sample;
     QMutex m_mutex;
 
-    QList<IMFMediaType*> m_mediaTypes;
+    IMFMediaTypeHandler *m_videoSinkTypeHandler;
 
     QList<MFVideoProbeControl*> m_videoProbes;
     QMutex m_videoProbeMutex;
diff --git a/src/plugins/wmf/player/evr9videowindowcontrol.cpp b/src/plugins/wmf/player/evr9videowindowcontrol.cpp
deleted file mode 100644
index e94918dba..000000000
--- a/src/plugins/wmf/player/evr9videowindowcontrol.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "evr9videowindowcontrol.h"
-#include <QtWidgets/qwidget.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qglobal.h>
-
-Evr9VideoWindowControl::Evr9VideoWindowControl(QObject *parent)
-    : QVideoWindowControl(parent)
-    , m_windowId(0)
-    , m_dirtyValues(0)
-    , m_aspectRatioMode(Qt::KeepAspectRatio)
-    , m_brightness(0)
-    , m_contrast(0)
-    , m_hue(0)
-    , m_saturation(0)
-    , m_fullScreen(false)
-    , m_currentActivate(0)
-    , m_evrSink(0)
-    , m_displayControl(0)
-    , m_processor(0)
-{
-}
-
-Evr9VideoWindowControl::~Evr9VideoWindowControl()
-{
-   clear();
-}
-
-void Evr9VideoWindowControl::clear()
-{
-    if (m_processor)
-        m_processor->Release();
-    if (m_displayControl)
-        m_displayControl->Release();
-    if (m_evrSink)
-        m_evrSink->Release();
-    if (m_currentActivate) {
-        m_currentActivate->ShutdownObject();
-        m_currentActivate->Release();
-    }
-
-    m_processor = NULL;
-    m_displayControl = NULL;
-    m_evrSink = NULL;
-    m_currentActivate = NULL;
-}
-
-void Evr9VideoWindowControl::releaseActivate()
-{
-    clear();
-}
-
-WId Evr9VideoWindowControl::winId() const
-{
-    return m_windowId;
-}
-
-void Evr9VideoWindowControl::setWinId(WId id)
-{
-    m_windowId = id;
-
-    if (QWidget *widget = QWidget::find(m_windowId)) {
-        const QColor color = widget->palette().color(QPalette::Window);
-
-        m_windowColor = RGB(color.red(), color.green(), color.blue());
-    }
-
-    if (m_displayControl) {
-        m_displayControl->SetVideoWindow(HWND(m_windowId));
-    }
-}
-
-QRect Evr9VideoWindowControl::displayRect() const
-{
-    return m_displayRect;
-}
-
-void Evr9VideoWindowControl::setDisplayRect(const QRect &rect)
-{
-    m_displayRect = rect;
-
-    if (m_displayControl) {
-        RECT displayRect = { rect.left(), rect.top(), rect.right() + 1, rect.bottom() + 1 };
-        QSize sourceSize = nativeSize();
-
-        RECT sourceRect = { 0, 0, sourceSize.width(), sourceSize.height() };
-
-        if (m_aspectRatioMode == Qt::KeepAspectRatioByExpanding) {
-            QSize clippedSize = rect.size();
-            clippedSize.scale(sourceRect.right, sourceRect.bottom, Qt::KeepAspectRatio);
-
-            sourceRect.left = (sourceRect.right - clippedSize.width()) / 2;
-            sourceRect.top = (sourceRect.bottom - clippedSize.height()) / 2;
-            sourceRect.right = sourceRect.left + clippedSize.width();
-            sourceRect.bottom = sourceRect.top + clippedSize.height();
-        }
-
-        if (sourceSize.width() > 0 && sourceSize.height() > 0) {
-            MFVideoNormalizedRect sourceNormRect;
-            sourceNormRect.left = float(sourceRect.left) / float(sourceRect.right);
-            sourceNormRect.top = float(sourceRect.top) / float(sourceRect.bottom);
-            sourceNormRect.right = float(sourceRect.right) / float(sourceRect.right);
-            sourceNormRect.bottom = float(sourceRect.bottom) / float(sourceRect.bottom);
-            m_displayControl->SetVideoPosition(&sourceNormRect, &displayRect);
-        } else {
-            m_displayControl->SetVideoPosition(NULL, &displayRect);
-        }
-    }
-}
-
-bool Evr9VideoWindowControl::isFullScreen() const
-{
-    return m_fullScreen;
-}
-
-void Evr9VideoWindowControl::setFullScreen(bool fullScreen)
-{
-    if (m_fullScreen == fullScreen)
-        return;
-    emit fullScreenChanged(m_fullScreen = fullScreen);
-}
-
-void Evr9VideoWindowControl::repaint()
-{
-    QSize size = nativeSize();
-    if (size.width() > 0 && size.height() > 0
-        && m_displayControl
-        && SUCCEEDED(m_displayControl->RepaintVideo())) {
-        return;
-    }
-
-    PAINTSTRUCT paint;
-    if (HDC dc = ::BeginPaint(HWND(m_windowId), &paint)) {
-        HPEN pen = ::CreatePen(PS_SOLID, 1, m_windowColor);
-        HBRUSH brush = ::CreateSolidBrush(m_windowColor);
-        ::SelectObject(dc, pen);
-        ::SelectObject(dc, brush);
-
-        ::Rectangle(
-                dc,
-                m_displayRect.left(),
-                m_displayRect.top(),
-                m_displayRect.right() + 1,
-                m_displayRect.bottom() + 1);
-
-        ::DeleteObject(pen);
-        ::DeleteObject(brush);
-        ::EndPaint(HWND(m_windowId), &paint);
-    }
-}
-
-QSize Evr9VideoWindowControl::nativeSize() const
-{
-    QSize size;
-    if (m_displayControl) {
-        SIZE sourceSize;
-        if (SUCCEEDED(m_displayControl->GetNativeVideoSize(&sourceSize, 0)))
-            size = QSize(sourceSize.cx, sourceSize.cy);
-    }
-    return size;
-}
-
-Qt::AspectRatioMode Evr9VideoWindowControl::aspectRatioMode() const
-{
-    return m_aspectRatioMode;
-}
-
-void Evr9VideoWindowControl::setAspectRatioMode(Qt::AspectRatioMode mode)
-{
-    m_aspectRatioMode = mode;
-
-    if (m_displayControl) {
-        switch (mode) {
-        case Qt::IgnoreAspectRatio:
-            //comment from MSDN: Do not maintain the aspect ratio of the video. Stretch the video to fit the output rectangle.
-            m_displayControl->SetAspectRatioMode(MFVideoARMode_None);
-            break;
-        case Qt::KeepAspectRatio:
-            //comment from MSDN: Preserve the aspect ratio of the video by letterboxing or within the output rectangle.
-            m_displayControl->SetAspectRatioMode(MFVideoARMode_PreservePicture);
-            break;
-        case Qt::KeepAspectRatioByExpanding:
-            //for this mode, more adjustment will be done in setDisplayRect
-            m_displayControl->SetAspectRatioMode(MFVideoARMode_PreservePicture);
-            break;
-        default:
-            break;
-        }
-        setDisplayRect(m_displayRect);
-    }
-}
-
-int Evr9VideoWindowControl::brightness() const
-{
-    return m_brightness;
-}
-
-void Evr9VideoWindowControl::setBrightness(int brightness)
-{
-    if (m_brightness == brightness)
-        return;
-
-    m_brightness = brightness;
-
-    m_dirtyValues |= DXVA2_ProcAmp_Brightness;
-
-    setProcAmpValues();
-
-    emit brightnessChanged(brightness);
-}
-
-int Evr9VideoWindowControl::contrast() const
-{
-    return m_contrast;
-}
-
-void Evr9VideoWindowControl::setContrast(int contrast)
-{
-    if (m_contrast == contrast)
-        return;
-
-    m_contrast = contrast;
-
-    m_dirtyValues |= DXVA2_ProcAmp_Contrast;
-
-    setProcAmpValues();
-
-    emit contrastChanged(contrast);
-}
-
-int Evr9VideoWindowControl::hue() const
-{
-    return m_hue;
-}
-
-void Evr9VideoWindowControl::setHue(int hue)
-{
-    if (m_hue == hue)
-        return;
-
-    m_hue = hue;
-
-    m_dirtyValues |= DXVA2_ProcAmp_Hue;
-
-    setProcAmpValues();
-
-    emit hueChanged(hue);
-}
-
-int Evr9VideoWindowControl::saturation() const
-{
-    return m_saturation;
-}
-
-void Evr9VideoWindowControl::setSaturation(int saturation)
-{
-    if (m_saturation == saturation)
-        return;
-
-    m_saturation = saturation;
-
-    m_dirtyValues |= DXVA2_ProcAmp_Saturation;
-
-    setProcAmpValues();
-
-    emit saturationChanged(saturation);
-}
-
-IMFActivate* Evr9VideoWindowControl::createActivate()
-{
-    clear();
-
-    if (FAILED(MFCreateVideoRendererActivate(0, &m_currentActivate))) {
-        qWarning() << "Failed to create evr video renderer activate!";
-        return 0;
-    }
-    if (FAILED(m_currentActivate->ActivateObject(IID_IMFMediaSink, (LPVOID*)(&m_evrSink)))) {
-        qWarning() << "Failed to activate evr media sink!";
-        return 0;
-    }
-    if (FAILED(MFGetService(m_evrSink, MR_VIDEO_RENDER_SERVICE, IID_PPV_ARGS(&m_displayControl)))) {
-        qWarning() << "Failed to get display control from evr media sink!";
-        return 0;
-    }
-    if (FAILED(MFGetService(m_evrSink,  MR_VIDEO_MIXER_SERVICE, IID_PPV_ARGS(&m_processor)))) {
-        qWarning() << "Failed to get video processor from evr media sink!";
-        return 0;
-    }
-
-    setWinId(m_windowId);
-    setDisplayRect(m_displayRect);
-    setAspectRatioMode(m_aspectRatioMode);
-    m_dirtyValues = DXVA2_ProcAmp_Brightness | DXVA2_ProcAmp_Contrast | DXVA2_ProcAmp_Hue | DXVA2_ProcAmp_Saturation;
-
-    return m_currentActivate;
-}
-
-void Evr9VideoWindowControl::setProcAmpValues()
-{
-    if (m_processor) {
-        DXVA2_ProcAmpValues values;
-        if (m_dirtyValues & DXVA2_ProcAmp_Brightness) {
-            values.Brightness = scaleProcAmpValue(DXVA2_ProcAmp_Brightness, m_brightness);
-        }
-        if (m_dirtyValues & DXVA2_ProcAmp_Contrast) {
-            values.Contrast = scaleProcAmpValue(DXVA2_ProcAmp_Contrast, m_contrast);
-        }
-        if (m_dirtyValues & DXVA2_ProcAmp_Hue) {
-            values.Hue = scaleProcAmpValue(DXVA2_ProcAmp_Hue, m_hue);
-        }
-        if (m_dirtyValues & DXVA2_ProcAmp_Saturation) {
-            values.Saturation = scaleProcAmpValue(DXVA2_ProcAmp_Saturation, m_saturation);
-        }
-
-        if (SUCCEEDED(m_processor->SetProcAmpValues(m_dirtyValues, &values))) {
-            m_dirtyValues = 0;
-        }
-    }
-}
-
-DXVA2_Fixed32 Evr9VideoWindowControl::scaleProcAmpValue(DWORD prop, int value) const
-{
-    float scaledValue = 0.0;
-
-    DXVA2_ValueRange  range;
-    if (SUCCEEDED(m_processor->GetProcAmpRange(prop, &range))) {
-        scaledValue = DXVA2FixedToFloat(range.DefaultValue);
-        if (value > 0)
-            scaledValue += float(value) * (DXVA2FixedToFloat(range.MaxValue) - DXVA2FixedToFloat(range.DefaultValue)) / 100;
-        else if (value < 0)
-            scaledValue -= float(value) * (DXVA2FixedToFloat(range.MinValue) - DXVA2FixedToFloat(range.DefaultValue)) / 100;
-    }
-
-    return DXVA2FloatToFixed(scaledValue);
-}
diff --git a/src/plugins/wmf/player/mfevrvideowindowcontrol.cpp b/src/plugins/wmf/player/mfevrvideowindowcontrol.cpp
new file mode 100644
index 000000000..404f38125
--- /dev/null
+++ b/src/plugins/wmf/player/mfevrvideowindowcontrol.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mfevrvideowindowcontrol.h"
+
+#include <qdebug.h>
+
+MFEvrVideoWindowControl::MFEvrVideoWindowControl(QObject *parent)
+    : EvrVideoWindowControl(parent)
+    , m_currentActivate(NULL)
+    , m_evrSink(NULL)
+{
+}
+
+MFEvrVideoWindowControl::~MFEvrVideoWindowControl()
+{
+   clear();
+}
+
+void MFEvrVideoWindowControl::clear()
+{
+    setEvr(NULL);
+
+    if (m_evrSink)
+        m_evrSink->Release();
+    if (m_currentActivate) {
+        m_currentActivate->ShutdownObject();
+        m_currentActivate->Release();
+    }
+    m_evrSink = NULL;
+    m_currentActivate = NULL;
+}
+
+IMFActivate* MFEvrVideoWindowControl::createActivate()
+{
+    clear();
+
+    if (FAILED(MFCreateVideoRendererActivate(0, &m_currentActivate))) {
+        qWarning() << "Failed to create evr video renderer activate!";
+        return NULL;
+    }
+    if (FAILED(m_currentActivate->ActivateObject(IID_IMFMediaSink, (LPVOID*)(&m_evrSink)))) {
+        qWarning() << "Failed to activate evr media sink!";
+        return NULL;
+    }
+    if (!setEvr(m_evrSink))
+        return NULL;
+
+    return m_currentActivate;
+}
+
+void MFEvrVideoWindowControl::releaseActivate()
+{
+    clear();
+}
diff --git a/src/plugins/wmf/player/evr9videowindowcontrol.h b/src/plugins/wmf/player/mfevrvideowindowcontrol.h
index 05486f987..e5a38f27d 100644
--- a/src/plugins/wmf/player/evr9videowindowcontrol.h
+++ b/src/plugins/wmf/player/mfevrvideowindowcontrol.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
@@ -31,76 +31,27 @@
 **
 ****************************************************************************/
 
-#ifndef EVR9VIDEOWINDOWCONTROL_H
-#define EVR9VIDEOWINDOWCONTROL_H
+#ifndef MFEVRVIDEOWINDOWCONTROL_H
+#define MFEVRVIDEOWINDOWCONTROL_H
 
-#include "qvideowindowcontrol.h"
-
-#include <Mfidl.h>
-#include <d3d9.h>
-#include <Evr9.h>
+#include "evrvideowindowcontrol.h"
 
 QT_USE_NAMESPACE
 
-class Evr9VideoWindowControl : public QVideoWindowControl
+class MFEvrVideoWindowControl : public EvrVideoWindowControl
 {
-    Q_OBJECT
 public:
-    Evr9VideoWindowControl(QObject *parent = 0);
-    ~Evr9VideoWindowControl();
-
-    WId winId() const;
-    void setWinId(WId id);
-
-    QRect displayRect() const;
-    void setDisplayRect(const QRect &rect);
-
-    bool isFullScreen() const;
-    void setFullScreen(bool fullScreen);
-
-    void repaint();
-
-    QSize nativeSize() const;
-
-    Qt::AspectRatioMode aspectRatioMode() const;
-    void setAspectRatioMode(Qt::AspectRatioMode mode);
-
-    int brightness() const;
-    void setBrightness(int brightness);
-
-    int contrast() const;
-    void setContrast(int contrast);
-
-    int hue() const;
-    void setHue(int hue);
-
-    int saturation() const;
-    void setSaturation(int saturation);
+    MFEvrVideoWindowControl(QObject *parent = 0);
+    ~MFEvrVideoWindowControl();
 
     IMFActivate* createActivate();
     void releaseActivate();
 
-    void setProcAmpValues();
-
 private:
     void clear();
-    DXVA2_Fixed32 scaleProcAmpValue(DWORD prop, int value) const;
-
-    WId m_windowId;
-    COLORREF m_windowColor;
-    DWORD m_dirtyValues;
-    Qt::AspectRatioMode m_aspectRatioMode;
-    QRect m_displayRect;
-    int m_brightness;
-    int m_contrast;
-    int m_hue;
-    int m_saturation;
-    bool m_fullScreen;
 
     IMFActivate *m_currentActivate;
     IMFMediaSink *m_evrSink;
-    IMFVideoDisplayControl *m_displayControl;
-    IMFVideoProcessor *m_processor;
 };
 
-#endif
+#endif // MFEVRVIDEOWINDOWCONTROL_H
diff --git a/src/plugins/wmf/player/mfplayerservice.cpp b/src/plugins/wmf/player/mfplayerservice.cpp
index 4e88b0498..99c6abb3e 100644
--- a/src/plugins/wmf/player/mfplayerservice.cpp
+++ b/src/plugins/wmf/player/mfplayerservice.cpp
@@ -36,9 +36,7 @@
 #include <QtCore/qdebug.h>
 
 #include "mfplayercontrol.h"
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
-#include "evr9videowindowcontrol.h"
-#endif
+#include "mfevrvideowindowcontrol.h"
 #include "mfvideorenderercontrol.h"
 #include "mfaudioendpointcontrol.h"
 #include "mfaudioprobecontrol.h"
@@ -50,9 +48,7 @@
 MFPlayerService::MFPlayerService(QObject *parent)
     : QMediaService(parent)
     , m_session(0)
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
     , m_videoWindowControl(0)
-#endif
     , m_videoRendererControl(0)
 {
     m_audioEndpointControl = new MFAudioEndpointControl(this);
@@ -65,10 +61,8 @@ MFPlayerService::~MFPlayerService()
 {
     m_session->close();
 
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
     if (m_videoWindowControl)
         delete m_videoWindowControl;
-#endif
 
     if (m_videoRendererControl)
         delete m_videoRendererControl;
@@ -85,21 +79,15 @@ QMediaControl* MFPlayerService::requestControl(const char *name)
     } else if (qstrcmp(name, QMetaDataReaderControl_iid) == 0) {
         return m_metaDataControl;
     } else if (qstrcmp(name, QVideoRendererControl_iid) == 0) {
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
         if (!m_videoRendererControl && !m_videoWindowControl) {
-#else
-        if (!m_videoRendererControl) {
-#endif
             m_videoRendererControl = new MFVideoRendererControl;
             return m_videoRendererControl;
         }
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
     } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
         if (!m_videoRendererControl && !m_videoWindowControl) {
-            m_videoWindowControl = new Evr9VideoWindowControl;
+            m_videoWindowControl = new MFEvrVideoWindowControl;
             return m_videoWindowControl;
         }
-#endif
     } else if (qstrcmp(name,QMediaAudioProbeControl_iid) == 0) {
         if (m_session) {
             MFAudioProbeControl *probe = new MFAudioProbeControl(this);
@@ -129,12 +117,10 @@ void MFPlayerService::releaseControl(QMediaControl *control)
         delete m_videoRendererControl;
         m_videoRendererControl = 0;
         return;
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
     } else if (control == m_videoWindowControl) {
         delete m_videoWindowControl;
         m_videoWindowControl = 0;
         return;
-#endif
     }
 
     MFAudioProbeControl* audioProbe = qobject_cast<MFAudioProbeControl*>(control);
@@ -164,12 +150,10 @@ MFVideoRendererControl* MFPlayerService::videoRendererControl() const
     return m_videoRendererControl;
 }
 
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
-Evr9VideoWindowControl* MFPlayerService::videoWindowControl() const
+MFEvrVideoWindowControl* MFPlayerService::videoWindowControl() const
 {
     return m_videoWindowControl;
 }
-#endif
 
 MFMetaDataControl* MFPlayerService::metaDataControl() const
 {
diff --git a/src/plugins/wmf/player/mfplayerservice.h b/src/plugins/wmf/player/mfplayerservice.h
index 62eb6b640..b3db70799 100644
--- a/src/plugins/wmf/player/mfplayerservice.h
+++ b/src/plugins/wmf/player/mfplayerservice.h
@@ -48,9 +48,7 @@ QT_END_NAMESPACE
 
 QT_USE_NAMESPACE
 
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
-class Evr9VideoWindowControl;
-#endif
+class MFEvrVideoWindowControl;
 class MFAudioEndpointControl;
 class MFVideoRendererControl;
 class MFPlayerControl;
@@ -69,18 +67,14 @@ public:
 
     MFAudioEndpointControl* audioEndpointControl() const;
     MFVideoRendererControl* videoRendererControl() const;
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
-    Evr9VideoWindowControl* videoWindowControl() const;
-#endif
+    MFEvrVideoWindowControl* videoWindowControl() const;
     MFMetaDataControl* metaDataControl() const;
 
 private:
     MFPlayerSession *m_session;
     MFVideoRendererControl *m_videoRendererControl;
     MFAudioEndpointControl *m_audioEndpointControl;
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
-    Evr9VideoWindowControl *m_videoWindowControl;
-#endif
+    MFEvrVideoWindowControl *m_videoWindowControl;
     MFPlayerControl        *m_player;
     MFMetaDataControl      *m_metaDataControl;
 };
diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp
index 283853def..0ac1c3d66 100644
--- a/src/plugins/wmf/player/mfplayersession.cpp
+++ b/src/plugins/wmf/player/mfplayersession.cpp
@@ -43,9 +43,7 @@
 #include <QtCore/qbuffer.h>
 
 #include "mfplayercontrol.h"
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
-#include "evr9videowindowcontrol.h"
-#endif
+#include "mfevrvideowindowcontrol.h"
 #include "mfvideorenderercontrol.h"
 #include "mfaudioendpointcontrol.h"
 
@@ -140,10 +138,8 @@ void MFPlayerSession::close()
 
     if (m_playerService->videoRendererControl()) {
         m_playerService->videoRendererControl()->releaseActivate();
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
     } else if (m_playerService->videoWindowControl()) {
         m_playerService->videoWindowControl()->releaseActivate();
-#endif
     }
 
     if (m_session)
@@ -270,6 +266,25 @@ void MFPlayerSession::handleMediaSourceReady()
     }
 }
 
+MFPlayerSession::MediaType MFPlayerSession::getStreamType(IMFStreamDescriptor *stream) const
+{
+    if (!stream)
+        return Unknown;
+
+    IMFMediaTypeHandler *typeHandler = NULL;
+    if (SUCCEEDED(stream->GetMediaTypeHandler(&typeHandler))) {
+        GUID guidMajorType;
+        if (SUCCEEDED(typeHandler->GetMajorType(&guidMajorType))) {
+            if (guidMajorType == MFMediaType_Audio)
+                return Audio;
+            else if (guidMajorType == MFMediaType_Video)
+                return Video;
+        }
+    }
+
+    return Unknown;
+}
+
 void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentationDescriptor *sourcePD)
 {
     HRESULT hr = S_OK;
@@ -298,45 +313,58 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
     for (DWORD i = 0; i < cSourceStreams; i++)
     {
         BOOL fSelected = FALSE;
+        bool streamAdded = false;
         IMFStreamDescriptor *streamDesc = NULL;
 
         HRESULT hr = sourcePD->GetStreamDescriptorByIndex(i, &fSelected, &streamDesc);
         if (SUCCEEDED(hr)) {
-            MediaType mediaType = Unknown;
-            IMFTopologyNode *sourceNode = addSourceNode(topology, source, sourcePD, streamDesc);
-            if (sourceNode) {
-                IMFTopologyNode *outputNode = addOutputNode(streamDesc, mediaType, topology, 0);
-                if (outputNode) {
-                    bool connected = false;
-                    if (mediaType == Audio) {
-                        if (!m_audioSampleGrabberNode)
-                            connected = setupAudioSampleGrabber(topology, sourceNode, outputNode);
-                    } else if (mediaType == Video && outputNodeId == -1) {
-                        // Remember video output node ID.
-                        outputNode->GetTopoNodeID(&outputNodeId);
-                    }
+            // The media might have multiple audio and video streams,
+            // only use one of each kind, and only if it is selected by default.
+            MediaType mediaType = getStreamType(streamDesc);
+            if (mediaType != Unknown
+                    && ((m_mediaTypes & mediaType) == 0) // Check if this type isn't already added
+                    && fSelected) {
+
+                IMFTopologyNode *sourceNode = addSourceNode(topology, source, sourcePD, streamDesc);
+                if (sourceNode) {
+                    IMFTopologyNode *outputNode = addOutputNode(mediaType, topology, 0);
+                    if (outputNode) {
+                        bool connected = false;
+                        if (mediaType == Audio) {
+                            if (!m_audioSampleGrabberNode)
+                                connected = setupAudioSampleGrabber(topology, sourceNode, outputNode);
+                        } else if (mediaType == Video && outputNodeId == -1) {
+                            // Remember video output node ID.
+                            outputNode->GetTopoNodeID(&outputNodeId);
+                        }
 
-                    if (!connected)
-                        hr = sourceNode->ConnectOutput(0, outputNode, 0);
-                    if (FAILED(hr)) {
-                        emit error(QMediaPlayer::FormatError, tr("Unable to play any stream."), false);
-                    }
-                    else {
-                        succeededCount++;
-                        m_mediaTypes |= mediaType;
-                        switch (mediaType) {
-                        case Audio:
-                            emit audioAvailable();
-                            break;
-                        case Video:
-                            emit videoAvailable();
-                            break;
+                        if (!connected)
+                            hr = sourceNode->ConnectOutput(0, outputNode, 0);
+
+                        if (FAILED(hr)) {
+                            emit error(QMediaPlayer::FormatError, tr("Unable to play any stream."), false);
+                        } else {
+                            streamAdded = true;
+                            succeededCount++;
+                            m_mediaTypes |= mediaType;
+                            switch (mediaType) {
+                            case Audio:
+                                emit audioAvailable();
+                                break;
+                            case Video:
+                                emit videoAvailable();
+                                break;
+                            }
                         }
+                        outputNode->Release();
                     }
-                    outputNode->Release();
+                    sourceNode->Release();
                 }
-                sourceNode->Release();
             }
+
+            if (fSelected && !streamAdded)
+                sourcePD->DeselectStream(i);
+
             streamDesc->Release();
         }
     }
@@ -381,58 +409,38 @@ IMFTopologyNode* MFPlayerSession::addSourceNode(IMFTopology* topology, IMFMediaS
     return NULL;
 }
 
-IMFTopologyNode* MFPlayerSession::addOutputNode(IMFStreamDescriptor *streamDesc, MediaType& mediaType, IMFTopology* topology, DWORD sinkID)
+IMFTopologyNode* MFPlayerSession::addOutputNode(MediaType mediaType, IMFTopology* topology, DWORD sinkID)
 {
     IMFTopologyNode *node = NULL;
-    HRESULT hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node);
-    if (FAILED(hr))
+    if (FAILED(MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node)))
         return NULL;
-    node->SetUINT32(MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, FALSE);
 
-    mediaType = Unknown;
-    IMFMediaTypeHandler *handler = NULL;
-    hr = streamDesc->GetMediaTypeHandler(&handler);
-    if (SUCCEEDED(hr)) {
-        GUID guidMajorType;
-        hr = handler->GetMajorType(&guidMajorType);
-        if (SUCCEEDED(hr)) {
-            IMFActivate *activate = NULL;
-            if (MFMediaType_Audio == guidMajorType) {
-                mediaType = Audio;
-                activate = m_playerService->audioEndpointControl()->createActivate();
-            } else if (MFMediaType_Video == guidMajorType) {
-                mediaType = Video;
-                if (m_playerService->videoRendererControl()) {
-                    activate = m_playerService->videoRendererControl()->createActivate();
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
-                } else if (m_playerService->videoWindowControl()) {
-                    activate = m_playerService->videoWindowControl()->createActivate();
-#endif
-                } else {
-                    qWarning() << "no videoWindowControl or videoRendererControl, unable to add output node for video data";
-                }
-            } else {
-                // Unknown stream type.
-                emit error(QMediaPlayer::FormatError, tr("Unknown stream type."), false);
-            }
-
-            if (activate) {
-                hr = node->SetObject(activate);
-                if (SUCCEEDED(hr)) {
-                    hr = node->SetUINT32(MF_TOPONODE_STREAMID, sinkID);
-                    if (SUCCEEDED(hr)) {
-                        if (SUCCEEDED(topology->AddNode(node))) {
-                            handler->Release();
-                            return node;
-                        }
-                    }
-                }
-            }
+    IMFActivate *activate = NULL;
+    if (mediaType == Audio) {
+        activate = m_playerService->audioEndpointControl()->createActivate();
+    } else if (mediaType == Video) {
+        if (m_playerService->videoRendererControl()) {
+            activate = m_playerService->videoRendererControl()->createActivate();
+        } else if (m_playerService->videoWindowControl()) {
+            activate = m_playerService->videoWindowControl()->createActivate();
+        } else {
+            qWarning() << "no videoWindowControl or videoRendererControl, unable to add output node for video data";
         }
-        handler->Release();
+    } else {
+        // Unknown stream type.
+        emit error(QMediaPlayer::FormatError, tr("Unknown stream type."), false);
     }
-    node->Release();
-    return NULL;
+
+    if (!activate
+            || FAILED(node->SetObject(activate))
+            || FAILED(node->SetUINT32(MF_TOPONODE_STREAMID, sinkID))
+            || FAILED(node->SetUINT32(MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, FALSE))
+            || FAILED(topology->AddNode(node))) {
+        node->Release();
+        node = NULL;
+    }
+
+    return node;
 }
 
 bool MFPlayerSession::addAudioSampleGrabberNode(IMFTopology *topology)
@@ -698,7 +706,6 @@ IMFTopology *MFPlayerSession::insertMFT(IMFTopology *topology, TOPOID outputNode
             IUnknown *element = 0;
             IMFTopologyNode *node = 0;
             IUnknown *outputObject = 0;
-            IMFMediaTypeHandler *videoSink = 0;
             IMFTopologyNode *inputNode = 0;
             IMFTopologyNode *mftNode = 0;
             bool mftAdded = false;
@@ -717,22 +724,10 @@ IMFTopology *MFPlayerSession::insertMFT(IMFTopology *topology, TOPOID outputNode
                 if (id != outputNodeId)
                     break;
 
-                // Use output supported media types for the MFT
                 if (FAILED(node->GetObject(&outputObject)))
                     break;
 
-                if (FAILED(outputObject->QueryInterface(IID_IMFMediaTypeHandler, (void**)&videoSink)))
-                    break;
-
-                DWORD mtCount;
-                if (FAILED(videoSink->GetMediaTypeCount(&mtCount)))
-                    break;
-
-                for (DWORD i = 0; i < mtCount; ++i) {
-                    IMFMediaType *type = 0;
-                    if (SUCCEEDED(videoSink->GetMediaTypeByIndex(i, &type)))
-                        m_videoProbeMFT->addSupportedMediaType(type);
-                }
+                m_videoProbeMFT->setVideoSink(outputObject);
 
                 // Insert MFT between the output node and the node connected to it.
                 DWORD outputIndex = 0;
@@ -766,13 +761,13 @@ IMFTopology *MFPlayerSession::insertMFT(IMFTopology *topology, TOPOID outputNode
                 node->Release();
             if (element)
                 element->Release();
-            if (videoSink)
-                videoSink->Release();
             if (outputObject)
                 outputObject->Release();
 
             if (mftAdded)
                 break;
+            else
+                m_videoProbeMFT->setVideoSink(NULL);
         }
     } while (false);
 
@@ -1580,13 +1575,11 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
         }
 
         updatePendingCommands(CmdStart);
-#if defined(HAVE_WIDGETS) && !defined(Q_WS_SIMULATOR)
         // playback started, we can now set again the procAmpValues if they have been
         // changed previously (these are lost when loading a new media)
         if (m_playerService->videoWindowControl()) {
-            m_playerService->videoWindowControl()->setProcAmpValues();
+            m_playerService->videoWindowControl()->applyImageControls();
         }
-#endif
         break;
     case MESessionStopped:
         if (m_status != QMediaPlayer::EndOfMedia) {
diff --git a/src/plugins/wmf/player/mfplayersession.h b/src/plugins/wmf/player/mfplayersession.h
index effb36fa2..5bbf8e212 100644
--- a/src/plugins/wmf/player/mfplayersession.h
+++ b/src/plugins/wmf/player/mfplayersession.h
@@ -57,7 +57,7 @@ QT_USE_NAMESPACE
 
 class SourceResolver;
 #ifndef Q_WS_SIMULATOR
-class Evr9VideoWindowControl;
+class EvrVideoWindowControl;
 #endif
 class MFAudioEndpointControl;
 class MFVideoRendererControl;
@@ -215,9 +215,10 @@ private:
 
     void createSession();
     void setupPlaybackTopology(IMFMediaSource *source, IMFPresentationDescriptor *sourcePD);
+    MediaType getStreamType(IMFStreamDescriptor *stream) const;
     IMFTopologyNode* addSourceNode(IMFTopology* topology, IMFMediaSource* source,
         IMFPresentationDescriptor* presentationDesc, IMFStreamDescriptor *streamDesc);
-    IMFTopologyNode* addOutputNode(IMFStreamDescriptor *streamDesc, MediaType& mediaType, IMFTopology* topology, DWORD sinkID);
+    IMFTopologyNode* addOutputNode(MediaType mediaType, IMFTopology* topology, DWORD sinkID);
 
     bool addAudioSampleGrabberNode(IMFTopology* topology);
     bool setupAudioSampleGrabber(IMFTopology *topology, IMFTopologyNode *sourceNode, IMFTopologyNode *outputNode);
diff --git a/src/plugins/wmf/player/player.pri b/src/plugins/wmf/player/player.pri
index dd5c9dc12..c24370eea 100644
--- a/src/plugins/wmf/player/player.pri
+++ b/src/plugins/wmf/player/player.pri
@@ -12,7 +12,8 @@ HEADERS += \
     $$PWD/mfaudioendpointcontrol.h \
     $$PWD/mfmetadatacontrol.h \
     $$PWD/mfaudioprobecontrol.h \
-    $$PWD/mfvideoprobecontrol.h
+    $$PWD/mfvideoprobecontrol.h \
+    $$PWD/mfevrvideowindowcontrol.h
 
 SOURCES += \
     $$PWD/mfplayerservice.cpp \
@@ -22,9 +23,7 @@ SOURCES += \
     $$PWD/mfaudioendpointcontrol.cpp \
     $$PWD/mfmetadatacontrol.cpp \
     $$PWD/mfaudioprobecontrol.cpp \
-    $$PWD/mfvideoprobecontrol.cpp
+    $$PWD/mfvideoprobecontrol.cpp \
+    $$PWD/mfevrvideowindowcontrol.cpp
 
-qtHaveModule(widgets):!simulator {
-    HEADERS += $$PWD/evr9videowindowcontrol.h
-    SOURCES += $$PWD/evr9videowindowcontrol.cpp
-}
+include($$PWD/../../common/evr.pri)
diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro
index 60fc3f641..68a777f37 100644
--- a/src/plugins/wmf/wmf.pro
+++ b/src/plugins/wmf/wmf.pro
@@ -1,9 +1,6 @@
 TARGET = wmfengine
 QT += multimedia-private network
-qtHaveModule(widgets) {
-    QT += multimediawidgets-private
-    DEFINES += HAVE_WIDGETS
-}
+
 win32:!qtHaveModule(opengl) {
     LIBS_PRIVATE += -lgdi32 -luser32
 }
@@ -37,15 +34,14 @@ contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
     QT += gui-private
 
     HEADERS += \
-        evrcustompresenter.h \
-        evrd3dpresentengine.h
+        $$PWD/evrcustompresenter.h \
+        $$PWD/evrd3dpresentengine.h
 
     SOURCES += \
-        evrcustompresenter.cpp \
-        evrd3dpresentengine.cpp
+        $$PWD/evrcustompresenter.cpp \
+        $$PWD/evrd3dpresentengine.cpp
 }
 
-
 include (player/player.pri)
 include (decoder/decoder.pri)