From 4760e1fb02aac87e4186fb1bedf0ba4a3845d7be Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 21 Dec 2012 11:45:50 +0100 Subject: make use of qtHaveModule() Change-Id: I14da5455b7dd4681254e1652395df5f5c65746bd Reviewed-by: Tasuku Suzuki Reviewed-by: Jonas Rabbe Reviewed-by: Joerg Bornemann --- src/plugins/wmf/wmf.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/wmf/wmf.pro') diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index fcd2a3268..34bd2c3a5 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -1,6 +1,6 @@ TARGET = wmfengine QT += multimedia-private network -!isEmpty(QT.widgets.name) { +qtHaveModule(widgets) { QT += multimediawidgets-private DEFINES += HAVE_WIDGETS } -- cgit v1.2.3 From 101c78983a8acd6cc7a7cb314700fabd6e8909dc Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Mon, 14 Jan 2013 17:44:06 +0100 Subject: WMF: enabled HW-accelerated video decoding for the QML video item. It also applies to QGraphicsVideoItem when used on a GL viewport. We now have a new video sink that is based on Microsoft's EVR sink, we just replace the default Presenter with our own. Frames are rendered into D3D surfaces using DXVA, then copied into a shared D3D/EGL surface and finally bound to a GL texture to be used by the video surface. The shared D3D/EGL surface is a feature provided by ANGLE and therefore Qt must be compiled with ANGLE for this new video sink to be compiled and used. Change-Id: I0b7b9968eed5488f9ef1a2dcca5213bd0af232ab Reviewed-by: Yoann Lopes --- src/plugins/wmf/wmf.pro | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src/plugins/wmf/wmf.pro') diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index 34bd2c3a5..a26f319bc 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -16,14 +16,32 @@ HEADERS += \ mfstream.h \ sourceresolver.h \ samplegrabber.h \ - mftvideo.h + mftvideo.h \ + mfglobal.h \ + mfactivate.h SOURCES += \ wmfserviceplugin.cpp \ mfstream.cpp \ sourceresolver.cpp \ samplegrabber.cpp \ - mftvideo.cpp + mftvideo.cpp \ + mfactivate.cpp \ + mfglobal.cpp + +contains(QT_CONFIG, angle) { + LIBS += -ld3d9 -ldxva2 -lwinmm -levr + QT += gui-private + + HEADERS += \ + evrcustompresenter.h \ + evrd3dpresentengine.h + + SOURCES += \ + evrcustompresenter.cpp \ + evrd3dpresentengine.cpp +} + include (player/player.pri) include (decoder/decoder.pri) -- cgit v1.2.3