Add GLSLFilter.fbo() to access filter result

Ecohnoch · Apr 16, 2016 · 15e4afe · 15e4afe
1 parent be209a5
commit 15e4afe
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/QtAV/GLSLFilter.h b/src/QtAV/GLSLFilter.h
@@ -25,6 +25,14 @@
 #include <QtAV/QtAV_Global.h>
 #include <QtAV/Filter.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#undef QOpenGLFramebufferObject
+#define QOpenGLFramebufferObject QGLFramebufferObject
+#endif
+QT_BEGIN_NAMESPACE
+class QOpenGLFramebufferObject;
+QT_END_NAMESPACE
+
 namespace QtAV {
 class OpenGLVideo;
 class GLSLFilterPrivate;
@@ -44,7 +52,7 @@ class Q_AV_EXPORT GLSLFilter : public VideoFilter
      * Currently you can only use it to set custom shader OpenGLVideo.setUserShader()
      */
     OpenGLVideo* opengl() const;
-    // TODO: set FBO format
+    QOpenGLFramebufferObject* fbo() const;
     /*!
      * \brief outputSize
      * Output frame size. FBO uses the same size to render. An empty size means using the input frame size

diff --git a/src/filter/GLSLFilter.cpp b/src/filter/GLSLFilter.cpp
@@ -27,7 +27,6 @@
 #include <QtGui/QOpenGLFramebufferObject>
 #else
 #include <QtOpenGL/QGLFramebufferObject>
-#define QOpenGLFramebufferObject QGLFramebufferObject
 #endif
 #include "QtAV/SurfaceInterop.h"
 #include "QtAV/OpenGLVideo.h"
@@ -58,6 +57,11 @@ OpenGLVideo* GLSLFilter::opengl() const
     return const_cast<OpenGLVideo*>(&d_func().glv);
 }
 
+QOpenGLFramebufferObject* GLSLFilter::fbo() const
+{
+    return d_func().fbo;
+}
+
 QSize GLSLFilter::outputSize() const
 {
     return d_func().size;
@@ -114,7 +118,7 @@ void GLSLFilter::process(Statistics *statistics, VideoFrame *frame)
     QMatrix4x4 mat; // flip vertical
     mat.scale(1, -1);
     d.glv.render(QRectF(), QRectF(), mat);
-    d.fbo->bindDefault();
+    QOpenGLFramebufferObject::bindDefault();
 
     VideoFormat fmt(VideoFormat::Format_RGB32);
     VideoFrame f(d.fbo->width(), d.fbo->height(), fmt); //