slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WMF: re-enabled video probes and made it more robust.

Browse Source 
Fixed the way the custom MF Transform (getting the frames) works:
- Recreate it whenever we load a new media
- During media type negotiation between nodes, the MFT should support
  the same types as the video sink supports
- Allow input and output types to be changed as many times as needed,
  otherwise the topology cannot be resolved in some cases

Change-Id: I7ca77e1a3dee83643f1a97f2e6ada9c5c0e88309
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Yoann Lopes
2012-12-18 21:40:55 +01:00
committed by The Qt Project
parent b64ca061fd
commit 73200f5464
5 changed files with 165 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
src/plugins/wmf/player/mfplayersession.cpp
View File

@@ -436,7 +436,6 @@ MFPlayerSession::MFPlayerSession(MFPlayerService *playerService)
m_request.rate = 1.0f;
m_audioSampleGrabber = new AudioSampleGrabberCallback;
m_videoProbeMFT = new MFTransform;
}
void MFPlayerSession::close()
@@ -472,6 +471,11 @@ void MFPlayerSession::close()
m_sourceResolver->Release();
m_sourceResolver = 0;
}
if (m_videoProbeMFT) {
m_videoProbeMFT->Release();
m_videoProbeMFT = 0;
}
if (m_session)
m_session->Release();
@@ -493,18 +497,26 @@ void MFPlayerSession::removeProbe(MFAudioProbeControl *probe)
void MFPlayerSession::addProbe(MFVideoProbeControl* probe)
{
m_videoProbeMFT->addProbe(probe);
if (m_videoProbes.contains(probe))
return;
m_videoProbes.append(probe);
if (m_videoProbeMFT)
m_videoProbeMFT->addProbe(probe);
}
void MFPlayerSession::removeProbe(MFVideoProbeControl* probe)
{
m_videoProbeMFT->removeProbe(probe);
m_videoProbes.removeOne(probe);
if (m_videoProbeMFT)
m_videoProbeMFT->removeProbe(probe);
}
MFPlayerSession::~MFPlayerSession()
{
m_audioSampleGrabber->Release();
m_videoProbeMFT->Release();
}
@@ -988,73 +1000,92 @@ IMFTopology *MFPlayerSession::insertMFT(IMFTopology *topology, TOPOID outputNode
if (FAILED(topoLoader->Load(topology, &resolvedTopology, NULL)))
break;
// FIXME!! VideoProbe disabled in Qt 5.0 because it is unstable.
// Commented out the following code to skip inserting the transform node
// getting the video frames.
// Get all output nodes and search for video output node.
// if (FAILED(resolvedTopology->GetOutputNodeCollection(&outputNodes)))
// break;
if (FAILED(resolvedTopology->GetOutputNodeCollection(&outputNodes)))
break;
// DWORD elementCount = 0;
// if (FAILED(outputNodes->GetElementCount(&elementCount)))
// break;
DWORD elementCount = 0;
if (FAILED(outputNodes->GetElementCount(&elementCount)))
break;
// for (DWORD n = 0; n < elementCount; n++) {
// IUnknown *element = 0;
// IMFTopologyNode *node = 0;
// IMFTopologyNode *inputNode = 0;
// IMFTopologyNode *mftNode = 0;
for (DWORD n = 0; n < elementCount; n++) {
IUnknown *element = 0;
IMFTopologyNode *node = 0;
IUnknown *outputObject = 0;
IMFMediaTypeHandler *videoSink = 0;
IMFTopologyNode *inputNode = 0;
IMFTopologyNode *mftNode = 0;
// do {
// if (FAILED(outputNodes->GetElement(n, &element)))
// break;
do {
if (FAILED(outputNodes->GetElement(n, &element)))
break;
// if (FAILED(element->QueryInterface(IID_IMFTopologyNode, (void**)&node)))
// break;
if (FAILED(element->QueryInterface(IID_IMFTopologyNode, (void**)&node)))
break;
// TOPOID id;
// if (FAILED(node->GetTopoNodeID(&id)))
// break;
TOPOID id;
if (FAILED(node->GetTopoNodeID(&id)))
break;
// if (id != outputNodeId)
// break;
if (id != outputNodeId)
break;
// // Insert MFT between the output node and the node connected to it.
// DWORD outputIndex = 0;
// if (FAILED(node->GetInput(0, &inputNode, &outputIndex)))
// break;
// Use output supported media types for the MFT
if (FAILED(node->GetObject(&outputObject)))
break;
// if (FAILED(MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &mftNode)))
// break;
if (FAILED(outputObject->QueryInterface(IID_IMFMediaTypeHandler, (void**)&videoSink)))
break;
// if (FAILED(mftNode->SetObject(m_videoProbeMFT)))
// break;
DWORD mtCount;
if (FAILED(videoSink->GetMediaTypeCount(&mtCount)))
break;
// if (FAILED(resolvedTopology->AddNode(mftNode)))
// break;
for (DWORD i = 0; i < mtCount; ++i) {
IMFMediaType *type = 0;
if (SUCCEEDED(videoSink->GetMediaTypeByIndex(i, &type)))
m_videoProbeMFT->addSupportedMediaType(type);
}
// if (FAILED(inputNode->ConnectOutput(0, mftNode, 0)))
// break;
// 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(mftNode->ConnectOutput(0, node, 0)))
// break;
if (FAILED(MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &mftNode)))
break;
// isNewTopology = true;
// } while (false);
if (FAILED(mftNode->SetObject(m_videoProbeMFT)))
break;
// if (mftNode)
// mftNode->Release();
// if (inputNode)
// inputNode->Release();
// if (node)
// node->Release();
// if (element)
// element->Release();
if (FAILED(resolvedTopology->AddNode(mftNode)))
break;
// if (isNewTopology)
// break;
// }
if (FAILED(inputNode->ConnectOutput(0, mftNode, 0)))
break;
if (FAILED(mftNode->ConnectOutput(0, node, 0)))
break;
isNewTopology = true;
} while (false);
if (mftNode)
mftNode->Release();
if (inputNode)
inputNode->Release();
if (node)
node->Release();
if (element)
element->Release();
if (videoSink)
videoSink->Release();
if (outputObject)
outputObject->Release();
if (isNewTopology)
break;
}
} while (false);
if (outputNodes)
@@ -1181,6 +1212,10 @@ void MFPlayerSession::createSession()
QObject::connect(m_sourceResolver, SIGNAL(mediaSourceReady()), this, SLOT(handleMediaSourceReady()));
QObject::connect(m_sourceResolver, SIGNAL(error(long)), this, SLOT(handleSourceError(long)));
m_videoProbeMFT = new MFTransform;
for (int i = 0; i < m_videoProbes.size(); ++i)
m_videoProbeMFT->addProbe(m_videoProbes.at(i));
Q_ASSERT(m_session == NULL);
HRESULT hr = MFCreateMediaSession(NULL, &m_session);
if (FAILED(hr)) {
@@ -1569,7 +1604,9 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
break;
case MESourceUnknown:
changeStatus(QMediaPlayer::InvalidMedia);
break;
case MEError:
changeStatus(QMediaPlayer::UnknownMediaStatus);
qWarning() << "handleSessionEvent: serious error = " << hrStatus;
emit error(QMediaPlayer::ResourceError, tr("Media session serious error."), true);
break;