V1.1.7

1、修改了OpenGL示例项目的名称

CMakeLists.txt

@@ -194,9 +194,9 @@ file(GLOB GLOBAL_SRC
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/time)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/VideoPlayer)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/xlsx)
-add_subdirectory(${CMAKE_SOURCE_DIR}/demo/DesignerPattern)
+# add_subdirectory(${CMAKE_SOURCE_DIR}/demo/DesignerPattern)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/ViewModel)
-# add_subdirectory(${CMAKE_SOURCE_DIR}/demo/VideoPlayerGL)
+add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLDemo)
 
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLWidgetLibrary)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLWidgetTest)

demo/VideoPlayerGL/CMakeLists.txt → demo/OpenGLDemo/CMakeLists.txt

@@ -47,7 +47,6 @@ target_include_directories(${this_exe} PRIVATE
     
     # ${CURL_INCLUDE_DIR}
     # ${FFMPEG_INCLUDE_DIR}
-    ${spdlog_INCLUDE_DIR}
 )
 
 
@@ -56,7 +55,7 @@ target_link_libraries(${this_exe} PRIVATE
     Qt${QT_VERSION_MAJOR}::Core
     Qt${QT_VERSION_MAJOR}::Network
     # Qt${QT_VERSION_MAJOR}::Gui
-
+    External::spdlog
 )
 
 if(QT_VERSION_MAJOR EQUAL 5)

demo/VideoPlayerGL/GLWidget/PlayerGLWidget.cpp → demo/OpenGLDemo/GLWidget/PlayerGLWidget.cpp

@@ -37,7 +37,7 @@ void PlayerGLWidget::showOneRGBAImage(const QImage& image)
 }
 
 /* 显示一张YUV420的图片 */
-void PlayerGLWidget::showOneYUV420Image(const Image_YUV420P& yuvData)
+void PlayerGLWidget::showOneYUV420Image(const Image_YUV420& yuvData)
 {
     if(!yuvData.isValid()) {
         SPDLOG_WARN("YUV420数据无效");

demo/VideoPlayerGL/main.cpp → demo/OpenGLDemo/main.cpp

@@ -1,7 +1,7 @@
 #include "widget.h"
 
 #include <QApplication>
-#include "Logs/loginit.h"
+#include "loginit.h"
 #include "spdlog/spdlog.h"
 #include <QDebug>
 #include <qwidget.h>