diff options
Diffstat (limited to 'src/plugins/multimedia/windows/player/mfplayersession.cpp')
| -rw-r--r-- | src/plugins/multimedia/windows/player/mfplayersession.cpp | 808 |
1 files changed, 240 insertions, 568 deletions
diff --git a/src/plugins/multimedia/windows/player/mfplayersession.cpp b/src/plugins/multimedia/windows/player/mfplayersession.cpp index be99399ed..16cba7266 100644 --- a/src/plugins/multimedia/windows/player/mfplayersession.cpp +++ b/src/plugins/multimedia/windows/player/mfplayersession.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// 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 "private/qplatformmediaplayer_p.h" @@ -51,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> @@ -60,41 +23,30 @@ #include "mfplayersession_p.h" #include <mferror.h> #include <nserror.h> +#include <winerror.h> #include "sourceresolver_p.h" -#include "samplegrabber_p.h" -#include "mftvideo_p.h" #include <wmcodecdsp.h> #include <mmdeviceapi.h> #include <propvarutil.h> -#include <Functiondiscoverykeys_devpkey.h> +#include <functiondiscoverykeys_devpkey.h> //#define DEBUG_MEDIAFOUNDATION +QT_BEGIN_NAMESPACE MFPlayerSession::MFPlayerSession(MFPlayerControl *playerControl) - : m_cRef(1) - , m_playerControl(playerControl) - , m_session(0) - , m_presentationClock(0) - , m_rateControl(0) - , m_rateSupport(0) - , m_volumeControl(0) - , m_netsourceStatistics(0) - , m_scrubbing(false) - , m_restoreRate(1) - , m_sourceResolver(0) - , m_hCloseEvent(0) - , m_closing(false) - , m_mediaTypes(0) - , m_pendingRate(1) - , m_status(QMediaPlayer::NoMedia) - , m_audioSampleGrabber(0) - , m_audioSampleGrabberNode(0) - , m_videoProbeMFT(0) + : m_cRef(1), + m_playerControl(playerControl), + m_scrubbing(false), + m_restoreRate(1), + m_closing(false), + m_mediaTypes(0), + m_pendingRate(1), + m_status(QMediaPlayer::NoMedia) { - QObject::connect(this, SIGNAL(sessionEvent(IMFMediaEvent*)), this, SLOT(handleSessionEvent(IMFMediaEvent*))); + connect(this, &MFPlayerSession::sessionEvent, this, &MFPlayerSession::handleSessionEvent); m_signalPositionChangeTimer.setInterval(10); m_signalPositionChangeTimer.setTimerType(Qt::PreciseTimer); @@ -110,8 +62,7 @@ MFPlayerSession::MFPlayerSession(MFPlayerControl *playerControl) m_request.prevCmd = CmdNone; m_request.rate = 1.0f; - m_audioSampleGrabber = new AudioSampleGrabberCallback; - m_videoRendererControl = new MFVideoRendererControl; + m_videoRendererControl = new MFVideoRendererControl(this); } void MFPlayerSession::timeout() @@ -153,7 +104,7 @@ void MFPlayerSession::close() m_closing = true; hr = m_session->Close(); if (SUCCEEDED(hr)) { - DWORD dwWaitResult = WaitForSingleObject(m_hCloseEvent, 2000); + DWORD dwWaitResult = WaitForSingleObject(m_hCloseEvent.get(), 2000); if (dwWaitResult == WAIT_TIMEOUT) { qWarning() << "session close time out!"; } @@ -167,35 +118,19 @@ void MFPlayerSession::close() if (m_sourceResolver) m_sourceResolver->shutdown(); } - if (m_sourceResolver) { - m_sourceResolver->Release(); - m_sourceResolver = 0; - } - if (m_videoProbeMFT) { - m_videoProbeMFT->Release(); - m_videoProbeMFT = 0; - } + m_sourceResolver.Reset(); m_videoRendererControl->releaseActivate(); // } else if (m_playerService->videoWindowControl()) { // m_playerService->videoWindowControl()->releaseActivate(); // } - if (m_session) - m_session->Release(); - m_session = 0; - if (m_hCloseEvent) - CloseHandle(m_hCloseEvent); - m_hCloseEvent = 0; + m_session.Reset(); + m_hCloseEvent = {}; m_lastPosition = -1; + m_position = 0; } -MFPlayerSession::~MFPlayerSession() -{ - m_audioSampleGrabber->Release(); -} - - void MFPlayerSession::load(const QUrl &url, QIODevice *stream) { #ifdef DEBUG_MEDIAFOUNDATION @@ -212,11 +147,12 @@ void MFPlayerSession::load(const QUrl &url, QIODevice *stream) } else if (stream && (!stream->isReadable())) { close(); changeStatus(QMediaPlayer::InvalidMedia); - emit error(QMediaPlayer::ResourceError, tr("Invalid stream source."), true); + error(QMediaPlayer::ResourceError, tr("Invalid stream source."), true); } else if (createSession()) { changeStatus(QMediaPlayer::LoadingMedia); m_sourceResolver->load(url, stream); - m_updateRoutingOnStart = true; + if (url.isLocalFile()) + m_updateRoutingOnStart = true; } positionChanged(position()); } @@ -240,17 +176,28 @@ void MFPlayerSession::handleSourceError(long hr) errorCode = QMediaPlayer::FormatError; errorString = tr("Unsupported media type."); break; + case MF_E_UNSUPPORTED_SCHEME: + errorCode = QMediaPlayer::ResourceError; + errorString = tr("Unsupported URL scheme."); + break; + case QMM_WININET_E_CANNOT_CONNECT: + errorCode = QMediaPlayer::NetworkError; + errorString = tr("Connection to server could not be established."); + break; default: + qWarning() << "handleSourceError:" + << Qt::showbase << Qt::hex << Qt::uppercasedigits << static_cast<quint32>(hr); errorString = tr("Failed to load source."); break; } changeStatus(QMediaPlayer::InvalidMedia); - emit error(errorCode, errorString, true); + error(errorCode, errorString, true); } void MFPlayerSession::handleMediaSourceReady() { - if (QMediaPlayer::LoadingMedia != m_status || !m_sourceResolver || m_sourceResolver != sender()) + if (QMediaPlayer::LoadingMedia != m_status || !m_sourceResolver + || m_sourceResolver.Get() != sender()) return; #ifdef DEBUG_MEDIAFOUNDATION qDebug() << "handleMediaSourceReady"; @@ -260,23 +207,22 @@ void MFPlayerSession::handleMediaSourceReady() DWORD dwCharacteristics = 0; mediaSource->GetCharacteristics(&dwCharacteristics); - emit seekableUpdate(MFMEDIASOURCE_CAN_SEEK & dwCharacteristics); + seekableUpdate(MFMEDIASOURCE_CAN_SEEK & dwCharacteristics); - IMFPresentationDescriptor* sourcePD; + ComPtr<IMFPresentationDescriptor> sourcePD; hr = mediaSource->CreatePresentationDescriptor(&sourcePD); if (SUCCEEDED(hr)) { m_duration = 0; m_metaData = MFMetaData::fromNative(mediaSource); - emit metaDataChanged(); + metaDataChanged(); sourcePD->GetUINT64(MF_PD_DURATION, &m_duration); //convert from 100 nanosecond to milisecond - emit durationUpdate(qint64(m_duration / 10000)); - setupPlaybackTopology(mediaSource, sourcePD); + durationUpdate(qint64(m_duration / 10000)); + setupPlaybackTopology(mediaSource, sourcePD.Get()); tracksChanged(); - sourcePD->Release(); } else { changeStatus(QMediaPlayer::InvalidMedia); - emit error(QMediaPlayer::ResourceError, tr("Cannot create presentation descriptor."), true); + error(QMediaPlayer::ResourceError, tr("Cannot create presentation descriptor."), true); } } @@ -293,7 +239,7 @@ bool MFPlayerSession::getStreamInfo(IMFStreamDescriptor *stream, *name = QString(); *language = QString(); - IMFMediaTypeHandler *typeHandler = nullptr; + ComPtr<IMFMediaTypeHandler> typeHandler; if (SUCCEEDED(stream->GetMediaTypeHandler(&typeHandler))) { @@ -321,13 +267,10 @@ bool MFPlayerSession::getStreamInfo(IMFStreamDescriptor *stream, *type = Video; } - IMFMediaType *mediaType = nullptr; + ComPtr<IMFMediaType> mediaType; if (SUCCEEDED(typeHandler->GetCurrentMediaType(&mediaType))) { mediaType->GetGUID(MF_MT_SUBTYPE, format); - mediaType->Release(); } - - typeHandler->Release(); } return *type != Unknown; @@ -341,15 +284,15 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat hr = sourcePD->GetStreamDescriptorCount(&cSourceStreams); if (FAILED(hr)) { changeStatus(QMediaPlayer::InvalidMedia); - emit error(QMediaPlayer::ResourceError, tr("Failed to get stream count."), true); + error(QMediaPlayer::ResourceError, tr("Failed to get stream count."), true); return; } - IMFTopology *topology; + ComPtr<IMFTopology> topology; hr = MFCreateTopology(&topology); if (FAILED(hr)) { changeStatus(QMediaPlayer::InvalidMedia); - emit error(QMediaPlayer::ResourceError, tr("Failed to create topology."), true); + error(QMediaPlayer::ResourceError, tr("Failed to create topology."), true); return; } @@ -358,7 +301,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat for (DWORD i = 0; i < cSourceStreams; i++) { BOOL selected = FALSE; bool streamAdded = false; - IMFStreamDescriptor *streamDesc = NULL; + ComPtr<IMFStreamDescriptor> streamDesc; HRESULT hr = sourcePD->GetStreamDescriptorByIndex(i, &selected, &streamDesc); if (SUCCEEDED(hr)) { @@ -369,7 +312,8 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat QString streamLanguage; GUID format = GUID_NULL; - if (getStreamInfo(streamDesc, &mediaType, &streamName, &streamLanguage, &format)) { + if (getStreamInfo(streamDesc.Get(), &mediaType, &streamName, &streamLanguage, + &format)) { QPlatformMediaPlayer::TrackType trackType = (mediaType == Audio) ? QPlatformMediaPlayer::AudioStream : QPlatformMediaPlayer::VideoStream; @@ -386,23 +330,19 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat m_trackInfo[trackType].format = format; if (((m_mediaTypes & mediaType) == 0) && selected) { // Check if this type isn't already added - IMFTopologyNode *sourceNode = addSourceNode(topology, source, sourcePD, streamDesc); + ComPtr<IMFTopologyNode> sourceNode = + addSourceNode(topology.Get(), source, sourcePD, streamDesc.Get()); if (sourceNode) { - IMFTopologyNode *outputNode = addOutputNode(mediaType, topology, 0); + ComPtr<IMFTopologyNode> outputNode = + addOutputNode(mediaType, topology.Get(), 0); if (outputNode) { - bool connected = false; - if (mediaType == Audio) { - if (!m_audioSampleGrabberNode) - connected = setupAudioSampleGrabber(topology, sourceNode, outputNode); - } sourceNode->GetTopoNodeID(&m_trackInfo[trackType].sourceNodeId); outputNode->GetTopoNodeID(&m_trackInfo[trackType].outputNodeId); - if (!connected) - hr = sourceNode->ConnectOutput(0, outputNode, 0); + hr = sourceNode->ConnectOutput(0, outputNode.Get(), 0); if (FAILED(hr)) { - emit error(QMediaPlayer::FormatError, tr("Unable to play any stream."), false); + error(QMediaPlayer::FormatError, tr("Unable to play any stream."), false); } else { m_trackInfo[trackType].currentIndex = m_trackInfo[trackType].nativeIndexes.count() - 1; streamAdded = true; @@ -410,51 +350,51 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat m_mediaTypes |= mediaType; switch (mediaType) { case Audio: - emit audioAvailable(); + audioAvailable(); break; case Video: - emit videoAvailable(); + videoAvailable(); break; default: break; } } - outputNode->Release(); + } else { + // remove the source node if the output node cannot be created + topology->RemoveNode(sourceNode.Get()); } - sourceNode->Release(); } } } if (selected && !streamAdded) sourcePD->DeselectStream(i); - - streamDesc->Release(); } } if (succeededCount == 0) { changeStatus(QMediaPlayer::InvalidMedia); - emit error(QMediaPlayer::ResourceError, tr("Unable to play."), true); + error(QMediaPlayer::ResourceError, tr("Unable to play."), true); } else { if (m_trackInfo[QPlatformMediaPlayer::VideoStream].outputNodeId != TOPOID(-1)) topology = insertMFT(topology, m_trackInfo[QPlatformMediaPlayer::VideoStream].outputNodeId); - hr = m_session->SetTopology(MFSESSION_SETTOPOLOGY_IMMEDIATE, topology); + hr = m_session->SetTopology(MFSESSION_SETTOPOLOGY_IMMEDIATE, topology.Get()); if (SUCCEEDED(hr)) { m_updatingTopology = true; } else { changeStatus(QMediaPlayer::InvalidMedia); - emit error(QMediaPlayer::ResourceError, tr("Failed to set topology."), true); + error(QMediaPlayer::ResourceError, tr("Failed to set topology."), true); } } - topology->Release(); } -IMFTopologyNode* MFPlayerSession::addSourceNode(IMFTopology* topology, IMFMediaSource* source, - IMFPresentationDescriptor* presentationDesc, IMFStreamDescriptor *streamDesc) +ComPtr<IMFTopologyNode> MFPlayerSession::addSourceNode(IMFTopology *topology, + IMFMediaSource *source, + IMFPresentationDescriptor *presentationDesc, + IMFStreamDescriptor *streamDesc) { - IMFTopologyNode *node = NULL; + ComPtr<IMFTopologyNode> node; HRESULT hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &node); if (SUCCEEDED(hr)) { hr = node->SetUnknown(MF_TOPONODE_SOURCE, source); @@ -463,184 +403,82 @@ IMFTopologyNode* MFPlayerSession::addSourceNode(IMFTopology* topology, IMFMediaS if (SUCCEEDED(hr)) { hr = node->SetUnknown(MF_TOPONODE_STREAM_DESCRIPTOR, streamDesc); if (SUCCEEDED(hr)) { - hr = topology->AddNode(node); + hr = topology->AddNode(node.Get()); if (SUCCEEDED(hr)) return node; } } } - node->Release(); } return NULL; } -IMFTopologyNode* MFPlayerSession::addOutputNode(MediaType mediaType, IMFTopology* topology, DWORD sinkID) +ComPtr<IMFTopologyNode> MFPlayerSession::addOutputNode(MediaType mediaType, IMFTopology *topology, + DWORD sinkID) { - IMFTopologyNode *node = NULL; + ComPtr<IMFTopologyNode> node; if (FAILED(MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node))) return NULL; - IMFActivate *activate = NULL; + ComPtr<IMFActivate> activate; if (mediaType == Audio) { if (m_audioOutput) { + auto id = m_audioOutput->device.id(); + if (id.isEmpty()) { + qInfo() << "No audio output"; + return NULL; + } + HRESULT hr = MFCreateAudioRendererActivate(&activate); if (FAILED(hr)) { qWarning() << "Failed to create audio renderer activate"; - node->Release(); return NULL; } - auto id = m_audioOutput->device.id(); - if (!id.isEmpty()) { - QString s = QString::fromUtf8(id); - hr = activate->SetString(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, (LPCWSTR)s.utf16()); - } else { - //This is the default one that has been inserted in updateEndpoints(), - //so give the activate a hint that we want to use the device for multimedia playback - //then the media foundation will choose an appropriate one. - - //from MSDN: - //The ERole enumeration defines constants that indicate the role that the system has assigned to an audio endpoint device. - //eMultimedia: Music, movies, narration, and live music recording. - hr = activate->SetUINT32(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, eMultimedia); - } - + QString s = QString::fromUtf8(id); + hr = activate->SetString(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, (LPCWSTR)s.utf16()); if (FAILED(hr)) { - qWarning() << "Failed to set attribute for audio device" << m_audioOutput->device.description(); - activate->Release(); - node->Release(); + qWarning() << "Failed to set attribute for audio device" + << m_audioOutput->device.description(); return NULL; } } } else if (mediaType == Video) { activate = m_videoRendererControl->createActivate(); + + QSize resolution = m_metaData.value(QMediaMetaData::Resolution).toSize(); + + if (resolution.isValid()) + m_videoRendererControl->setCropRect(QRect(QPoint(), resolution)); + } else { // Unknown stream type. - emit error(QMediaPlayer::FormatError, tr("Unknown stream type."), false); + error(QMediaPlayer::FormatError, tr("Unknown stream type."), false); } - 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; + if (!activate || FAILED(node->SetObject(activate.Get())) + || FAILED(node->SetUINT32(MF_TOPONODE_STREAMID, sinkID)) + || FAILED(node->SetUINT32(MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, FALSE)) + || FAILED(topology->AddNode(node.Get()))) { + node.Reset(); } if (activate && mediaType == Audio) - activate->Release(); + activate.Reset(); return node; } -bool MFPlayerSession::addAudioSampleGrabberNode(IMFTopology *topology) -{ - HRESULT hr = S_OK; - IMFMediaType *pType = 0; - IMFActivate *sinkActivate = 0; - do { - hr = MFCreateMediaType(&pType); - if (FAILED(hr)) - break; - - hr = pType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio); - if (FAILED(hr)) - break; - - hr = pType->SetGUID(MF_MT_SUBTYPE, MFAudioFormat_PCM); - if (FAILED(hr)) - break; - - hr = MFCreateSampleGrabberSinkActivate(pType, m_audioSampleGrabber, &sinkActivate); - if (FAILED(hr)) - break; - - // Note: Data is distorted if this attribute is enabled - hr = sinkActivate->SetUINT32(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, FALSE); - if (FAILED(hr)) - break; - - hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &m_audioSampleGrabberNode); - if (FAILED(hr)) - break; - - hr = m_audioSampleGrabberNode->SetObject(sinkActivate); - if (FAILED(hr)) - break; - - hr = m_audioSampleGrabberNode->SetUINT32(MF_TOPONODE_STREAMID, 0); // Identifier of the stream sink. - if (FAILED(hr)) - break; - - hr = m_audioSampleGrabberNode->SetUINT32(MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, FALSE); - if (FAILED(hr)) - break; - - hr = topology->AddNode(m_audioSampleGrabberNode); - if (FAILED(hr)) - break; - - pType->Release(); - sinkActivate->Release(); - return true; - } while (false); - - if (pType) - pType->Release(); - if (sinkActivate) - sinkActivate->Release(); - if (m_audioSampleGrabberNode) { - m_audioSampleGrabberNode->Release(); - m_audioSampleGrabberNode = NULL; - } - return false; -} - -bool MFPlayerSession::setupAudioSampleGrabber(IMFTopology *topology, IMFTopologyNode *sourceNode, IMFTopologyNode *outputNode) -{ - if (!addAudioSampleGrabberNode(topology)) - return false; - - HRESULT hr = S_OK; - IMFTopologyNode *pTeeNode = NULL; - - IMFMediaTypeHandler *typeHandler = NULL; - IMFMediaType *mediaType = NULL; - do { - hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &pTeeNode); - if (FAILED(hr)) - break; - hr = sourceNode->ConnectOutput(0, pTeeNode, 0); - if (FAILED(hr)) - break; - hr = pTeeNode->ConnectOutput(0, outputNode, 0); - if (FAILED(hr)) - break; - hr = pTeeNode->ConnectOutput(1, m_audioSampleGrabberNode, 0); - if (FAILED(hr)) - break; - } while (false); - - if (pTeeNode) - pTeeNode->Release(); - if (mediaType) - mediaType->Release(); - if (typeHandler) - typeHandler->Release(); - return hr == S_OK; -} - // BindOutputNode // Sets the IMFStreamSink pointer on an output node. // IMFActivate pointer in the output node must be converted to an // IMFStreamSink pointer before the topology loader resolves the topology. HRESULT BindOutputNode(IMFTopologyNode *pNode) { - IUnknown *nodeObject = NULL; - IMFActivate *activate = NULL; - IMFStreamSink *stream = NULL; - IMFMediaSink *sink = NULL; + ComPtr<IUnknown> nodeObject; + ComPtr<IMFActivate> activate; + ComPtr<IMFStreamSink> stream; + ComPtr<IMFMediaSink> sink; HRESULT hr = pNode->GetObject(&nodeObject); if (FAILED(hr)) @@ -666,20 +504,12 @@ HRESULT BindOutputNode(IMFTopologyNode *pNode) // Replace the node's object pointer with the stream sink. if (SUCCEEDED(hr)) { - hr = pNode->SetObject(stream); + hr = pNode->SetObject(stream.Get()); } } else { hr = nodeObject->QueryInterface(IID_PPV_ARGS(&stream)); } - if (nodeObject) - nodeObject->Release(); - if (activate) - activate->Release(); - if (stream) - stream->Release(); - if (sink) - sink->Release(); return hr; } @@ -687,7 +517,7 @@ HRESULT BindOutputNode(IMFTopologyNode *pNode) // Sets the IMFStreamSink pointers on all of the output nodes in a topology. HRESULT BindOutputNodes(IMFTopology *pTopology) { - IMFCollection *collection; + ComPtr<IMFCollection> collection; // Get the collection of output nodes. HRESULT hr = pTopology->GetOutputNodeCollection(&collection); @@ -699,25 +529,22 @@ HRESULT BindOutputNodes(IMFTopology *pTopology) if (SUCCEEDED(hr)) { for (DWORD i = 0; i < cNodes; i++) { - IUnknown *element; + ComPtr<IUnknown> element; hr = collection->GetElement(i, &element); if (FAILED(hr)) break; - IMFTopologyNode *node; - hr = element->QueryInterface(IID_IMFTopologyNode, (void**)&node); - element->Release(); + ComPtr<IMFTopologyNode> node; + hr = element->QueryInterface(IID_IMFTopologyNode, &node); if (FAILED(hr)) break; // Bind this node. - hr = BindOutputNode(node); - node->Release(); + hr = BindOutputNode(node.Get()); if (FAILED(hr)) break; } } - collection->Release(); } return hr; @@ -726,123 +553,38 @@ HRESULT BindOutputNodes(IMFTopology *pTopology) // This method binds output nodes to complete the topology, // then loads the topology and inserts MFT between the output node // and a filter connected to the output node. -IMFTopology *MFPlayerSession::insertMFT(IMFTopology *topology, TOPOID outputNodeId) +ComPtr<IMFTopology> MFPlayerSession::insertMFT(const ComPtr<IMFTopology> &topology, + TOPOID outputNodeId) { bool isNewTopology = false; - IMFTopoLoader *topoLoader = 0; - IMFTopology *resolvedTopology = 0; - IMFCollection *outputNodes = 0; + ComPtr<IMFTopoLoader> topoLoader; + ComPtr<IMFTopology> resolvedTopology; + ComPtr<IMFCollection> outputNodes; do { - if (FAILED(BindOutputNodes(topology))) + if (FAILED(BindOutputNodes(topology.Get()))) break; if (FAILED(MFCreateTopoLoader(&topoLoader))) break; - if (FAILED(topoLoader->Load(topology, &resolvedTopology, NULL))) { + if (FAILED(topoLoader->Load(topology.Get(), &resolvedTopology, NULL))) { // Topology could not be resolved, adding ourselves a color converter // to the topology might solve the problem - insertColorConverter(topology, outputNodeId); - if (FAILED(topoLoader->Load(topology, &resolvedTopology, NULL))) + insertColorConverter(topology.Get(), outputNodeId); + if (FAILED(topoLoader->Load(topology.Get(), &resolvedTopology, NULL))) break; } - if (insertResizer(resolvedTopology)) + 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++) { - IUnknown *element = 0; - IMFTopologyNode *node = 0; - IUnknown *outputObject = 0; - IMFTopologyNode *inputNode = 0; - IMFTopologyNode *mftNode = 0; - bool mftAdded = false; - - do { - if (FAILED(outputNodes->GetElement(n, &element))) - break; - - if (FAILED(element->QueryInterface(IID_IMFTopologyNode, (void**)&node))) - break; - - TOPOID id; - if (FAILED(node->GetTopoNodeID(&id))) - break; - - if (id != outputNodeId) - break; - - if (FAILED(node->GetObject(&outputObject))) - break; - - m_videoProbeMFT->setVideoSink(outputObject); - - // 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))) - break; - - if (FAILED(resolvedTopology->AddNode(mftNode))) - break; - - if (FAILED(inputNode->ConnectOutput(0, mftNode, 0))) - break; - - if (FAILED(mftNode->ConnectOutput(0, node, 0))) - break; - - mftAdded = true; - isNewTopology = true; - } while (false); - - if (mftNode) - mftNode->Release(); - if (inputNode) - inputNode->Release(); - if (node) - node->Release(); - if (element) - element->Release(); - if (outputObject) - outputObject->Release(); - - if (mftAdded) - break; - else - m_videoProbeMFT->setVideoSink(NULL); - } } while (false); - if (outputNodes) - outputNodes->Release(); - - if (topoLoader) - topoLoader->Release(); - if (isNewTopology) { - topology->Release(); return resolvedTopology; } - if (resolvedTopology) - resolvedTopology->Release(); - return topology; } @@ -854,26 +596,20 @@ bool MFPlayerSession::insertResizer(IMFTopology *topology) { bool inserted = false; WORD elementCount = 0; - IMFTopologyNode *node = 0; - IUnknown *object = 0; - IWMColorConvProps *colorConv = 0; - IMFTransform *resizer = 0; - IMFTopologyNode *resizerNode = 0; - IMFTopologyNode *inputNode = 0; + ComPtr<IMFTopologyNode> node; + ComPtr<IUnknown> object; + ComPtr<IWMColorConvProps> colorConv; + ComPtr<IMFTransform> resizer; + ComPtr<IMFTopologyNode> resizerNode; + ComPtr<IMFTopologyNode> inputNode; HRESULT hr = topology->GetNodeCount(&elementCount); if (FAILED(hr)) return false; for (WORD i = 0; i < elementCount; ++i) { - if (node) { - node->Release(); - node = 0; - } - if (object) { - object->Release(); - object = 0; - } + node.Reset(); + object.Reset(); if (FAILED(topology->GetNode(i, &node))) break; @@ -888,35 +624,36 @@ bool MFPlayerSession::insertResizer(IMFTopology *topology) if (FAILED(node->GetObject(&object))) break; - if (FAILED(object->QueryInterface(&colorConv))) + if (FAILED(object->QueryInterface(IID_PPV_ARGS(&colorConv)))) continue; - if (FAILED(CoCreateInstance(CLSID_CResizerDMO, NULL, CLSCTX_INPROC_SERVER, IID_IMFTransform, (void**)&resizer))) + if (FAILED(CoCreateInstance(CLSID_CResizerDMO, NULL, CLSCTX_INPROC_SERVER, IID_IMFTransform, + &resizer))) break; if (FAILED(MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &resizerNode))) break; - if (FAILED(resizerNode->SetObject(resizer))) + if (FAILED(resizerNode->SetObject(resizer.Get()))) break; - if (FAILED(topology->AddNode(resizerNode))) + if (FAILED(topology->AddNode(resizerNode.Get()))) break; DWORD outputIndex = 0; if (FAILED(node->GetInput(0, &inputNode, &outputIndex))) { - topology->RemoveNode(resizerNode); + topology->RemoveNode(resizerNode.Get()); break; } - if (FAILED(inputNode->ConnectOutput(0, resizerNode, 0))) { - topology->RemoveNode(resizerNode); + if (FAILED(inputNode->ConnectOutput(0, resizerNode.Get(), 0))) { + topology->RemoveNode(resizerNode.Get()); break; } - if (FAILED(resizerNode->ConnectOutput(0, node, 0))) { - inputNode->ConnectOutput(0, node, 0); - topology->RemoveNode(resizerNode); + if (FAILED(resizerNode->ConnectOutput(0, node.Get(), 0))) { + inputNode->ConnectOutput(0, node.Get(), 0); + topology->RemoveNode(resizerNode.Get()); break; } @@ -924,19 +661,6 @@ bool MFPlayerSession::insertResizer(IMFTopology *topology) break; } - if (node) - node->Release(); - if (object) - object->Release(); - if (colorConv) - colorConv->Release(); - if (resizer) - resizer->Release(); - if (resizerNode) - resizerNode->Release(); - if (inputNode) - inputNode->Release(); - return inserted; } @@ -946,27 +670,27 @@ bool MFPlayerSession::insertResizer(IMFTopology *topology) // for some reason it fails to do so in some cases, we then do it ourselves. void MFPlayerSession::insertColorConverter(IMFTopology *topology, TOPOID outputNodeId) { - IMFCollection *outputNodes = 0; + ComPtr<IMFCollection> outputNodes; if (FAILED(topology->GetOutputNodeCollection(&outputNodes))) return; DWORD elementCount = 0; if (FAILED(outputNodes->GetElementCount(&elementCount))) - goto done; + return; for (DWORD n = 0; n < elementCount; n++) { - IUnknown *element = 0; - IMFTopologyNode *node = 0; - IMFTopologyNode *inputNode = 0; - IMFTopologyNode *mftNode = 0; - IMFTransform *converter = 0; + ComPtr<IUnknown> element; + ComPtr<IMFTopologyNode> node; + ComPtr<IMFTopologyNode> inputNode; + ComPtr<IMFTopologyNode> mftNode; + ComPtr<IMFTransform> converter; do { if (FAILED(outputNodes->GetElement(n, &element))) break; - if (FAILED(element->QueryInterface(IID_IMFTopologyNode, (void**)&node))) + if (FAILED(element->QueryInterface(IID_IMFTopologyNode, &node))) break; TOPOID id; @@ -983,38 +707,24 @@ void MFPlayerSession::insertColorConverter(IMFTopology *topology, TOPOID outputN if (FAILED(MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &mftNode))) break; - if (FAILED(CoCreateInstance(CLSID_CColorConvertDMO, NULL, CLSCTX_INPROC_SERVER, IID_IMFTransform, (void**)&converter))) + if (FAILED(CoCreateInstance(CLSID_CColorConvertDMO, NULL, CLSCTX_INPROC_SERVER, + IID_IMFTransform, &converter))) break; - if (FAILED(mftNode->SetObject(converter))) + if (FAILED(mftNode->SetObject(converter.Get()))) break; - if (FAILED(topology->AddNode(mftNode))) + if (FAILED(topology->AddNode(mftNode.Get()))) break; - if (FAILED(inputNode->ConnectOutput(0, mftNode, 0))) + if (FAILED(inputNode->ConnectOutput(0, mftNode.Get(), 0))) break; - if (FAILED(mftNode->ConnectOutput(0, node, 0))) + if (FAILED(mftNode->ConnectOutput(0, node.Get(), 0))) break; } while (false); - - if (mftNode) - mftNode->Release(); - if (inputNode) - inputNode->Release(); - if (node) - node->Release(); - if (element) - element->Release(); - if (converter) - converter->Release(); } - -done: - if (outputNodes) - outputNodes->Release(); } void MFPlayerSession::stop(bool immediate) @@ -1040,7 +750,7 @@ void MFPlayerSession::stop(bool immediate) positionChanged(0); } } else { - emit error(QMediaPlayer::ResourceError, tr("Failed to stop."), true); + error(QMediaPlayer::ResourceError, tr("Failed to stop."), true); } } } @@ -1084,11 +794,8 @@ void MFPlayerSession::start() if (SUCCEEDED(m_session->Start(&GUID_NULL, &varStart))) { m_state.setCommand(CmdStart); m_pendingState = CmdPending; - m_lastSeekPos = m_position; - m_lastSeekSysTime = MFGetSystemTime(); - m_altTiming = false; } else { - emit error(QMediaPlayer::ResourceError, tr("failed to start playback"), true); + error(QMediaPlayer::ResourceError, tr("failed to start playback"), true); } PropVariantClear(&varStart); } @@ -1109,7 +816,7 @@ void MFPlayerSession::pause() m_state.setCommand(CmdPause); m_pendingState = CmdPending; } else { - emit error(QMediaPlayer::ResourceError, tr("Failed to pause."), false); + error(QMediaPlayer::ResourceError, tr("Failed to pause."), false); } if (m_status == QMediaPlayer::EndOfMedia) { setPosition(0); @@ -1126,7 +833,7 @@ void MFPlayerSession::changeStatus(QMediaPlayer::MediaStatus newStatus) qDebug() << "MFPlayerSession::changeStatus" << newStatus; #endif m_status = newStatus; - emit statusChanged(); + statusChanged(); } QMediaPlayer::MediaStatus MFPlayerSession::status() const @@ -1143,27 +850,25 @@ bool MFPlayerSession::createSession() HRESULT hr = MFCreateMediaSession(NULL, &m_session); if (FAILED(hr)) { changeStatus(QMediaPlayer::InvalidMedia); - emit error(QMediaPlayer::ResourceError, tr("Unable to create mediasession."), true); + error(QMediaPlayer::ResourceError, tr("Unable to create mediasession."), true); return false; } - m_hCloseEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + m_hCloseEvent = EventHandle{ CreateEvent(NULL, FALSE, FALSE, NULL) }; - hr = m_session->BeginGetEvent(this, m_session); + hr = m_session->BeginGetEvent(this, m_session.Get()); if (FAILED(hr)) { changeStatus(QMediaPlayer::InvalidMedia); - emit error(QMediaPlayer::ResourceError, tr("Unable to pull session events."), false); + error(QMediaPlayer::ResourceError, tr("Unable to pull session events."), false); close(); return false; } - m_sourceResolver = new SourceResolver(); - QObject::connect(m_sourceResolver, &SourceResolver::mediaSourceReady, this, &MFPlayerSession::handleMediaSourceReady); - QObject::connect(m_sourceResolver, &SourceResolver::error, this, &MFPlayerSession::handleSourceError); - - m_videoProbeMFT = new MFTransform; -// for (int i = 0; i < m_videoProbes.size(); ++i) -// m_videoProbeMFT->addProbe(m_videoProbes.at(i)); + m_sourceResolver = makeComObject<SourceResolver>(); + QObject::connect(m_sourceResolver.Get(), &SourceResolver::mediaSourceReady, this, + &MFPlayerSession::handleMediaSourceReady); + QObject::connect(m_sourceResolver.Get(), &SourceResolver::error, this, + &MFPlayerSession::handleSourceError); m_position = 0; return true; @@ -1184,13 +889,6 @@ qint64 MFPlayerSession::position() MFTIME time, sysTime; if (FAILED(m_presentationClock->GetCorrelatedTime(0, &time, &sysTime))) return m_position / 10000; - - if (time > 0 && qint64(time) < m_lastSeekPos) - m_altTiming = true; - - if (m_altTiming) - return (m_lastSeekPos + MFGetSystemTime() - m_lastSeekSysTime) / 10000; - return qint64(time / 10000); } return m_position / 10000; @@ -1231,19 +929,14 @@ void MFPlayerSession::setPositionInternal(qint64 position, Command requestCmd) PROPVARIANT varStart; varStart.vt = VT_I8; varStart.hVal.QuadPart = LONGLONG(position * 10000); - if (SUCCEEDED(m_session->Start(NULL, &varStart))) - { - m_lastSeekPos = position * 10000; - m_lastSeekSysTime = MFGetSystemTime(); - m_altTiming = false; - + if (SUCCEEDED(m_session->Start(NULL, &varStart))) { PropVariantClear(&varStart); // Store the pending state. m_state.setCommand(CmdStart); m_state.start = position; m_pendingState = SeekPending; } else { - emit error(QMediaPlayer::ResourceError, tr("Failed to seek."), true); + error(QMediaPlayer::ResourceError, tr("Failed to seek."), true); } } @@ -1258,7 +951,7 @@ void MFPlayerSession::setPlaybackRate(qreal rate) { if (m_scrubbing) { m_restoreRate = rate; - emit playbackRateChanged(rate); + playbackRateChanged(rate); return; } setPlaybackRateInternal(rate); @@ -1417,7 +1110,7 @@ done: m_pendingRate = m_request.rate = m_state.rate = rate; if (rate != 0) m_state.isThin = isThin; - emit playbackRateChanged(rate); + playbackRateChanged(rate); } void MFPlayerSession::scrub(bool enableScrub) @@ -1551,17 +1244,22 @@ ULONG MFPlayerSession::AddRef(void) ULONG MFPlayerSession::Release(void) { LONG cRef = InterlockedDecrement(&m_cRef); - if (cRef == 0) - this->deleteLater(); + if (cRef == 0) { + deleteLater(); + + // In rare cases the session has queued events to be run between deleteLater and deleting, + // so we set the parent control to nullptr in order to prevent crashes in the cases. + m_playerControl = nullptr; + } return cRef; } HRESULT MFPlayerSession::Invoke(IMFAsyncResult *pResult) { - if (pResult->GetStateNoAddRef() != m_session) + if (pResult->GetStateNoAddRef() != m_session.Get()) return S_OK; - IMFMediaEvent *pEvent = NULL; + ComPtr<IMFMediaEvent> pEvent; // Get the event from the event queue. HRESULT hr = m_session->EndGetEvent(pResult, &pEvent); if (FAILED(hr)) { @@ -1571,36 +1269,30 @@ HRESULT MFPlayerSession::Invoke(IMFAsyncResult *pResult) MediaEventType meType = MEUnknown; hr = pEvent->GetType(&meType); if (FAILED(hr)) { - pEvent->Release(); return S_OK; } if (meType == MESessionClosed) { - SetEvent(m_hCloseEvent); - pEvent->Release(); + SetEvent(m_hCloseEvent.get()); return S_OK; } else { - hr = m_session->BeginGetEvent(this, m_session); + hr = m_session->BeginGetEvent(this, m_session.Get()); if (FAILED(hr)) { - pEvent->Release(); return S_OK; } } if (!m_closing) { emit sessionEvent(pEvent); - } else { - pEvent->Release(); } return S_OK; } -void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) +void MFPlayerSession::handleSessionEvent(const ComPtr<IMFMediaEvent> &sessionEvent) { HRESULT hrStatus = S_OK; HRESULT hr = sessionEvent->GetStatus(&hrStatus); if (FAILED(hr) || !m_session) { - sessionEvent->Release(); return; } @@ -1620,7 +1312,7 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) sessionEvent->GetValue(&var); qWarning() << "handleSessionEvent: non fatal error = " << var.ulVal; PropVariantClear(&var); - emit error(QMediaPlayer::ResourceError, tr("Media session non-fatal error."), false); + error(QMediaPlayer::ResourceError, tr("Media session non-fatal error."), false); } break; case MESourceUnknown: @@ -1636,8 +1328,28 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) break; } changeStatus(QMediaPlayer::InvalidMedia); - qWarning() << "handleSessionEvent: serious error = " << hrStatus; - emit error(QMediaPlayer::ResourceError, tr("Media session serious error."), true); + qWarning() << "handleSessionEvent: serious error = " + << Qt::showbase << Qt::hex << Qt::uppercasedigits << static_cast<quint32>(hrStatus); + switch (hrStatus) { + case MF_E_NET_READ: + error(QMediaPlayer::NetworkError, tr("Error reading from the network."), true); + break; + case MF_E_NET_WRITE: + error(QMediaPlayer::NetworkError, tr("Error writing to the network."), true); + break; + case NS_E_FIREWALL: + error(QMediaPlayer::NetworkError, tr("Network packets might be blocked by a firewall."), true); + break; + case MF_E_MEDIAPROC_WRONGSTATE: + error(QMediaPlayer::ResourceError, tr("Media session state error."), true); + break; + case MF_E_INVALID_STREAM_DATA: + error(QMediaPlayer::ResourceError, tr("Invalid stream data."), true); + break; + default: + error(QMediaPlayer::ResourceError, tr("Media session serious error."), true); + break; + } break; case MESessionRateChanged: // If the rate change succeeded, we've already got the rate @@ -1648,7 +1360,7 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) if (SUCCEEDED(sessionEvent->GetValue(&var)) && (var.vt == VT_R4)) { m_state.rate = var.fltVal; } - emit playbackRateChanged(playbackRate()); + playbackRateChanged(playbackRate()); } break; case MESessionScrubSampleComplete : @@ -1702,28 +1414,8 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) case MESessionTopologySet: if (FAILED(hrStatus)) { changeStatus(QMediaPlayer::InvalidMedia); - emit error(QMediaPlayer::FormatError, tr("Unsupported media, a codec is missing."), true); + error(QMediaPlayer::FormatError, tr("Unsupported media, a codec is missing."), true); } else { - if (m_audioSampleGrabberNode) { - IUnknown *obj = 0; - if (SUCCEEDED(m_audioSampleGrabberNode->GetObject(&obj))) { - IMFStreamSink *streamSink = 0; - if (SUCCEEDED(obj->QueryInterface(IID_PPV_ARGS(&streamSink)))) { - IMFMediaTypeHandler *typeHandler = 0; - if (SUCCEEDED(streamSink->GetMediaTypeHandler((&typeHandler)))) { - IMFMediaType *mediaType = 0; - if (SUCCEEDED(typeHandler->GetCurrentMediaType(&mediaType))) { - m_audioSampleGrabber->setFormat(QWindowsAudioUtils::mediaTypeToFormat(mediaType)); - mediaType->Release(); - } - typeHandler->Release(); - } - streamSink->Release(); - } - obj->Release(); - } - } - // Topology is resolved and successfuly set, this happens only after loading a new media. // Make sure we always start the media from the beginning m_lastPosition = -1; @@ -1735,18 +1427,17 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) } if (FAILED(hrStatus)) { - sessionEvent->Release(); return; } switch (meType) { case MEBufferingStarted: changeStatus(QMediaPlayer::StalledMedia); - emit bufferProgressChanged(bufferProgress()); + bufferProgressChanged(bufferProgress()); break; case MEBufferingStopped: changeStatus(QMediaPlayer::BufferedMedia); - emit bufferProgressChanged(bufferProgress()); + bufferProgressChanged(bufferProgress()); break; case MESessionEnded: m_pendingState = NoPending; @@ -1767,14 +1458,15 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) UINT32 status; if (SUCCEEDED(sessionEvent->GetUINT32(MF_EVENT_TOPOLOGY_STATUS, &status))) { if (status == MF_TOPOSTATUS_READY) { - IMFClock* clock; + ComPtr<IMFClock> clock; if (SUCCEEDED(m_session->GetClock(&clock))) { - clock->QueryInterface(IID_IMFPresentationClock, (void**)(&m_presentationClock)); - clock->Release(); + clock->QueryInterface(IID_IMFPresentationClock, &m_presentationClock); } - if (SUCCEEDED(MFGetService(m_session, MF_RATE_CONTROL_SERVICE, IID_PPV_ARGS(&m_rateControl)))) { - if (SUCCEEDED(MFGetService(m_session, MF_RATE_CONTROL_SERVICE, IID_PPV_ARGS(&m_rateSupport)))) { + if (SUCCEEDED(MFGetService(m_session.Get(), MF_RATE_CONTROL_SERVICE, + IID_PPV_ARGS(&m_rateControl)))) { + if (SUCCEEDED(MFGetService(m_session.Get(), MF_RATE_CONTROL_SERVICE, + IID_PPV_ARGS(&m_rateSupport)))) { if (SUCCEEDED(m_rateSupport->IsRateSupported(TRUE, 0, NULL))) m_canScrub = true; } @@ -1787,9 +1479,11 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) } } } - MFGetService(m_session, MFNETSOURCE_STATISTICS_SERVICE, IID_PPV_ARGS(&m_netsourceStatistics)); + MFGetService(m_session.Get(), MFNETSOURCE_STATISTICS_SERVICE, + IID_PPV_ARGS(&m_netsourceStatistics)); - if (SUCCEEDED(MFGetService(m_session, MR_STREAM_VOLUME_SERVICE, IID_PPV_ARGS(&m_volumeControl)))) + if (SUCCEEDED(MFGetService(m_session.Get(), MR_STREAM_VOLUME_SERVICE, + IID_PPV_ARGS(&m_volumeControl)))) setVolumeInternal(m_muted ? 0 : m_volume); m_updatingTopology = false; @@ -1801,8 +1495,6 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) default: break; } - - sessionEvent->Release(); } void MFPlayerSession::updatePendingCommands(Command command) @@ -1889,33 +1581,14 @@ void MFPlayerSession::clear() if (!m_metaData.isEmpty()) { m_metaData.clear(); - emit metaDataChanged(); + metaDataChanged(); } - if (m_presentationClock) { - m_presentationClock->Release(); - m_presentationClock = NULL; - } - if (m_rateControl) { - m_rateControl->Release(); - m_rateControl = NULL; - } - if (m_rateSupport) { - m_rateSupport->Release(); - m_rateSupport = NULL; - } - if (m_volumeControl) { - m_volumeControl->Release(); - m_volumeControl = NULL; - } - if (m_netsourceStatistics) { - m_netsourceStatistics->Release(); - m_netsourceStatistics = NULL; - } - if (m_audioSampleGrabberNode) { - m_audioSampleGrabberNode->Release(); - m_audioSampleGrabberNode = NULL; - } + m_presentationClock.Reset(); + m_rateControl.Reset(); + m_rateSupport.Reset(); + m_volumeControl.Reset(); + m_netsourceStatistics.Reset(); } void MFPlayerSession::setAudioOutput(QPlatformAudioOutput *device) @@ -1968,7 +1641,7 @@ void MFPlayerSession::setActiveTrack(QPlatformMediaPlayer::TrackType type, int i if (m_trackInfo[QPlatformMediaPlayer::VideoStream].format == MFVideoFormat_HEVC) return; - IMFTopology *topology = nullptr; + ComPtr<IMFTopology> topology; if (SUCCEEDED(m_session->GetFullTopology(QMM_MFSESSION_GETFULLTOPOLOGY_CURRENT, 0, &topology))) { @@ -1978,25 +1651,23 @@ void MFPlayerSession::setActiveTrack(QPlatformMediaPlayer::TrackType type, int i stop(); if (m_trackInfo[type].outputNodeId != TOPOID(-1)) { - IMFTopologyNode *node = nullptr; + ComPtr<IMFTopologyNode> node; if (SUCCEEDED(topology->GetNodeByID(m_trackInfo[type].outputNodeId, &node))) { - topology->RemoveNode(node); - node->Release(); + topology->RemoveNode(node.Get()); m_trackInfo[type].outputNodeId = TOPOID(-1); } } if (m_trackInfo[type].sourceNodeId != TOPOID(-1)) { - IMFTopologyNode *node = nullptr; + ComPtr<IMFTopologyNode> node; if (SUCCEEDED(topology->GetNodeByID(m_trackInfo[type].sourceNodeId, &node))) { - topology->RemoveNode(node); - node->Release(); + topology->RemoveNode(node.Get()); m_trackInfo[type].sourceNodeId = TOPOID(-1); } } IMFMediaSource *mediaSource = m_sourceResolver->mediaSource(); - IMFPresentationDescriptor *sourcePD = nullptr; + ComPtr<IMFPresentationDescriptor> sourcePD; if (SUCCEEDED(mediaSource->CreatePresentationDescriptor(&sourcePD))) { if (m_trackInfo[type].currentIndex >= 0 && m_trackInfo[type].currentIndex < nativeIndexes.count()) @@ -2005,35 +1676,33 @@ void MFPlayerSession::setActiveTrack(QPlatformMediaPlayer::TrackType type, int i m_trackInfo[type].currentIndex = index; if (index == -1) { - m_session->SetTopology(MFSESSION_SETTOPOLOGY_IMMEDIATE, topology); + m_session->SetTopology(MFSESSION_SETTOPOLOGY_IMMEDIATE, topology.Get()); } else { int nativeIndex = nativeIndexes.at(index); sourcePD->SelectStream(nativeIndex); - IMFStreamDescriptor *streamDesc = nullptr; + ComPtr<IMFStreamDescriptor> streamDesc; BOOL selected = FALSE; if (SUCCEEDED(sourcePD->GetStreamDescriptorByIndex(nativeIndex, &selected, &streamDesc))) { - IMFTopologyNode *sourceNode = addSourceNode(topology, mediaSource, sourcePD, streamDesc); + ComPtr<IMFTopologyNode> sourceNode = addSourceNode( + topology.Get(), mediaSource, sourcePD.Get(), streamDesc.Get()); if (sourceNode) { - IMFTopologyNode *outputNode = addOutputNode(MFPlayerSession::Audio, topology, 0); + ComPtr<IMFTopologyNode> outputNode = + addOutputNode(MFPlayerSession::Audio, topology.Get(), 0); if (outputNode) { - if (SUCCEEDED(sourceNode->ConnectOutput(0, outputNode, 0))) { + if (SUCCEEDED(sourceNode->ConnectOutput(0, outputNode.Get(), 0))) { sourceNode->GetTopoNodeID(&m_trackInfo[type].sourceNodeId); outputNode->GetTopoNodeID(&m_trackInfo[type].outputNodeId); - m_session->SetTopology(MFSESSION_SETTOPOLOGY_IMMEDIATE, topology); + m_session->SetTopology(MFSESSION_SETTOPOLOGY_IMMEDIATE, + topology.Get()); } - outputNode->Release(); } - sourceNode->Release(); } - streamDesc->Release(); } } m_updatingTopology = true; - sourcePD->Release(); } - topology->Release(); } } @@ -2062,3 +1731,6 @@ QMediaMetaData MFPlayerSession::trackMetaData(QPlatformMediaPlayer::TrackType ty return m_trackInfo[type].metaData.at(trackNumber); } +QT_END_NAMESPACE + +#include "moc_mfplayersession_p.cpp" |