diff options
author | Mike Krus <mike.krus@kdab.com> | 2015-12-30 12:02:18 +0000 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2016-01-13 14:16:40 +0000 |
commit | a12f3d6fee700fb19b51b85934acddf536c483cf (patch) | |
tree | ed6d0670335e90e86b5bd1e3c0ca64957c38c966 /src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm | |
parent | b323f7803abb3dff5ffd92dd6d9f228cb9a55c40 (diff) |
tvOS support
Builds, tested simple video playback
Change-Id: I04e1da050c587cba3609107dc88a155a6949f2c3
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm')
-rw-r--r-- | src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm b/src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm index 03000ea43..d067c7f0b 100644 --- a/src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm +++ b/src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm @@ -34,7 +34,7 @@ #include "avfvideorenderercontrol.h" #include "avfdisplaylink.h" -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) #include "avfvideoframerenderer_ios.h" #else #include "avfvideoframerenderer.h" @@ -52,7 +52,7 @@ QT_USE_NAMESPACE -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) class TextureCacheVideoBuffer : public QAbstractVideoBuffer { public: @@ -164,7 +164,7 @@ void AVFVideoRendererControl::setSurface(QAbstractVideoSurface *surface) //Surface changed, so we need a new frame renderer m_frameRenderer = new AVFVideoFrameRenderer(m_surface, this); -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) if (m_playerLayer) { m_frameRenderer->setPlayerLayer(static_cast<AVPlayerLayer*>(m_playerLayer)); } @@ -195,7 +195,7 @@ void AVFVideoRendererControl::setLayer(void *playerLayer) if (m_surface && m_surface->isActive()) m_surface->stop(); -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) if (m_frameRenderer) { m_frameRenderer->setPlayerLayer(static_cast<AVPlayerLayer*>(playerLayer)); } @@ -230,7 +230,7 @@ void AVFVideoRendererControl::updateVideoFrame(const CVTimeStamp &ts) return; if (m_enableOpenGL) { -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) CVOGLTextureRef tex = m_frameRenderer->renderLayerToTexture(playerLayer); //Make sure we got a valid texture @@ -254,7 +254,7 @@ void AVFVideoRendererControl::updateVideoFrame(const CVTimeStamp &ts) if (!m_surface->isActive()) { QVideoSurfaceFormat format(frame.size(), frame.pixelFormat(), QAbstractVideoBuffer::GLTextureHandle); -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) format.setScanLineDirection(QVideoSurfaceFormat::TopToBottom); #else format.setScanLineDirection(QVideoSurfaceFormat::BottomToTop); |