diff options
author | James Turner <james.turner@kdab.com> | 2015-01-12 13:51:25 +0000 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-02-04 11:28:02 +0000 |
commit | 9444c8ec6161bee3e399f9d385974dbaa6216283 (patch) | |
tree | 8baa73fe66c90b9d0267fb7e6bd2f0ee436439af /src/plugins/avfoundation/mediaplayer/mediaplayer.pro | |
parent | 3e94b7ce2d8166767ec47425d2cefbc77cb5fde2 (diff) |
iOS video frame render implementation.
Uses CVTextureCache, iOS only for now, OS-X code could be ported
but will need further work to support TEXTURE_RECTANGLE in the
QVideoNode classes.
When we can’t share a context, falls back to an offscreen window,
FBO rendering and grabbing a QImage.
Change-Id: I23b831fdcc63aeb1b67b7741d8d56779470240d3
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins/avfoundation/mediaplayer/mediaplayer.pro')
-rw-r--r-- | src/plugins/avfoundation/mediaplayer/mediaplayer.pro | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro index 2670eceaf..28cdc2727 100644 --- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro +++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro @@ -44,21 +44,31 @@ OBJECTIVE_SOURCES += \ avfvideowidget.mm } -!ios { - LIBS += -framework QuartzCore -framework AppKit +ios { + contains(QT_CONFIG, opengl.*) { + HEADERS += \ + avfvideoframerenderer_ios.h \ + avfvideorenderercontrol.h \ + avfdisplaylink.h - HEADERS += \ - avfvideorenderercontrol.h \ - avfdisplaylink.h - OBJECTIVE_SOURCES += \ - avfvideorenderercontrol.mm \ - avfdisplaylink.mm + OBJECTIVE_SOURCES += \ + avfvideoframerenderer_ios.mm \ + avfvideorenderercontrol.mm \ + avfdisplaylink.mm + } +} else { + LIBS += -framework QuartzCore -framework AppKit contains(QT_CONFIG, opengl.*) { HEADERS += \ - avfvideoframerenderer.h + avfvideoframerenderer.h \ + avfvideorenderercontrol.h \ + avfdisplaylink.h + OBJECTIVE_SOURCES += \ - avfvideoframerenderer.mm + avfvideoframerenderer.mm \ + avfvideorenderercontrol.mm \ + avfdisplaylink.mm } } |