将Video统一为C++封装，修复虚拟文件系统重复打开同一文件指针的错误

Author: DarlingZeroX

CMakeLists.txt

@@ -36,6 +36,7 @@ add_subdirectory ("Runtime/VGLua")
 add_subdirectory ("Runtime/HCore")
 add_subdirectory ("Runtime/VGPackage")
 add_subdirectory ("Runtime/VGImgui")
+add_subdirectory ("Runtime/HMedia")
 add_subdirectory ("Runtime/VGEngine")
 # 编辑器
 add_subdirectory ("Editor/VGEditorFramework")

Editor/VGEditorFramework/Source/EditorComponents/DetailBrowser/ComponentDrawer.cpp

@@ -21,6 +21,7 @@
 #include <VGEngine/Include/Interface/Loader.h>
 #include <VGEngine/Include/Lua/LuaScript.h>
 #include <VGEngine/Include/Resource/Audio.h>
+#include <VGEngine/Include/Resource/FVideo.h>
 
 namespace VisionGal::Editor
 {
@@ -587,12 +588,18 @@ namespace VisionGal::Editor
 			if (com->videoPlayer == nullptr)
 				return;
 
-			if (com->videoPlayer->GetSprite() == nullptr)
-				return;
+			//if (com->videoPlayer->GetSprite() == nullptr)
+			//	return;
+			//
+			//if (com->videoPlayer->GetSprite()->GetITexture() != nullptr)
+			//{
+			//	auto* tex = com->videoPlayer->GetSprite()->GetITexture();
+			//	ImGuiEx::ImageGL(tex->GetShaderResourceView(), 100, 100);
+			//}
 
-			if (com->videoPlayer->GetSprite()->GetITexture() != nullptr)
+			if (com->videoPlayer->GetVideoTexture() != nullptr)
 			{
-				auto* tex = com->videoPlayer->GetSprite()->GetITexture();
+				auto* tex = com->videoPlayer->GetVideoTexture();
 				ImGuiEx::ImageGL(tex->GetShaderResourceView(), 100, 100);
 			}
 		}
@@ -611,7 +618,7 @@ namespace VisionGal::Editor
 			{
 				std::string path = static_cast<char*>(payload->Data);
 
-				if (auto video = LoadObject<VideoClip>(path))
+				if (auto video = LoadObject<FVideoClip>(path))
 				{
 					com->videoClip = video;
 					ImGuiEx::PushNotification({ ImGuiExToastType::Info, "设置视频成功!" });

Editor/VGEditorFramework/Source/EditorCore/AssetWatcher.cpp

@@ -15,6 +15,7 @@
 #include "VGEngine/Include/Galgame/GalGameEngine.h"
 #include "VGEngine/Include/Galgame/GameEngineCore.h"
 #include "VGEngine/Include/UI/UISystem.h"
+#include "VGEngine/Include/Core/VFS.h"
 
 namespace VisionGal::Editor
 {

Runtime/HCore/CMakeLists.txt

@@ -17,6 +17,24 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
     add_compile_options(-finput-charset=UTF-8 -fexec-charset=UTF-8)
 endif()
 
+
+# 设置 C++ 标准为 C++17
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
+
+# 开启utf-8编码支持
+if (MSVC)
+    add_compile_options(/utf-8)
+endif()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
+    add_compile_options(-finput-charset=UTF-8 -fexec-charset=UTF-8)
+endif()
+
+
 file(GLOB HCORE_GEN_FILES
 	"${CMAKE_CURRENT_SOURCE_DIR}/.Generated/*.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/.Generated/*.cpp"

Runtime/HCore/Include/VFS/MemoryFileSystem.hpp

@@ -273,6 +273,9 @@ class MemoryFileSystem final : public IFileSystem
         }
 
         if (file) {
+			// 修复重复打开一个文件指针的错误
+			file.reset(new MemoryFile(filePath));
+
             file->Open(mode);
 
             if (!isExists && file->IsOpened()) {

Runtime/HCore/Include/VFS/NativeFileSystem.hpp

@@ -315,6 +315,9 @@ class NativeFileSystem final : public IFileSystem
         }
 
         if (file) {
+			// 修复重复打开一个文件指针的错误
+			file.reset(new NativeFile(filePath));
+
             file->Open(mode);
 
             if (!isExists && file->IsOpened()) {

Runtime/HCore/Include/VFS/ZipFile.hpp

@@ -24,6 +24,18 @@ namespace vfspp
 		{
 		}
 
+		ZipFile(const ZipFile& other)
+			: m_FileInfo(other.m_FileInfo)
+			, m_EntryID(other.m_EntryID)
+			, m_Size(other.m_Size)
+			, m_ZipArchive(other.m_ZipArchive)
+			, m_IsOpened(other.m_IsOpened)
+			, m_SeekPos(other.m_SeekPos)
+		{
+			
+		}
+		ZipFile& operator=(const ZipFile&) = delete;
+
 		~ZipFile()
 		{
 			Close();

Runtime/HCore/Include/VFS/ZipFileSystem.hpp

@@ -260,6 +260,9 @@ class ZipFileSystem final : public IFileSystem
 
         IFilePtr file = FindFile(filePath, m_FileList);
         if (file) {
+			// 修复重复打开一个文件指针的错误
+			file.reset(new ZipFile(*dynamic_cast<ZipFile*>( file.get() )));
+
             file->Open(mode);
         }
 

Runtime/HMedia/CMakeLists.txt

@@ -0,0 +1,79 @@
+# 设置 C++ 标准为 C++17
+#cmake_minimum_required(VERSION 3.10)
+#project(HMedia LANGUAGES CXX)  # 明确指定为C++项目
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
+
+# 开启utf-8编码支持
+if (MSVC)
+    add_compile_options(/utf-8)
+endif()
+ 
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
+    add_compile_options(-finput-charset=UTF-8 -fexec-charset=UTF-8)
+endif()
+
+#开启MSVC多线程编译	# windows 并行编译选项
+add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/Gm->) #高版本已被废弃，但是低版本的Gm会影响并行
+cmake_host_system_information(RESULT CPU_NUMBER_OF_LOGICAL_CORES QUERY NUMBER_OF_LOGICAL_CORES)
+add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP${CPU_NUMBER_OF_LOGICAL_CORES}>)
+
+# 添加宏
+add_definitions(-DH_MEDIA_API_EXPORT) 
+
+# 将源代码添加到此项目的可执行文件。
+file(GLOB H_MEDIA_SRC_FILES
+	"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/Source/*.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/Source/Audio/*.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/Source/Common/*.cpp" 
+	"${CMAKE_CURRENT_SOURCE_DIR}/Source/SDL/*.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/Source/FFmpeg/*.cpp"
+)
+ 
+file(GLOB H_MEDIA_HEADER_FILES 
+	"${CMAKE_CURRENT_SOURCE_DIR}/Include/*.h"
+	"${CMAKE_CURRENT_SOURCE_DIR}/Include/Audio/*.h"
+	"${CMAKE_CURRENT_SOURCE_DIR}/Include/Common/*.h"
+	"${CMAKE_CURRENT_SOURCE_DIR}/Include/SDL/*.h"
+	"${CMAKE_CURRENT_SOURCE_DIR}/Include/FFmpeg/*.h"
+
+	"${CMAKE_CURRENT_SOURCE_DIR}/Interface/*.h"
+)
+
+# 启用预编译头支持
+#set(CMAKE_PCH_ENABLED ON)
+
+# 当前cmake C++项目为动态库
+add_library (HMedia SHARED ${H_MEDIA_SRC_FILES} ${H_MEDIA_HEADER_FILES})
+
+# 添加头文件搜索路径
+target_include_directories(HMedia PRIVATE ${PROJECT_SOURCE_DIR}/Runtime)
+target_include_directories(HMedia PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Include)
+
+# 配置预编译头
+#target_precompile_headers(VGEngine PRIVATE
+#    "Include/pch.h"  # 项目级头文件
+#)
+ 
+# 包
+#find_package(glad CONFIG REQUIRED)
+find_package(SDL3 CONFIG REQUIRED)
+find_package(RmlUi REQUIRED)
+find_package(SDL3_image CONFIG REQUIRED)
+
+# FFmpeg
+find_package(FFMPEG REQUIRED)
+target_include_directories(HMedia PRIVATE ${FFMPEG_INCLUDE_DIRS})
+target_link_directories(HMedia PRIVATE ${FFMPEG_LIBRARY_DIRS})
+target_link_libraries(HMedia PRIVATE ${FFMPEG_LIBRARIES})
+
+# 链接动态库
+target_link_libraries(HMedia PRIVATE SDL3::SDL3)
+target_link_libraries(HMedia PRIVATE HCore)
+
+# TODO: 如有需要，请添加测试并安装目标。

Runtime/HMedia/Include/Audio/AudioRingBuffer.h

@@ -0,0 +1,44 @@
+/*
+* This source file is part of VisionGal, the Visual Novel Engine
+*
+* For the latest information, see https://darlingzerox.github.io/VisionGalDoc/
+* GitHub page: https://github.com/DarlingZeroX/VisionGal
+*
+* Copyright (c) 2025-present 梦旅缘心
+*
+* See the LICENSE file in the project root for details.
+*/
+
+#pragma once
+#include <vector>
+#include <mutex>
+#include "../Interface/AudioDecoderInterface.h"
+#include "../HMediaConfig.h"
+
+namespace Horizon {
+
+	// 简单线程安全环形缓冲
+	class H_MEDIA_API AudioRingBuffer: public IAudioDataBuffer{
+	public:
+		AudioRingBuffer(size_t capacity);
+
+		size_t Write(const uint8_t* data, size_t len) override;
+		size_t Read(uint8_t* out, size_t len) override;
+		size_t Available() const override;
+		bool IsAlmostFull() const override;
+		void Stop() override;
+		bool IsFinish() const override;
+		void WriteFinish() override;
+		bool IsWriteFinish() const override;
+		void Reset() override;
+	private:
+		std::vector<uint8_t> buffer;
+		size_t head = 0;
+		size_t tail = 0;
+		size_t size = 0;
+		size_t capacity = 0;
+		mutable std::mutex mutex;
+		bool m_IsFinish = false;
+		bool m_IsWriteFinish = false;
+	};
+}