diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2012-12-18 21:40:55 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-07 04:57:20 +0100 |
commit | 73200f5464b4032fa25eedb5b594f17e48f5e7eb (patch) | |
tree | 7d89b21e1c944f14dac92393dade234d95323a38 /src/plugins/wmf/player/mfplayerservice.cpp | |
parent | b64ca061fde2987e138cc93903b2917b6c341f8c (diff) |
WMF: re-enabled video probes and made it more robust.
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>
Diffstat (limited to 'src/plugins/wmf/player/mfplayerservice.cpp')
-rw-r--r-- | src/plugins/wmf/player/mfplayerservice.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/wmf/player/mfplayerservice.cpp b/src/plugins/wmf/player/mfplayerservice.cpp index 5bda9f983..ea06031ff 100644 --- a/src/plugins/wmf/player/mfplayerservice.cpp +++ b/src/plugins/wmf/player/mfplayerservice.cpp @@ -116,12 +116,11 @@ QMediaControl* MFPlayerService::requestControl(const char *name) } return 0; } else if (qstrcmp(name,QMediaVideoProbeControl_iid) == 0) { - // FIXME!! Disabled in Qt 5.0 because it is unstable -// if (m_session) { -// MFVideoProbeControl *probe = new MFVideoProbeControl(this); -// m_session->addProbe(probe); -// return probe; -// } + if (m_session) { + MFVideoProbeControl *probe = new MFVideoProbeControl(this); + m_session->addProbe(probe); + return probe; + } return 0; } |