diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2013-01-14 17:44:06 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-23 22:34:07 +0100 |
commit | 101c78983a8acd6cc7a7cb314700fabd6e8909dc (patch) | |
tree | c3cd299610a550cd57dba17d92fe705a3ac55151 /src/plugins/wmf/wmf.pro | |
parent | 02add40392f1f708a1875f7088a853aa12ffca62 (diff) | |
download | qtmultimedia-101c78983a8acd6cc7a7cb314700fabd6e8909dc.tar.gz |
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 <yoann.lopes@digia.com>
Diffstat (limited to 'src/plugins/wmf/wmf.pro')
-rw-r--r-- | src/plugins/wmf/wmf.pro | 22 |
1 files changed, 20 insertions, 2 deletions
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) |