Merge pull request #478 from valbok/drm

Add support of QT_AVPLAYER_VA_DRM
valbok · May 30, 2024 · 5d69aea · 5d69aea
2 parents ef4920f + ffdb5e9
commit 5d69aea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/examples/qml_video/qml_video.pro b/examples/qml_video/qml_video.pro
@@ -1,5 +1,6 @@
 TEMPLATE = app
 TARGET = qml_video
+QT += gui gui-private multimedia
 DEFINES += "QT_AVPLAYER_MULTIMEDIA"
 DEFINES += "QT_NO_CAST_FROM_ASCII"
 INCLUDEPATH += . ../../src
@@ -13,7 +14,6 @@ include(../../src/QtAVPlayer/QtAVPlayer.pri)
 #    /opt/mobile-ffmpeg/prebuilt/android-arm/ffmpeg/lib/libswscale.so \
 #    /opt/mobile-ffmpeg/prebuilt/android-arm/ffmpeg/lib/libswresample.so
 CONFIG += c++1z
-QT += gui multimedia
 lessThan(QT_MAJOR_VERSION, 6): QT += qtmultimediaquicktools-private
 equals(QT_MAJOR_VERSION, 6): QT += multimediaquick-private
 

diff --git a/examples/widget_video/widget_video.pro b/examples/widget_video/widget_video.pro
@@ -1,12 +1,12 @@
 TEMPLATE = app
 TARGET = widget_video
+QT += gui gui-private multimedia multimediawidgets
 DEFINES += "QT_AVPLAYER_MULTIMEDIA"
 DEFINES += "QT_NO_CAST_FROM_ASCII"
 INCLUDEPATH += . ../../src
 include(../../src/QtAVPlayer/QtAVPlayer.pri)
 
 CONFIG += c++1z
-QT += gui multimedia multimediawidgets
 
 SOURCES += main.cpp
 

diff --git a/src/QtAVPlayer/QtAVPlayer.cmake b/src/QtAVPlayer/QtAVPlayer.cmake
@@ -184,6 +184,7 @@ if(QT_AVPLAYER_VA_DRM)
     message(STATUS "QT_AVPLAYER_VA_DRM is defined")
     add_definitions(-DQT_AVPLAYER_VA_DRM)
 
+    find_package(OpenGL REQUIRED COMPONENTS OpenGL EGL)
     set(QtAVPlayer_LIBS
         ${QtAVPlayer_LIBS}
         OpenGL::GL

diff --git a/src/QtAVPlayer/qtavplayerglobal.h b/src/QtAVPlayer/qtavplayerglobal.h
@@ -9,5 +9,7 @@
 #define QTAVPLAYERGLOBAL_H
 
 #include <QtCore/qglobal.h>
-
+#if defined(QT_AVPLAYER_VA_DRM)
+#include <QtGui/private/qtgui-config_p.h>
+#endif
 #endif