Remove unused video probe functionality from Windows backend

The custom MFTransform was used to implement QVideoProbe on Qt 5. But
this interface was not taken over to Qt 6. Therefore, this code is no
longer needed.

This patch removes the custom MFTransform code from 'windows' backend
to simplify WMF topology and to make the code more maintainable.

Pick-to: 6.6 6.5
Change-Id: I92204e2e9c791714dab3604cb87b7fde2acc2afa
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit f926d068442148151524dd4288145d4a1cb98bde)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

5 files changed, 0 insertions, 809 deletions

diff --git a/src/plugins/multimedia/windows/CMakeLists.txt b/src/plugins/multimedia/windows/CMakeLists.txt
index b6d32cb5a..963081e0a 100644
--- a/src/plugins/multimedia/windows/CMakeLists.txt
+++ b/src/plugins/multimedia/windows/CMakeLists.txt
@@ -17,7 +17,6 @@ qt_internal_add_plugin(QWindowsMediaPlugin
         player/mfevrvideowindowcontrol.cpp player/mfevrvideowindowcontrol_p.h
         player/mfplayercontrol.cpp player/mfplayercontrol_p.h
         player/mfplayersession.cpp player/mfplayersession_p.h
-        player/mftvideo.cpp player/mftvideo_p.h
         player/mfvideorenderercontrol.cpp player/mfvideorenderercontrol_p.h
         mediacapture/qwindowscamera.cpp
         mediacapture/qwindowscamera_p.h
diff --git a/src/plugins/multimedia/windows/player/mfplayersession.cpp b/src/plugins/multimedia/windows/player/mfplayersession.cpp
index b210b1b92..c6f922806 100644
--- a/src/plugins/multimedia/windows/player/mfplayersession.cpp
+++ b/src/plugins/multimedia/windows/player/mfplayersession.cpp
@@ -15,7 +15,6 @@
 #include "qaudiooutput.h"
 
 #include "mfplayercontrol_p.h"
-#include "mfevrvideowindowcontrol_p.h"
 #include "mfvideorenderercontrol_p.h"
 #include <mfmetadata_p.h>
 #include <private/qwindowsmfdefs_p.h>
@@ -26,7 +25,6 @@
 #include <nserror.h>
 #include <winerror.h>
 #include "sourceresolver_p.h"
-#include "mftvideo_p.h"
 #include <wmcodecdsp.h>
 
 #include <mmdeviceapi.h>
@@ -121,7 +119,6 @@ void MFPlayerSession::close()
             m_sourceResolver->shutdown();
     }
     m_sourceResolver.Reset();
-    m_videoProbeMFT.Reset();
 
     m_videoRendererControl->releaseActivate();
 //    } else if (m_playerService->videoWindowControl()) {
@@ -579,71 +576,6 @@ ComPtr<IMFTopology> MFPlayerSession::insertMFT(const ComPtr<IMFTopology> &topolo
 
         if (insertResizer(resolvedTopology.Get()))
             isNewTopology = true;
-
-        // Get all output nodes and search for video output node.
-        if (FAILED(resolvedTopology->GetOutputNodeCollection(&outputNodes)))
-            break;
-
-        DWORD elementCount = 0;
-        if (FAILED(outputNodes->GetElementCount(&elementCount)))
-            break;
-
-        for (DWORD n = 0; n < elementCount; n++) {
-            ComPtr<IUnknown> element;
-            ComPtr<IMFTopologyNode> node;
-            ComPtr<IUnknown> outputObject;
-            ComPtr<IMFTopologyNode> inputNode;
-            ComPtr<IMFTopologyNode> mftNode;
-            bool mftAdded = false;
-
-            do {
-                if (FAILED(outputNodes->GetElement(n, &element)))
-                    break;
-
-                if (FAILED(element->QueryInterface(IID_IMFTopologyNode, &node)))
-                    break;
-
-                TOPOID id;
-                if (FAILED(node->GetTopoNodeID(&id)))
-                    break;
-
-                if (id != outputNodeId)
-                    break;
-
-                if (FAILED(node->GetObject(&outputObject)))
-                    break;
-
-                m_videoProbeMFT->setVideoSink(outputObject.Get());
-
-                // Insert MFT between the output node and the node connected to it.
-                DWORD outputIndex = 0;
-                if (FAILED(node->GetInput(0, &inputNode, &outputIndex)))
-                    break;
-
-                if (FAILED(MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &mftNode)))
-                    break;
-
-                if (FAILED(mftNode->SetObject(m_videoProbeMFT.Get())))
-                    break;
-
-                if (FAILED(resolvedTopology->AddNode(mftNode.Get())))
-                    break;
-
-                if (FAILED(inputNode->ConnectOutput(0, mftNode.Get(), 0)))
-                    break;
-
-                if (FAILED(mftNode->ConnectOutput(0, node.Get(), 0)))
-                    break;
-
-                mftAdded = true;
-                isNewTopology = true;
-            } while (false);
-
-            if (mftAdded)
-                break;
-            else
-                m_videoProbeMFT->setVideoSink(NULL);
-        }
     } while (false);
 
     if (isNewTopology) {
@@ -935,10 +867,6 @@ bool MFPlayerSession::createSession()
     QObject::connect(m_sourceResolver.Get(), &SourceResolver::error, this,
                      &MFPlayerSession::handleSourceError);
 
-    m_videoProbeMFT = makeComObject<MFTransform>();
-    //    for (int i = 0; i < m_videoProbes.size(); ++i)
-    //        m_videoProbeMFT->addProbe(m_videoProbes.at(i));
-
     m_position = 0;
     return true;
 }
diff --git a/src/plugins/multimedia/windows/player/mfplayersession_p.h b/src/plugins/multimedia/windows/player/mfplayersession_p.h
index b056cdd10..50141a7fb 100644
--- a/src/plugins/multimedia/windows/player/mfplayersession_p.h
+++ b/src/plugins/multimedia/windows/player/mfplayersession_p.h
@@ -230,8 +230,6 @@ private:
     ComPtr<IMFTopology> insertMFT(const ComPtr<IMFTopology> &topology, TOPOID outputNodeId);
     bool insertResizer(IMFTopology *topology);
     void insertColorConverter(IMFTopology *topology, TOPOID outputNodeId);
-    // ### Below can be used to monitor the video channel. Functionality currently unused.
-    ComPtr<MFTransform> m_videoProbeMFT;
 
     QTimer m_signalPositionChangeTimer;
     qint64 m_lastPosition = -1;
diff --git a/src/plugins/multimedia/windows/player/mftvideo.cpp b/src/plugins/multimedia/windows/player/mftvideo.cpp
deleted file mode 100644
index f56172db1..000000000
--- a/src/plugins/multimedia/windows/player/mftvideo.cpp
+++ /dev/null
@@ -1,644 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-#include "mftvideo_p.h"
-#include <private/qmemoryvideobuffer_p.h>
-#include <private/qwindowsmultimediautils_p.h>
-#include <mferror.h>
-#include <strmif.h>
-#include <uuids.h>
-#include <initguid.h>
-#include <d3d9.h>
-#include <qdebug.h>
-
-// This MFT sends all samples it processes to connected video probes.
-// Sample is sent to probes in ProcessInput.
-// In ProcessOutput this MFT simply returns the original sample.
-
-// The implementation is based on a boilerplate from the MF SDK example.
-
-MFTransform::~MFTransform()
-{
-    if (m_inputType)
-        m_inputType->Release();
-
-    if (m_outputType)
-        m_outputType->Release();
-
-    if (m_videoSinkTypeHandler)
-        m_videoSinkTypeHandler->Release();
-}
-
-//void MFTransform::addProbe(MFVideoProbeControl *probe)
-//{
-//    QMutexLocker locker(&m_videoProbeMutex);
-
-//    if (m_videoProbes.contains(probe))
-//        return;
-
-//    m_videoProbes.append(probe);
-//}
-
-//void MFTransform::removeProbe(MFVideoProbeControl *probe)
-//{
-//    QMutexLocker locker(&m_videoProbeMutex);
-//    m_videoProbes.removeOne(probe);
-//}
-
-void MFTransform::setVideoSink(IUnknown *videoSink)
-{
-    // 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::GetStreamLimits(DWORD *pdwInputMinimum, DWORD *pdwInputMaximum, DWORD *pdwOutputMinimum, DWORD *pdwOutputMaximum)
-{
-    if (!pdwInputMinimum || !pdwInputMaximum || !pdwOutputMinimum || !pdwOutputMaximum)
-        return E_POINTER;
-    *pdwInputMinimum = 1;
-    *pdwInputMaximum = 1;
-    *pdwOutputMinimum = 1;
-    *pdwOutputMaximum = 1;
-    return S_OK;
-}
-
-STDMETHODIMP MFTransform::GetStreamCount(DWORD *pcInputStreams, DWORD *pcOutputStreams)
-{
-    if (!pcInputStreams || !pcOutputStreams)
-        return E_POINTER;
-
-    *pcInputStreams = 1;
-    *pcOutputStreams = 1;
-    return S_OK;
-}
-
-STDMETHODIMP MFTransform::GetStreamIDs(DWORD dwInputIDArraySize, DWORD *pdwInputIDs, DWORD dwOutputIDArraySize, DWORD *pdwOutputIDs)
-{
-    // streams are numbered consecutively
-    Q_UNUSED(dwInputIDArraySize);
-    Q_UNUSED(pdwInputIDs);
-    Q_UNUSED(dwOutputIDArraySize);
-    Q_UNUSED(pdwOutputIDs);
-    return E_NOTIMPL;
-}
-
-STDMETHODIMP MFTransform::GetInputStreamInfo(DWORD dwInputStreamID, MFT_INPUT_STREAM_INFO *pStreamInfo)
-{
-    QMutexLocker locker(&m_mutex);
-
-    if (dwInputStreamID > 0)
-        return MF_E_INVALIDSTREAMNUMBER;
-
-    if (!pStreamInfo)
-        return E_POINTER;
-
-    pStreamInfo->cbSize = 0;
-    pStreamInfo->hnsMaxLatency = 0;
-    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;
-}
-
-STDMETHODIMP MFTransform::GetOutputStreamInfo(DWORD dwOutputStreamID, MFT_OUTPUT_STREAM_INFO *pStreamInfo)
-{
-    QMutexLocker locker(&m_mutex);
-
-    if (dwOutputStreamID > 0)
-        return MF_E_INVALIDSTREAMNUMBER;
-
-    if (!pStreamInfo)
-        return E_POINTER;
-
-    pStreamInfo->cbSize = 0;
-    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;
-}
-
-STDMETHODIMP MFTransform::GetAttributes(IMFAttributes **pAttributes)
-{
-    // This MFT does not support attributes.
-    Q_UNUSED(pAttributes);
-    return E_NOTIMPL;
-}
-
-STDMETHODIMP MFTransform::GetInputStreamAttributes(DWORD dwInputStreamID, IMFAttributes **pAttributes)
-{
-    // This MFT does not support input stream attributes.
-    Q_UNUSED(dwInputStreamID);
-    Q_UNUSED(pAttributes);
-    return E_NOTIMPL;
-}
-
-STDMETHODIMP MFTransform::GetOutputStreamAttributes(DWORD dwOutputStreamID, IMFAttributes **pAttributes)
-{
-    // This MFT does not support output stream attributes.
-    Q_UNUSED(dwOutputStreamID);
-    Q_UNUSED(pAttributes);
-    return E_NOTIMPL;
-}
-
-STDMETHODIMP MFTransform::DeleteInputStream(DWORD dwStreamID)
-{
-    // This MFT has a fixed number of input streams.
-    Q_UNUSED(dwStreamID);
-    return E_NOTIMPL;
-}
-
-STDMETHODIMP MFTransform::AddInputStreams(DWORD cStreams, DWORD *adwStreamIDs)
-{
-    // This MFT has a fixed number of input streams.
-    Q_UNUSED(cStreams);
-    Q_UNUSED(adwStreamIDs);
-    return E_NOTIMPL;
-}
-
-STDMETHODIMP MFTransform::GetInputAvailableType(DWORD dwInputStreamID, DWORD dwTypeIndex, IMFMediaType **ppType)
-{
-    // 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)
-{
-    // 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)
-{
-    if (dwInputStreamID > 0)
-        return MF_E_INVALIDSTREAMNUMBER;
-
-    QMutexLocker locker(&m_mutex);
-
-    if (m_sample)
-        return MF_E_TRANSFORM_CANNOT_CHANGE_MEDIATYPE_WHILE_PROCESSING;
-
-    if (!isMediaTypeSupported(pType))
-        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
-        DWORD flags = 0;
-        if (m_outputType && m_outputType->IsEqual(pType, &flags) != S_OK) {
-            m_outputType->Release();
-            m_outputType = 0;
-        }
-    }
-
-    m_inputType = pType;
-
-    if (m_inputType)
-        m_inputType->AddRef();
-
-    return S_OK;
-}
-
-STDMETHODIMP MFTransform::SetOutputType(DWORD dwOutputStreamID, IMFMediaType *pType, DWORD dwFlags)
-{
-    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;
-
-    DWORD flags = 0;
-    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)
-        m_outputType->Release();
-
-    m_outputType = pType;
-
-    if (m_outputType) {
-        m_outputType->AddRef();
-        m_format = videoFormatForMFMediaType(m_outputType, &m_bytesPerLine);
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP MFTransform::GetInputCurrentType(DWORD dwInputStreamID, IMFMediaType **ppType)
-{
-    if (dwInputStreamID > 0)
-        return MF_E_INVALIDSTREAMNUMBER;
-
-    if (ppType == NULL)
-        return E_POINTER;
-
-    QMutexLocker locker(&m_mutex);
-
-    if (!m_inputType)
-        return MF_E_TRANSFORM_TYPE_NOT_SET;
-
-    // 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::GetOutputCurrentType(DWORD dwOutputStreamID, IMFMediaType **ppType)
-{
-    if (dwOutputStreamID > 0)
-        return MF_E_INVALIDSTREAMNUMBER;
-
-    if (ppType == NULL)
-        return E_POINTER;
-
-    QMutexLocker locker(&m_mutex);
-
-    if (!m_outputType)
-        return MF_E_TRANSFORM_TYPE_NOT_SET;
-
-    // Return a copy to make sure our type is not modified
-    if (FAILED(MFCreateMediaType(ppType)))
-        return E_OUTOFMEMORY;
-
-    return m_outputType->CopyAllItems(*ppType);
-}
-
-STDMETHODIMP MFTransform::GetInputStatus(DWORD dwInputStreamID, DWORD *pdwFlags)
-{
-    if (dwInputStreamID > 0)
-        return MF_E_INVALIDSTREAMNUMBER;
-
-    if (!pdwFlags)
-        return E_POINTER;
-
-    QMutexLocker locker(&m_mutex);
-
-    if (!m_inputType || !m_outputType)
-        return MF_E_TRANSFORM_TYPE_NOT_SET;
-
-    if (m_sample)
-        *pdwFlags = 0;
-    else
-        *pdwFlags = MFT_INPUT_STATUS_ACCEPT_DATA;
-
-    return S_OK;
-}
-
-STDMETHODIMP MFTransform::GetOutputStatus(DWORD *pdwFlags)
-{
-    if (!pdwFlags)
-        return E_POINTER;
-
-    QMutexLocker locker(&m_mutex);
-
-    if (!m_inputType || !m_outputType)
-        return MF_E_TRANSFORM_TYPE_NOT_SET;
-
-    if (m_sample)
-        *pdwFlags = MFT_OUTPUT_STATUS_SAMPLE_READY;
-    else
-        *pdwFlags = 0;
-
-    return S_OK;
-}
-
-STDMETHODIMP MFTransform::SetOutputBounds(LONGLONG hnsLowerBound, LONGLONG hnsUpperBound)
-{
-    Q_UNUSED(hnsLowerBound);
-    Q_UNUSED(hnsUpperBound);
-    return E_NOTIMPL;
-}
-
-STDMETHODIMP MFTransform::ProcessEvent(DWORD dwInputStreamID, IMFMediaEvent *pEvent)
-{
-    // This MFT ignores all events, and the pipeline should send all events downstream.
-    Q_UNUSED(dwInputStreamID);
-    Q_UNUSED(pEvent);
-    return E_NOTIMPL;
-}
-
-STDMETHODIMP MFTransform::ProcessMessage(MFT_MESSAGE_TYPE eMessage, ULONG_PTR ulParam)
-{
-    Q_UNUSED(ulParam);
-
-    HRESULT hr = S_OK;
-
-    switch (eMessage)
-    {
-    case MFT_MESSAGE_COMMAND_FLUSH:
-        hr = OnFlush();
-        break;
-
-    case MFT_MESSAGE_COMMAND_DRAIN:
-        // Drain: Tells the MFT not to accept any more input until
-        // all of the pending output has been processed. That is our
-        // default behevior already, so there is nothing to do.
-        break;
-
-    case MFT_MESSAGE_SET_D3D_MANAGER:
-        // The pipeline should never send this message unless the MFT
-        // has the MF_SA_D3D_AWARE attribute set to TRUE. However, if we
-        // do get this message, it's invalid and we don't implement it.
-        hr = E_NOTIMPL;
-        break;
-
-    // The remaining messages do not require any action from this MFT.
-    case MFT_MESSAGE_NOTIFY_BEGIN_STREAMING:
-    case MFT_MESSAGE_NOTIFY_END_STREAMING:
-    case MFT_MESSAGE_NOTIFY_END_OF_STREAM:
-    case MFT_MESSAGE_NOTIFY_START_OF_STREAM:
-        break;
-
-    default:
-        break;
-    }
-
-    return hr;
-}
-
-STDMETHODIMP MFTransform::ProcessInput(DWORD dwInputStreamID, IMFSample *pSample, DWORD dwFlags)
-{
-    if (dwInputStreamID > 0)
-        return MF_E_INVALIDSTREAMNUMBER;
-
-    if (dwFlags != 0)
-        return E_INVALIDARG; // dwFlags is reserved and must be zero.
-
-    QMutexLocker locker(&m_mutex);
-
-    if (!m_inputType)
-        return MF_E_TRANSFORM_TYPE_NOT_SET;
-
-    if (m_sample)
-        return MF_E_NOTACCEPTING;
-
-    // Validate the number of buffers. There should only be a single buffer to hold the video frame.
-    DWORD dwBufferCount = 0;
-    HRESULT hr = pSample->GetBufferCount(&dwBufferCount);
-    if (FAILED(hr))
-        return hr;
-
-    if (dwBufferCount == 0)
-        return E_FAIL;
-
-    if (dwBufferCount > 1)
-        return MF_E_SAMPLE_HAS_TOO_MANY_BUFFERS;
-
-    m_sample = pSample;
-    m_sample->AddRef();
-
-    QMutexLocker lockerProbe(&m_videoProbeMutex);
-
-//    if (!m_videoProbes.isEmpty()) {
-//        QVideoFrame frame = makeVideoFrame();
-
-//        for (MFVideoProbeControl* probe : std::as_const(m_videoProbes))
-//            probe->bufferProbed(frame);
-//    }
-
-    return S_OK;
-}
-
-STDMETHODIMP MFTransform::ProcessOutput(DWORD dwFlags, DWORD cOutputBufferCount, MFT_OUTPUT_DATA_BUFFER *pOutputSamples, DWORD *pdwStatus)
-{
-    if (pOutputSamples == NULL || pdwStatus == NULL)
-        return E_POINTER;
-
-    if (cOutputBufferCount != 1)
-        return E_INVALIDARG;
-
-    QMutexLocker locker(&m_mutex);
-
-    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;
-    }
-
-    if (dwFlags == MFT_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER)
-        goto done;
-    else if (dwFlags != 0)
-        return E_INVALIDARG;
-
-    if (!m_sample)
-        return MF_E_TRANSFORM_NEED_MORE_INPUT;
-
-    // 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;
-
-    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();
-
-//        for (MFVideoProbeControl* probe : std::as_const(m_videoProbes))
-//            probe->bufferProbed(frame);
-//    }
-    m_videoProbeMutex.unlock();
-
-done:
-    pOutputSamples[0].dwStatus = 0;
-    *pdwStatus = 0;
-
-    m_sample->Release();
-    m_sample = 0;
-
-    return S_OK;
-}
-
-HRESULT MFTransform::OnFlush()
-{
-    QMutexLocker locker(&m_mutex);
-
-    if (m_sample) {
-        m_sample->Release();
-        m_sample = 0;
-    }
-    return S_OK;
-}
-
-QVideoFrameFormat MFTransform::videoFormatForMFMediaType(IMFMediaType *mediaType, int *bytesPerLine)
-{
-    UINT32 stride;
-    if (FAILED(mediaType->GetUINT32(MF_MT_DEFAULT_STRIDE, &stride))) {
-        *bytesPerLine = 0;
-        return QVideoFrameFormat();
-    }
-
-    *bytesPerLine = (int)stride;
-
-    QSize size;
-    UINT32 width, height;
-    if (FAILED(MFGetAttributeSize(mediaType, MF_MT_FRAME_SIZE, &width, &height)))
-        return QVideoFrameFormat();
-
-    size.setWidth(width);
-    size.setHeight(height);
-
-    GUID subtype = GUID_NULL;
-    if (FAILED(mediaType->GetGUID(MF_MT_SUBTYPE, &subtype)))
-        return QVideoFrameFormat();
-
-    QVideoFrameFormat::PixelFormat pixelFormat =
-            QWindowsMultimediaUtils::pixelFormatFromMediaSubtype(subtype);
-    QVideoFrameFormat format(size, pixelFormat);
-
-    quint32 num, den;
-    if (SUCCEEDED(MFGetAttributeRatio(mediaType, MF_MT_FRAME_RATE, &num, &den))) {
-        format.setFrameRate(qreal(num)/den);
-    }
-
-    return format;
-}
-
-QVideoFrame MFTransform::makeVideoFrame()
-{
-    QVideoFrame frame;
-
-    if (!m_format.isValid())
-        return frame;
-
-    IMFMediaBuffer *buffer = 0;
-
-    do {
-        if (FAILED(m_sample->ConvertToContiguousBuffer(&buffer)))
-            break;
-
-        QByteArray array = dataFromBuffer(buffer, m_format.frameHeight(), &m_bytesPerLine);
-        if (array.isEmpty())
-            break;
-
-        // Wrapping IMFSample or IMFMediaBuffer in a QVideoFrame is not possible because we cannot hold
-        // IMFSample for a "long" time without affecting the rest of the topology.
-        // If IMFSample is held for more than 5 frames decoder starts to reuse it even though it hasn't been released it yet.
-        // That is why we copy data from IMFMediaBuffer here.
-        frame = QVideoFrame(new QMemoryVideoBuffer(array, m_bytesPerLine), m_format);
-
-        // WMF uses 100-nanosecond units, Qt uses microseconds
-        LONGLONG startTime = -1;
-        if (SUCCEEDED(m_sample->GetSampleTime(&startTime))) {
-            frame.setStartTime(startTime * 0.1);
-
-            LONGLONG duration = -1;
-            if (SUCCEEDED(m_sample->GetSampleDuration(&duration)))
-                frame.setEndTime((startTime + duration) * 0.1);
-        }
-    } while (false);
-
-    if (buffer)
-        buffer->Release();
-
-    return frame;
-}
-
-QByteArray MFTransform::dataFromBuffer(IMFMediaBuffer *buffer, int height, int *bytesPerLine)
-{
-    QByteArray array;
-    BYTE *bytes;
-    DWORD length;
-    HRESULT hr = buffer->Lock(&bytes, NULL, &length);
-    if (SUCCEEDED(hr)) {
-        array = QByteArray((const char *)bytes, (int)length);
-        buffer->Unlock();
-    } else {
-        // try to lock as Direct3DSurface
-        IDirect3DSurface9 *surface = 0;
-        do {
-            if (FAILED(MFGetService(buffer, MR_BUFFER_SERVICE, IID_IDirect3DSurface9, (void**)&surface)))
-                break;
-
-            D3DLOCKED_RECT rect;
-            if (FAILED(surface->LockRect(&rect, NULL, D3DLOCK_READONLY)))
-                break;
-
-            if (bytesPerLine)
-                *bytesPerLine = (int)rect.Pitch;
-
-            array = QByteArray((const char *)rect.pBits, rect.Pitch * height);
-            surface->UnlockRect();
-        } while (false);
-
-        if (surface) {
-            surface->Release();
-            surface = 0;
-        }
-    }
-
-    return array;
-}
-
-bool MFTransform::isMediaTypeSupported(IMFMediaType *type)
-{
-    // If we don't have the video sink's type handler,
-    // assume it supports anything...
-    if (!m_videoSinkTypeHandler || !type)
-        return true;
-
-    return m_videoSinkTypeHandler->IsMediaTypeSupported(type, NULL) == S_OK;
-}
diff --git a/src/plugins/multimedia/windows/player/mftvideo_p.h b/src/plugins/multimedia/windows/player/mftvideo_p.h
deleted file mode 100644
index 343d74132..000000000
--- a/src/plugins/multimedia/windows/player/mftvideo_p.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-#ifndef MFTVIDEO_H
-#define MFTVIDEO_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <mfapi.h>
-#include <mfidl.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qmutex.h>
-#include <QtMultimedia/qvideoframeformat.h>
-#include <private/qcomobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class MFVideoProbeControl;
-
-class QVideoFrame;
-
-class MFTransform : public QComObject<IMFTransform>
-{
-public:
-    void addProbe(MFVideoProbeControl* probe);
-    void removeProbe(MFVideoProbeControl* probe);
-
-    void setVideoSink(IUnknown *videoSink);
-
-    // IMFTransform methods
-    STDMETHODIMP GetStreamLimits(DWORD *pdwInputMinimum, DWORD *pdwInputMaximum, DWORD *pdwOutputMinimum, DWORD *pdwOutputMaximum) override;
-    STDMETHODIMP GetStreamCount(DWORD *pcInputStreams, DWORD *pcOutputStreams) override;
-    STDMETHODIMP GetStreamIDs(DWORD dwInputIDArraySize, DWORD *pdwInputIDs, DWORD dwOutputIDArraySize, DWORD *pdwOutputIDs) override;
-    STDMETHODIMP GetInputStreamInfo(DWORD dwInputStreamID, MFT_INPUT_STREAM_INFO *pStreamInfo) override;
-    STDMETHODIMP GetOutputStreamInfo(DWORD dwOutputStreamID, MFT_OUTPUT_STREAM_INFO *pStreamInfo) override;
-    STDMETHODIMP GetAttributes(IMFAttributes **pAttributes) override;
-    STDMETHODIMP GetInputStreamAttributes(DWORD dwInputStreamID, IMFAttributes **pAttributes) override;
-    STDMETHODIMP GetOutputStreamAttributes(DWORD dwOutputStreamID, IMFAttributes **pAttributes) override;
-    STDMETHODIMP DeleteInputStream(DWORD dwStreamID) override;
-    STDMETHODIMP AddInputStreams(DWORD cStreams, DWORD *adwStreamIDs) override;
-    STDMETHODIMP GetInputAvailableType(DWORD dwInputStreamID, DWORD dwTypeIndex, IMFMediaType **ppType) override;
-    STDMETHODIMP GetOutputAvailableType(DWORD dwOutputStreamID,DWORD dwTypeIndex, IMFMediaType **ppType) override;
-    STDMETHODIMP SetInputType(DWORD dwInputStreamID, IMFMediaType *pType, DWORD dwFlags) override;
-    STDMETHODIMP SetOutputType(DWORD dwOutputStreamID, IMFMediaType *pType, DWORD dwFlags) override;
-    STDMETHODIMP GetInputCurrentType(DWORD dwInputStreamID, IMFMediaType **ppType) override;
-    STDMETHODIMP GetOutputCurrentType(DWORD dwOutputStreamID, IMFMediaType **ppType) override;
-    STDMETHODIMP GetInputStatus(DWORD dwInputStreamID, DWORD *pdwFlags) override;
-    STDMETHODIMP GetOutputStatus(DWORD *pdwFlags) override;
-    STDMETHODIMP SetOutputBounds(LONGLONG hnsLowerBound, LONGLONG hnsUpperBound) override;
-    STDMETHODIMP ProcessEvent(DWORD dwInputStreamID, IMFMediaEvent *pEvent) override;
-    STDMETHODIMP ProcessMessage(MFT_MESSAGE_TYPE eMessage, ULONG_PTR ulParam) override;
-    STDMETHODIMP ProcessInput(DWORD dwInputStreamID, IMFSample *pSample, DWORD dwFlags) override;
-    STDMETHODIMP ProcessOutput(DWORD dwFlags, DWORD cOutputBufferCount, MFT_OUTPUT_DATA_BUFFER *pOutputSamples, DWORD *pdwStatus) override;
-
-private:
-    // Destructor is not public. Caller should call Release.
-    ~MFTransform() override;
-
-    HRESULT OnFlush();
-    static QVideoFrameFormat videoFormatForMFMediaType(IMFMediaType *mediaType, int *bytesPerLine);
-    QVideoFrame makeVideoFrame();
-    QByteArray dataFromBuffer(IMFMediaBuffer *buffer, int height, int *bytesPerLine);
-    bool isMediaTypeSupported(IMFMediaType *type);
-
-    IMFMediaType *m_inputType = nullptr;
-    IMFMediaType *m_outputType = nullptr;
-    IMFSample *m_sample = nullptr;
-    QMutex m_mutex;
-
-    IMFMediaTypeHandler *m_videoSinkTypeHandler;
-
-//    QList<MFVideoProbeControl*> m_videoProbes;
-    QMutex m_videoProbeMutex;
-
-    QVideoFrameFormat m_format;
-    int m_bytesPerLine = 0;
-};
-
-QT_END_NAMESPACE
-
-#endif