Zero-Copy rendering is working for VAAPI with both P010 and NV12

 - Solved stretched video by setting glViewport to correctly scaled values
 - Code cleanup required
 - Running on X11 crashes with error: "Invalid EGL display"

AVQt/CMakeLists.txt

@@ -183,6 +183,6 @@ if (WIN32)
     target_link_libraries(AVQt opengl32 OpenAL32)
     target_link_libraries(AVQtStatic opengl32 OpenAL32)
 else ()
-    target_link_libraries(AVQt GL openal)
-    target_link_libraries(AVQtStatic GL openal)
+    target_link_libraries(AVQt GL openal EGL GLU)
+    target_link_libraries(AVQtStatic GL openal EGL GLU)
 endif ()
\ No newline at end of file

AVQt/output/OpenGLRenderer.h

@@ -7,6 +7,8 @@
 #include <QtOpenGL>
 #include <input/IFrameSource.h>
 
+#pragma clang diagnostic push
+#pragma ide diagnostic ignored "HidingNonVirtualFunction"
 extern "C" {
 #include <libavutil/rational.h>
 }
@@ -20,14 +22,14 @@ namespace AVQt {
 
     class RenderClock;
 
-    class OpenGLRenderer : public QOpenGLWindow, public IFrameSink {
+    class OpenGLRenderer : public QOpenGLWidget, public IFrameSink {
     Q_OBJECT
 //        Q_INTERFACES(AVQt::IFrameSink)
 
         Q_DECLARE_PRIVATE(AVQt::OpenGLRenderer)
 
     public:
-        explicit OpenGLRenderer(QWindow *parent = nullptr);
+        explicit OpenGLRenderer(QWidget *parent = nullptr);
 
         OpenGLRenderer(OpenGLRenderer &&other) noexcept;
 
@@ -35,7 +37,7 @@ namespace AVQt {
 
         void operator=(const OpenGLRenderer &) = delete;
 
-        ~OpenGLRenderer() noexcept;
+        ~OpenGLRenderer() noexcept Q_DECL_OVERRIDE;
 
         bool isPaused() Q_DECL_OVERRIDE;
 
@@ -111,9 +113,12 @@ namespace AVQt {
 
         void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
 
+        void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
+
         OpenGLRendererPrivate *d_ptr;
     };
 }
 
 
-#endif //LIBAVQT_OPENGLRENDERER_H
+#endif //LIBAVQT_OPENGLRENDERER_H
\ No newline at end of file
+#pragma clang diagnostic pop
\ No newline at end of file

AVQt/output/private/OpenGLRenderer_p.h

@@ -2,11 +2,23 @@
  * \private
  * \internal
  */
-#include <QtCore>
-#include <QtOpenGL>
 #include "../RenderClock.h"
 #include "../OpenGLRenderer.h"
 
+#include <QtCore>
+#include <QtOpenGL>
+
+#include <va/va.h>
+#include <va/va_x11.h>
+#include <va/va_drmcommon.h>
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
+extern "C" {
+#include <libavutil/hwcontext_vaapi.h>
+}
+
 
 #ifndef LIBAVQT_OPENGLRENDERER_P_H
 #define LIBAVQT_OPENGLRENDERER_P_H
@@ -42,6 +54,7 @@ namespace AVQt {
 
         OpenGLRenderer *q_ptr{nullptr};
 
+        QMutex m_onFrameMutex{};
         QMutex m_renderQueueMutex{};
         QQueue<QPair<AVFrame *, int64_t>> m_renderQueue{};
 
@@ -56,6 +69,8 @@ namespace AVQt {
         QMutex m_currentFrameMutex{};
         AVFrame *m_currentFrame{nullptr};
 
+        //OpenGL stuff
+
         QOpenGLVertexArrayObject m_vao{};
         QOpenGLBuffer m_vbo{}, m_ibo{};
         QOpenGLShaderProgram *m_program{nullptr};
@@ -64,6 +79,15 @@ namespace AVQt {
         static constexpr uint PROGRAM_VERTEX_ATTRIBUTE{0};
         static constexpr uint PROGRAM_TEXCOORD_ATTRIBUTE{1};
 
+        // VAAPI stuff
+        VADisplay m_VADisplay{nullptr};
+        AVVAAPIDeviceContext *m_pVAContext{nullptr};
+        EGLDisplay m_EGLDisplay{nullptr};
+        EGLSurface m_EGLSurface{nullptr};
+        EGLContext m_EGLContext{nullptr};
+        EGLImage m_EGLImages[2]{};
+        GLuint m_textures[2]{};
+
         friend class OpenGLRenderer;
     };
 }

Player/CMakeLists.txt

@@ -16,7 +16,7 @@ add_executable(Player main.cpp)
 target_link_libraries(Player Qt5::Core Qt5::Gui Qt5::Concurrent Qt5::Widgets Qt5::OpenGL avformat avfilter avutil avcodec avdevice swscale swresample AVQt)
 
 if (LINUX)
-    target_link_libraries(Player openal GL)
+    target_link_libraries(Player openal GL EGL GLU)
 elseif (WIN32)
     target_link_libraries(Player OpenAL32 opengl32)
-endif ()
+endif ()
\ No newline at end of file

Player/main.cpp

@@ -9,7 +9,7 @@
 constexpr auto LOGFILE_LOCATION = "libAVQt.log";
 
 QApplication *app = nullptr;
-std::chrono::time_point<std::chrono::system_clock> start;
+std::chrono::time_point<std::chrono::system_clock> start; // NOLINT(cert-err58-cpp)
 
 void signalHandler(int sigNum) {
     Q_UNUSED(sigNum)
@@ -40,6 +40,7 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt
 }
 
 int main(int argc, char *argv[]) {
+    QGuiApplication::setAttribute(Qt::AA_UseOpenGLES);
     app = new QApplication(argc, argv);
     signal(SIGINT, &signalHandler);
     signal(SIGTERM, &signalHandler);
@@ -82,7 +83,7 @@ int main(int argc, char *argv[]) {
     AVQt::OpenGLRenderer renderer;
 
     demuxer.registerCallback(videoDecoder, AVQt::IPacketSource::CB_VIDEO);
-    videoDecoder->registerCallback(videoEncoder);
+//    videoDecoder->registerCallback(videoEncoder);
 
     QFile outputFile("output.mp4");
     outputFile.open(QIODevice::ReadWrite | QIODevice::Truncate);
@@ -109,7 +110,7 @@ int main(int argc, char *argv[]) {
 
     QObject::connect(app, &QApplication::aboutToQuit, [&] {
         demuxer.deinit();
-//        delete videoEncoder;
+        delete videoEncoder;
         delete videoDecoder;
     });