diff options
| author | Ville Pernu <ville.pernu@nokia.com> | 2010-11-24 11:13:48 (GMT) |
|---|---|---|
| committer | Ville Pernu <ville.pernu@nokia.com> | 2010-11-24 11:13:48 (GMT) |
| commit | f89041d97622f0799627ddb23fc94836270f07db (patch) | |
| tree | 8eb5429137fc17b6a6a988d1c1be2f4187814c9d /src/3rdparty | |
| parent | cbf7a7782f465846455a5fd5df339ebde31a5521 (diff) | |
| parent | ba9816d1160998abe75b8b45f4b1c14985119553 (diff) | |
| download | Qt-f89041d97622f0799627ddb23fc94836270f07db.zip Qt-f89041d97622f0799627ddb23fc94836270f07db.tar.gz Qt-f89041d97622f0799627ddb23fc94836270f07db.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/ds9/videorenderer_evr.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/3rdparty/phonon/ds9/videorenderer_evr.cpp b/src/3rdparty/phonon/ds9/videorenderer_evr.cpp index de3f46f..ff39eccc4 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_evr.cpp +++ b/src/3rdparty/phonon/ds9/videorenderer_evr.cpp @@ -62,19 +62,21 @@ namespace Phonon VideoRendererEVR::VideoRendererEVR(QWidget *target) : m_target(target) { + if (QSysInfo::WindowsVersion < QSysInfo::WV_VISTA) + return; m_filter = Filter(CLSID_EnhancedVideoRenderer, IID_IBaseFilter); if (!m_filter) { return; } ComPointer<IMFVideoDisplayControl> filterControl = getService<IMFVideoDisplayControl>(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl); - if (!filterControl) { + if (!filterControl || + FAILED(filterControl->SetVideoWindow(reinterpret_cast<HWND>(target->winId()))) || + FAILED(filterControl->SetAspectRatioMode(MFVideoARMode_None)) || // We're in control of the size + !getService<IMFVideoMixerControl>(m_filter, MR_VIDEO_MIXER_SERVICE, IID_IMFVideoMixerControl) || + !getService<IMFVideoProcessor>(m_filter, MR_VIDEO_MIXER_SERVICE, IID_IMFVideoProcessor)) { m_filter = Filter(); //will release the interface - return; } - - filterControl->SetVideoWindow(reinterpret_cast<HWND>(target->winId())); - filterControl->SetAspectRatioMode(MFVideoARMode_None); // We're in control of the size } QImage VideoRendererEVR::snapshot() const |