V0.7.18

1、添加了视频播放组件的api

External

@@ -1 +1 @@
-Subproject commit 09efc215b49654fa52fdcbd0422fb8abf63ce274
+Subproject commit 1921b59fff5902c4708b0137025a068d997fb93d

demo/OpenGLWidgetTest/CMakeLists.txt

@@ -12,6 +12,7 @@ file(GLOB LOCAL_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/*.ui
     ${CMAKE_CURRENT_SOURCE_DIR}/OpenGLWidgetAPI/*.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/VideoPlayer/*.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/VideoPlayerAPI/*.cpp
 
     ${CMAKE_SOURCE_DIR}/External/module/Logs/*.cpp
     ${CMAKE_SOURCE_DIR}/External/module/ThreadPool/*.cpp
@@ -38,6 +39,7 @@ target_include_directories(${this_exe} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/OpenGLWidgetAPI
     ${CMAKE_CURRENT_SOURCE_DIR}/VideoPlayer
+    ${CMAKE_CURRENT_SOURCE_DIR}/VideoPlayerAPI
 
     ${CMAKE_SOURCE_DIR}/External/common
     ${CMAKE_SOURCE_DIR}/External/module

demo/OpenGLWidgetTest/VideoPlayer/VideoPlayer.cpp

@@ -430,10 +430,10 @@ void VideoPlayer::setPreviewImage(int num)
 void VideoPlayer::setFPS(int fps)
 {
     m_fps = fps;
-    if(m_decodeVedio != nullptr)
-    {
-        m_decodeVedio->setFPS(fps);
-    }
+    // if(m_decodeVedio != nullptr)
+    // {
+    //     m_decodeVedio->setFPS(fps);
+    // }
     if(m_timerRefreshUI.isActive())
     {
         m_timerRefreshUI.stop();

demo/OpenGLWidgetTest/VideoPlayer/VideoPlayer.h

@@ -21,9 +21,9 @@ public:
     bool play();                                    /* 播放视频 */
     void pause();                                   /* 暂停播放 */
     void stop();                                    /* 停止播放 */
-    
     void backward(qint64 ms);                       /* 后退，单位ms */
     void forward(qint64 ms);                        /* 前进，单位ms */
+
     bool getPlayStatus() { return m_playStatus; }   /* 获取播放状态 */
     qint64 getDuration();                           /* 获取视频时长 */
     qint64 getCurrentPos();                         /* 获取当前播放位置 */
@@ -32,7 +32,7 @@ public:
     void setPlayWidgetSize(int width,int height);   /* 设置播放视频窗口的大小 */
     void setWidgetParent(QWidget* widget, bool flag = false); /* 设置播放窗口 */
     void setPreviewImage(int num = 2);              /* 设置预览图片数目，在暂停时跳转，可能会有花屏或者黑帧，可以设置跳转图片个数跳过黑帧 */
-    void setFPS(int fps);                            /* 设置帧率 */
+    void setFPS(int fps);                            /* 设置帧率，用于控制播放速度 */
 
     // void setPlayCallBack(std::function<Play_CallBack> playCallBack,void* context);  /* 设置播放回调函数 */
 signals:

demo/OpenGLWidgetTest/VideoPlayerAPI/VideoPlayerAPI.cpp

@@ -0,0 +1 @@
+#include "VideoPlayerAPI.h"

demo/OpenGLWidgetTest/VideoPlayerAPI/VideoPlayerAPI.h

@@ -0,0 +1,23 @@
+#ifndef _VIDEOPLAYERAPI_H_
+#define _VIDEOPLAYERAPI_H_
+
+
+#include <qchar.h>
+#include <qglobal.h>
+
+extern "C" {
+
+Q_DECL_EXPORT bool OpenVideo(const QString& fileName);
+
+
+
+
+
+
+
+
+};
+
+
+
+#endif /* _VIDEOPLAYERAPI_H_ */