1 files changed, 53 insertions, 14 deletions

diff --git a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.h b/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.h
index 99b6bb0b5..ac67090a5 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.h
+++ b/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.h
@@ -43,18 +43,48 @@
 #include <QtCore/QObject>
 #include <QtGui/QImage>
 #include <QtGui/QOpenGLContext>
+#include <QtGui/QOpenGLTextureBlitter>
 #include <QtCore/QSize>
 
-@class CARenderer;
 @class AVPlayerLayer;
+@class AVPlayerItemVideoOutput;
 
 QT_BEGIN_NAMESPACE
 
-class QOpenGLFramebufferObject;
-class QWindow;
 class QOpenGLContext;
+class QOpenGLFramebufferObject;
+class QOpenGLShaderProgram;
+class QOffscreenSurface;
 class QAbstractVideoSurface;
 
+typedef struct __CVBuffer *CVBufferRef;
+typedef CVBufferRef CVImageBufferRef;
+typedef CVImageBufferRef CVPixelBufferRef;
+
+#if defined(Q_OS_IOS) || defined(Q_OS_TVOS)
+    typedef struct __CVOpenGLESTextureCache *CVOpenGLESTextureCacheRef;
+    typedef CVImageBufferRef CVOpenGLESTextureRef;
+    // helpers to avoid boring if def
+    typedef CVOpenGLESTextureCacheRef CVOGLTextureCacheRef;
+    typedef CVOpenGLESTextureRef CVOGLTextureRef;
+    #define CVOGLTextureGetTarget CVOpenGLESTextureGetTarget
+    #define CVOGLTextureGetName CVOpenGLESTextureGetName
+    #define CVOGLTextureCacheCreate CVOpenGLESTextureCacheCreate
+    #define CVOGLTextureCacheCreateTextureFromImage CVOpenGLESTextureCacheCreateTextureFromImage
+    #define CVOGLTextureCacheFlush CVOpenGLESTextureCacheFlush
+#else
+    typedef struct __CVOpenGLTextureCache *CVOpenGLTextureCacheRef;
+    typedef CVImageBufferRef CVOpenGLTextureRef;
+    // helpers to avoid boring if def
+    typedef CVOpenGLTextureCacheRef CVOGLTextureCacheRef;
+    typedef CVOpenGLTextureRef CVOGLTextureRef;
+    #define CVOGLTextureGetTarget CVOpenGLTextureGetTarget
+    #define CVOGLTextureGetName CVOpenGLTextureGetName
+    #define CVOGLTextureCacheCreate CVOpenGLTextureCacheCreate
+    #define CVOGLTextureCacheCreateTextureFromImage CVOpenGLTextureCacheCreateTextureFromImage
+    #define CVOGLTextureCacheFlush CVOpenGLTextureCacheFlush
+#endif
+
 class AVFVideoFrameRenderer : public QObject
 {
 public:
@@ -62,22 +92,31 @@ public:
 
     virtual ~AVFVideoFrameRenderer();
 
-    GLuint renderLayerToTexture(AVPlayerLayer *layer);
-    QImage renderLayerToImage(AVPlayerLayer *layer);
+    void setPlayerLayer(AVPlayerLayer *layer);
+
+    CVOGLTextureRef renderLayerToTexture(AVPlayerLayer *layer, QSize *size);
+#ifdef Q_OS_MACOS
+    GLuint renderLayerToFBO(AVPlayerLayer *layer, QSize *size);
+#endif
+    QImage renderLayerToImage(AVPlayerLayer *layer, QSize *size);
 
 private:
-    QOpenGLFramebufferObject* initRenderer(AVPlayerLayer *layer);
-    void renderLayerToFBO(AVPlayerLayer *layer, QOpenGLFramebufferObject *fbo);
+    void initRenderer();
+    CVPixelBufferRef copyPixelBufferFromLayer(AVPlayerLayer *layer, size_t& width, size_t& height);
+    CVOGLTextureRef createCacheTextureFromLayer(AVPlayerLayer *layer, size_t& width, size_t& height);
 
-    CARenderer *m_videoLayerRenderer;
-    QAbstractVideoSurface *m_surface;
-    QOpenGLFramebufferObject *m_fbo[2];
-    QWindow *m_offscreenSurface;
     QOpenGLContext *m_glContext;
-    QSize m_targetSize;
-
-    uint m_currentBuffer;
+    QOffscreenSurface *m_offscreenSurface;
+    QAbstractVideoSurface *m_surface;
+    CVOGLTextureCacheRef m_textureCache;
+    AVPlayerItemVideoOutput* m_videoOutput;
     bool m_isContextShared;
+
+#ifdef Q_OS_MACOS
+    QOpenGLFramebufferObject *m_fbo[2];
+    uint m_currentFBO;
+    QOpenGLTextureBlitter m_blitter;
+#endif
 };
 
 QT_END_NAMESPACE