diff --git a/README.md b/README.md index 6eec292..55b33b8 100644 --- a/README.md +++ b/README.md @@ -120,43 +120,42 @@ Remote Android　　[Live2D](https://www.bilibili.com/video/BV1sx4y1d775/?vd_sou ## **三、升级日志** +**2023.08.04：** + ++ UE5工程更新； ++ 唇型计算的视音素更换成33毫秒； ++ 内置rwkv_api nlp可以直接使用； ++ 降低情绪性向数字人端推送的频度； ++ 非数字人连接状态不产生接口消息； ++ 修复因mp3格式错误而导致一定概率不推送播放信息给数字人端的问题； ++ 修复静音等指令执行时提前结束nlp逻辑，而导致用户提问消息不推送数字人端问题； ++ 补充wav文件启动清理； ++ websocket工具类升级完善。 + **2023.07.28：** + 增加运行时自动清理ui缓存； + 增加gpt代理设置可为空； + 提高灵聚对接的稳定性。 -**2023.07.26：** - + 修复连接数字人之前产生大量ws信息问题； + 增加数字人（ue、live2d、xuniren）通讯接口：实时日志； + 更新数字人（ue、live2d、xuniren）通讯接口：音频推送。 -**2023.07.21：** - + 带货版多项更新； - -**2023.07.19：** - + 修复远程语音不识别问题； + 修复asr时有不灵问题； + 去除唱歌指令。 -**2023.07.14：** - + 修复linux及mac运行出错问题； + 修复因唇型出错无法继续执行问题； + 提供rwkv对接方案。 -**2023.07.12：** - + 修复助理版文字输入不读取人设回复问题； + 修复助理版文字输入不读取qa回复问题； + 增强麦克风接入稳定性。 -**2023.07.05：** - + 修复无法运行唇型算法而导致的不播放声音问题。 **2023.06：** diff --git a/README_EN.md b/README_EN.md index 8c1b0d1..05dbacd 100644 --- a/README_EN.md +++ b/README_EN.md @@ -122,40 +122,43 @@ Message format: View [WebSocket.md](https://github.com/TheRamU/Fay/blob/main/Web ## **Upgrade Log** -**2023.07.28：** +**2023.08.04:** + +- UE5 project updated. +- Audio-visual pixel for lip-reading is replaced by 33ms. +- Built-in rwkv_api nlp can be used directly. +- The frequency of emotional pushing to digital human terminal is reduced. +- No interface message is generated when the digital human is not connected. +- The problem that the playback information is not pushed to the digital human terminal with a certain probability due to the wrong mp3 format is fixed. +- The problem that the nlp logic is ended early when commands such as mute are executed, and the user's question message is not pushed to the digital human terminal is fixed. +- wav file startup cleaning is supplemented. +- WebSocket tool class is upgraded and improved. + +**2023.07：** + Add runtime automatic cleaning of UI cache; + Add GPT proxy setting can be null; + Improve the stability of Lingju docking. -**2023.07.21：** - + Fixed the problem of generating a large amount of WS information before connecting digital humans; + Add digital human (UE, Live2D, Xuniren) communication interface: real-time logs; + Update digital human (UE, Live2D, Xuniren) communication interface: audio push. -**2023.07.21：** - + Multiple updates for the merchandise version. -**2023.07.19：** + Fixed the issue of remote voice recognition. + Fixed the issue of occasional unresponsiveness during ASR (Automatic Speech Recognition). + Removed the singing command. -**2023.07.14：** - + Fixed Linux and macOS runtime errors. + Fixed the issue of being unable to continue execution due to lip-sync errors. + Provided an integration solution for RWKV. -**2023.07.12：** - + Fixed an issue in Assistant Edition where text input does not read persona responses. + Fixed an issue in Assistant Edition where text input does not read QA responses. + Enhanced microphone stability. -**2023.07.05：** +**** + Fixed a sound playback issue caused by the inability to run the lip-sync algorithm. diff --git a/[Start] PowerShell.bat b/[Start] PowerShell.bat deleted file mode 100644 index 49ebe00..0000000 --- a/[Start] PowerShell.bat +++ /dev/null @@ -1,3 +0,0 @@ -start powershell ^ -$host.ui.RawUI.WindowTitle='FeiFei Alpha';^ -python ./main.py;^ diff --git a/[Start].bat b/[Start].bat deleted file mode 100644 index 112e7fe..0000000 --- a/[Start].bat +++ /dev/null @@ -1,3 +0,0 @@ -echo off -cls -start ./bin/Start.vbs diff --git a/ai_module/nlp_rwkv_api.py b/ai_module/nlp_rwkv_api.py index cc7f236..f966ad4 100644 --- a/ai_module/nlp_rwkv_api.py +++ b/ai_module/nlp_rwkv_api.py @@ -43,7 +43,7 @@ def question(cont): print("接口调用耗时 :" + str(time.time() - starttime)) - return response_text + return response_text.strip() if __name__ == "__main__": for i in range(3): diff --git a/core/fay_core.py b/core/fay_core.py index 3379c50..21b998a 100644 --- a/core/fay_core.py +++ b/core/fay_core.py @@ -36,6 +36,7 @@ from ai_module import nlp_yuan from ai_module import yolov8 from ai_module import nlp_VisualGLM from ai_module import nlp_lingju +from ai_module import nlp_rwkv_api import platform if platform.system() == "Windows": @@ -51,7 +52,8 @@ modules = { "nlp_chatgpt": nlp_chatgpt, "nlp_rasa": nlp_rasa, "nlp_VisualGLM": nlp_VisualGLM, - "nlp_lingju": nlp_lingju + "nlp_lingju": nlp_lingju, + "nlp_rwkv_api":nlp_rwkv_api } @@ -125,6 +127,8 @@ class FeiFei: self.q_msg = '你叫什么名字？' self.a_msg = 'hi,我叫菲菲，英文名是fay' self.mood = 0.0 # 情绪值 + self.old_mood = 0.0 + self.connect = False self.item_index = 0 self.deviceSocket = None self.deviceConnect = None @@ -228,7 +232,9 @@ class FeiFei: index = interact.interact_type if index == 1: self.q_msg = interact.data["msg"] - + if not config_util.config["interact"]["playSound"]: # 非展板播放 + content = {'Topic': 'Unreal', 'Data': {'Key': 'question', 'Value': self.q_msg}} + wsa_server.get_instance().add_cmd(content) #fay eyes fay_eyes = yolov8.new_instance() if fay_eyes.get_status():#YOLO正在运行 @@ -251,10 +257,6 @@ class FeiFei: contentdb = Content_Db() contentdb.add_content('member','speak',self.q_msg) wsa_server.get_web_instance().add_cmd({"panelReply": {"type":"member","content":self.q_msg}}) - if not config_util.config["interact"]["playSound"]: # 非展板播放 - content = {'Topic': 'Unreal', 'Data': {'Key': 'question', 'Value': self.q_msg}} - wsa_server.get_instance().add_cmd(content) - text = '' textlist = [] self.speaking = True @@ -304,11 +306,20 @@ class FeiFei: # 发送情绪 def __send_mood(self): - while self.__running: + while self.__running: time.sleep(3) if not self.sleep and not config_util.config["interact"]["playSound"] and wsa_server.get_instance().isConnect: content = {'Topic': 'Unreal', 'Data': {'Key': 'mood', 'Value': self.mood}} - wsa_server.get_instance().add_cmd(content) + if not self.connect: + wsa_server.get_instance().add_cmd(content) + self.connect = True + else: + if self.old_mood != self.mood: + wsa_server.get_instance().add_cmd(content) + self.old_mood = self.mood + + else: + self.connect = False # 更新情绪 def __update_mood(self, typeIndex): @@ -364,13 +375,13 @@ class FeiFei: self.speaking = False else: util.printInfo(1, '菲菲', '({}) {}'.format(self.__get_mood_voice(), self.a_msg)) + if not config_util.config["interact"]["playSound"]: # 非展板播放 + content = {'Topic': 'Unreal', 'Data': {'Key': 'text', 'Value': self.a_msg}} + wsa_server.get_instance().add_cmd(content) MyThread(target=storer.storage_live_interact, args=[Interact('Fay', 0, {'user': 'Fay', 'msg': self.a_msg})]).start() util.log(1, '合成音频...') tm = time.time() #文字也推送出去，为了ue5 - if not config_util.config["interact"]["playSound"]: # 非展板播放 - content = {'Topic': 'Unreal', 'Data': {'Key': 'text', 'Value': self.a_msg}} - wsa_server.get_instance().add_cmd(content) result = self.sp.to_sample(self.a_msg, self.__get_mood_voice()) util.log(1, '合成音频完成. 耗时: {} ms 文件:{}'.format(math.floor((time.time() - tm) * 1000), result)) if result is not None: @@ -390,7 +401,10 @@ class FeiFei: def __send_or_play_audio(self, file_url, say_type): try: - audio_length = eyed3.load(file_url).info.time_secs #mp3音频长度 + try: + audio_length = eyed3.load(file_url).info.time_secs #mp3音频长度 + except Exception as e: + audio_length = 3 # with wave.open(file_url, 'rb') as wav_file: #wav音频长度 # audio_length = wav_file.getnframes() / float(wav_file.getframerate()) # print(audio_length) diff --git a/core/wsa_server.py b/core/wsa_server.py index 2a60497..b769563 100644 --- a/core/wsa_server.py +++ b/core/wsa_server.py @@ -25,20 +25,22 @@ class MyServer: def __del__(self): self.stop_server() + # 接收处理 async def __consumer_handler(self, websocket, path): async for message in websocket: await self.__consumer(message) + # 发送处理 async def __producer_handler(self, websocket, path): while self.__running: await asyncio.sleep(0.000001) message = await self.__producer() if message: await websocket.send(message) - # util.log('发送 {}'.format(message)) + async def __handler(self, websocket, path): - isConnect = True + self.isConnect = True util.log(1,"websocket连接上:{}".format(self.__port)) self.on_connect_handler() consumer_task = asyncio.ensure_future(self.__consumer_handler(websocket, path)) @@ -46,30 +48,34 @@ class MyServer: done, self.__pending = await asyncio.wait([consumer_task, producer_task], return_when=asyncio.FIRST_COMPLETED, ) for task in self.__pending: task.cancel() - isConnect = False + self.isConnect = False util.log(1,"websocket连接断开:{}".format(self.__port)) - - # 接收处理 + async def __consumer(self, message): self.on_revice_handler(message) - - # 发送处理 + async def __producer(self): if len(self.__listCmd) > 0: - return self.__listCmd.pop(0) + message = self.on_send_handler(self.__listCmd.pop(0)) + return message else: return None - #Edit by xszyou on 20230113:通过继承此类来实现服务端的接收处理逻辑 + #Edit by xszyou on 20230113:通过继承此类来实现服务端的接收后处理逻辑 @abstractmethod def on_revice_handler(self, message): pass + #Edit by xszyou on 20230114:通过继承此类来实现服务端的连接处理逻辑 @abstractmethod def on_connect_handler(self): pass + #Edit by xszyou on 20230804:通过继承此类来实现服务端的发送前的处理逻辑 + @abstractmethod + def on_send_handler(self, message): + return message # 创建server def __connect(self): @@ -98,7 +104,7 @@ class MyServer: # 关闭服务 def stop_server(self): self.__running = False - isConnect = False + self.isConnect = False if self.__server is None: return self.__server.ws_server.close() @@ -114,6 +120,7 @@ class MyServer: except BaseException as e: print("Error: {}".format(e)) +#数字人端server class HumanServer(MyServer): def __init__(self, host='0.0.0.0', port=10000): super().__init__(host, port) @@ -124,6 +131,11 @@ class HumanServer(MyServer): def on_connect_handler(self): pass + def on_send_handler(self, message): + # util.log(1, '向human发送 {}'.format(message)) + return message + +#ui端server class WebServer(MyServer): def __init__(self, host='0.0.0.0', port=10000): super().__init__(host, port) @@ -134,6 +146,10 @@ class WebServer(MyServer): def on_connect_handler(self): self.add_cmd({"panelMsg": "使用提示：直播，请关闭麦克风。连接数字人，请关闭面板播放。"}) + def on_send_handler(self, message): + return message + +#测试 class TestServer(MyServer): def __init__(self, host='0.0.0.0', port=10000): super().__init__(host, port) @@ -143,9 +159,12 @@ class TestServer(MyServer): def on_connect_handler(self): print("连接上了") + + def on_send_handler(self, message): + return message - +#单例 __instance: MyServer = None __web_instance: MyServer = None diff --git a/fay_booter.py b/fay_booter.py index b093e06..4e74727 100644 --- a/fay_booter.py +++ b/fay_booter.py @@ -6,11 +6,12 @@ from core.fay_core import FeiFei from scheduler.thread_manager import MyThread from utils import util, config_util, stream_util, ngrok_util from core.wsa_server import MyServer +from scheduler.thread_manager import MyThread feiFei: FeiFei = None recorderListener: Recorder = None -__running = True +__running = False #录制麦克风音频输入并传给aliyun class RecorderListener(Recorder): @@ -19,6 +20,7 @@ class RecorderListener(Recorder): self.__device = device self.__RATE = 16000 self.__FORMAT = pyaudio.paInt16 + self.__running = False super().__init__(fei) @@ -39,8 +41,15 @@ class RecorderListener(Recorder): util.log(1, '请检查设备是否有误，再重新启动!') return self.stream = self.paudio.open(input_device_index=device_id, rate=self.__RATE, format=self.__FORMAT, channels=channels, input=True) + self.__running = True + MyThread(target=self.__pyaudio_clear).start() return self.stream + def __pyaudio_clear(self): + while self.__running: + time.sleep(30) + + def __findInternalRecordingDevice(self, p): for i in range(p.get_device_count()): devInfo = p.get_device_info_by_index(i) @@ -53,6 +62,7 @@ class RecorderListener(Recorder): def stop(self): super().stop() + self.__running = False try: self.stream.stop_stream() self.stream.close() diff --git a/main.py b/main.py index 99de9c2..27ef115 100644 --- a/main.py +++ b/main.py @@ -19,7 +19,7 @@ def __clear_samples(): if not os.path.exists("./samples"): os.mkdir("./samples") for file_name in os.listdir('./samples'): - if file_name.startswith('sample-') and file_name.endswith('.mp3'): + if file_name.startswith('sample-'): os.remove('./samples/' + file_name) diff --git a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/cache-v2-896b17dd7c60d92ccdc9.json b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/cache-v2-5c4efd9ce0c6adbfa5ff.json similarity index 93% rename from test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/cache-v2-896b17dd7c60d92ccdc9.json rename to test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/cache-v2-5c4efd9ce0c6adbfa5ff.json index 35c3c17..e6fb459 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/cache-v2-896b17dd7c60d92ccdc9.json +++ b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/cache-v2-5c4efd9ce0c6adbfa5ff.json @@ -15,7 +15,7 @@ } ], "type" : "FILEPATH", - "value" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/lib.exe" + "value" : "D:/vs2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/lib.exe" }, { "name" : "CMAKE_BUILD_TYPE", @@ -27,7 +27,7 @@ } ], "type" : "STRING", - "value" : "Debug" + "value" : "RelWithDebInfo" }, { "name" : "CMAKE_CACHEFILE_DIR", @@ -39,7 +39,7 @@ } ], "type" : "INTERNAL", - "value" : "e:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug" + "value" : "e:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release" }, { "name" : "CMAKE_CACHE_MAJOR_VERSION", @@ -87,7 +87,7 @@ } ], "type" : "INTERNAL", - "value" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe" + "value" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe" }, { "name" : "CMAKE_CPACK_COMMAND", @@ -99,7 +99,7 @@ } ], "type" : "INTERNAL", - "value" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe" + "value" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe" }, { "name" : "CMAKE_CTEST_COMMAND", @@ -111,7 +111,7 @@ } ], "type" : "INTERNAL", - "value" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe" + "value" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe" }, { "name" : "CMAKE_CXX_COMPILER", @@ -127,7 +127,7 @@ } ], "type" : "FILEPATH", - "value" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe" + "value" : "D:/vs2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe" }, { "name" : "CMAKE_CXX_FLAGS", @@ -415,7 +415,7 @@ } ], "type" : "PATH", - "value" : "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/install/x64-Debug" + "value" : "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/install/x64-Release" }, { "name" : "CMAKE_LINKER", @@ -431,7 +431,7 @@ } ], "type" : "FILEPATH", - "value" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/link.exe" + "value" : "D:/vs2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/link.exe" }, { "name" : "CMAKE_MAKE_PROGRAM", @@ -439,11 +439,11 @@ [ { "name" : "HELPSTRING", - "value" : "make program" + "value" : "No help, variable specified on the command line." } ], - "type" : "FILEPATH", - "value" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe" + "type" : "UNINITIALIZED", + "value" : "D:\\VS2019\\COMMUNITY\\COMMON7\\IDE\\COMMONEXTENSIONS\\MICROSOFT\\CMAKE\\Ninja\\ninja.exe" }, { "name" : "CMAKE_MODULE_LINKER_FLAGS", @@ -731,7 +731,7 @@ } ], "type" : "INTERNAL", - "value" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20" + "value" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20" }, { "name" : "CMAKE_SHARED_LINKER_FLAGS", @@ -975,7 +975,7 @@ } ], "type" : "STATIC", - "value" : "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug" + "value" : "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release" }, { "name" : "ProcessWAV_SOURCE_DIR", diff --git a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/cmakeFiles-v1-a5b8227b85a479822a76.json b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/cmakeFiles-v1-a5b8227b85a479822a76.json deleted file mode 100644 index f9442db..0000000 --- a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/cmakeFiles-v1-a5b8227b85a479822a76.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "inputs" : - [ - { - "path" : "CMakeLists.txt" - }, - { - "isGenerated" : true, - "path" : "out/build/x64-Debug/CMakeFiles/3.20.21032501-MSVC_2/CMakeSystem.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeSystemSpecificInitialize.cmake" - }, - { - "isGenerated" : true, - "path" : "out/build/x64-Debug/CMakeFiles/3.20.21032501-MSVC_2/CMakeCXXCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeSystemSpecificInformation.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeGenericSystem.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeInitializeConfigs.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/Platform/Windows.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/Platform/WindowsPaths.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeCXXInformation.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeLanguageInformation.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/Compiler/MSVC-CXX.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/Compiler/CMakeCommonCompilerMacros.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/Platform/Windows-MSVC-CXX.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/Platform/Windows-MSVC.cmake" - }, - { - "isGenerated" : true, - "path" : "out/build/x64-Debug/CMakeFiles/3.20.21032501-MSVC_2/CMakeRCCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeRCInformation.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeCommonLanguageInclude.cmake" - } - ], - "kind" : "cmakeFiles", - "paths" : - { - "build" : "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug", - "source" : "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV" - }, - "version" : - { - "major" : 1, - "minor" : 0 - } -} diff --git a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/cmakeFiles-v1-ba0b760fc0900b0d7772.json b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/cmakeFiles-v1-ba0b760fc0900b0d7772.json new file mode 100644 index 0000000..4f46367 --- /dev/null +++ b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/cmakeFiles-v1-ba0b760fc0900b0d7772.json @@ -0,0 +1,101 @@ +{ + "inputs" : + [ + { + "path" : "CMakeLists.txt" + }, + { + "isGenerated" : true, + "path" : "out/build/x64-Release/CMakeFiles/3.20.21032501-MSVC_2/CMakeSystem.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeSystemSpecificInitialize.cmake" + }, + { + "isGenerated" : true, + "path" : "out/build/x64-Release/CMakeFiles/3.20.21032501-MSVC_2/CMakeCXXCompiler.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeSystemSpecificInformation.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeGenericSystem.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeInitializeConfigs.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/Platform/Windows.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/Platform/WindowsPaths.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeCXXInformation.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeLanguageInformation.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/Compiler/MSVC-CXX.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/Compiler/CMakeCommonCompilerMacros.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/Platform/Windows-MSVC-CXX.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/Platform/Windows-MSVC.cmake" + }, + { + "isGenerated" : true, + "path" : "out/build/x64-Release/CMakeFiles/3.20.21032501-MSVC_2/CMakeRCCompiler.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeRCInformation.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20/Modules/CMakeCommonLanguageInclude.cmake" + } + ], + "kind" : "cmakeFiles", + "paths" : + { + "build" : "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release", + "source" : "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV" + }, + "version" : + { + "major" : 1, + "minor" : 0 + } +} diff --git a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/codemodel-v2-b859788ec7f51f66a64d.json b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/codemodel-v2-5534df6844d4ffc87b0c.json similarity index 84% rename from test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/codemodel-v2-b859788ec7f51f66a64d.json rename to test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/codemodel-v2-5534df6844d4ffc87b0c.json index 46b76fd..ec4fa0a 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/codemodel-v2-b859788ec7f51f66a64d.json +++ b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/codemodel-v2-5534df6844d4ffc87b0c.json @@ -18,7 +18,7 @@ ] } ], - "name" : "Debug", + "name" : "RelWithDebInfo", "projects" : [ { @@ -38,7 +38,7 @@ { "directoryIndex" : 0, "id" : "ProcessWAV::@6890427a1f51a3e7e1df", - "jsonFile" : "target-ProcessWAV-Debug-260ee181644312dd6c6e.json", + "jsonFile" : "target-ProcessWAV-RelWithDebInfo-66687df1b3d078e507c6.json", "name" : "ProcessWAV", "projectIndex" : 0 } @@ -48,7 +48,7 @@ "kind" : "codemodel", "paths" : { - "build" : "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug", + "build" : "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release", "source" : "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV" }, "version" : diff --git a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/index-2023-05-25T07-25-52-0253.json b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/index-2023-07-05T10-17-43-0993.json similarity index 59% rename from test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/index-2023-05-25T07-25-52-0253.json rename to test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/index-2023-07-05T10-17-43-0993.json index d48f018..8e2e603 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/index-2023-05-25T07-25-52-0253.json +++ b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/index-2023-07-05T10-17-43-0993.json @@ -8,10 +8,10 @@ }, "paths" : { - "cmake" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe", - "cpack" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe", - "ctest" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe", - "root" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20" + "cmake" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe", + "cpack" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe", + "ctest" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe", + "root" : "D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20" }, "version" : { @@ -26,7 +26,7 @@ "objects" : [ { - "jsonFile" : "codemodel-v2-b859788ec7f51f66a64d.json", + "jsonFile" : "codemodel-v2-5534df6844d4ffc87b0c.json", "kind" : "codemodel", "version" : { @@ -35,7 +35,7 @@ } }, { - "jsonFile" : "cache-v2-896b17dd7c60d92ccdc9.json", + "jsonFile" : "cache-v2-5c4efd9ce0c6adbfa5ff.json", "kind" : "cache", "version" : { @@ -44,7 +44,7 @@ } }, { - "jsonFile" : "cmakeFiles-v1-a5b8227b85a479822a76.json", + "jsonFile" : "cmakeFiles-v1-ba0b760fc0900b0d7772.json", "kind" : "cmakeFiles", "version" : { @@ -53,7 +53,7 @@ } }, { - "jsonFile" : "toolchains-v1-cd2110f86f39477997fc.json", + "jsonFile" : "toolchains-v1-cd882c587e8085aad53b.json", "kind" : "toolchains", "version" : { @@ -90,7 +90,7 @@ "responses" : [ { - "jsonFile" : "cache-v2-896b17dd7c60d92ccdc9.json", + "jsonFile" : "cache-v2-5c4efd9ce0c6adbfa5ff.json", "kind" : "cache", "version" : { @@ -99,7 +99,7 @@ } }, { - "jsonFile" : "cmakeFiles-v1-a5b8227b85a479822a76.json", + "jsonFile" : "cmakeFiles-v1-ba0b760fc0900b0d7772.json", "kind" : "cmakeFiles", "version" : { @@ -108,7 +108,7 @@ } }, { - "jsonFile" : "codemodel-v2-b859788ec7f51f66a64d.json", + "jsonFile" : "codemodel-v2-5534df6844d4ffc87b0c.json", "kind" : "codemodel", "version" : { @@ -117,7 +117,7 @@ } }, { - "jsonFile" : "toolchains-v1-cd2110f86f39477997fc.json", + "jsonFile" : "toolchains-v1-cd882c587e8085aad53b.json", "kind" : "toolchains", "version" : { diff --git a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/target-ProcessWAV-Debug-260ee181644312dd6c6e.json b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/target-ProcessWAV-RelWithDebInfo-66687df1b3d078e507c6.json similarity index 91% rename from test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/target-ProcessWAV-Debug-260ee181644312dd6c6e.json rename to test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/target-ProcessWAV-RelWithDebInfo-66687df1b3d078e507c6.json index d03ff8f..2ca58c2 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/target-ProcessWAV-Debug-260ee181644312dd6c6e.json +++ b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/target-ProcessWAV-RelWithDebInfo-66687df1b3d078e507c6.json @@ -52,7 +52,7 @@ "compileCommandFragments" : [ { - "fragment" : "/DWIN32 /D_WINDOWS /W3 /GR /EHsc /MDd /Zi /Ob0 /Od /RTC1" + "fragment" : "/DWIN32 /D_WINDOWS /W3 /GR /EHsc /MD /Zi /O2 /Ob1 /DNDEBUG" } ], "includes" : @@ -83,7 +83,7 @@ "commandFragments" : [ { - "fragment" : "/DWIN32 /D_WINDOWS /W3 /GR /EHsc /MDd /Zi /Ob0 /Od /RTC1", + "fragment" : "/DWIN32 /D_WINDOWS /W3 /GR /EHsc /MD /Zi /O2 /Ob1 /DNDEBUG", "role" : "flags" }, { @@ -92,7 +92,7 @@ }, { "backtrace" : 2, - "fragment" : "E:\\fay\\ovr_lipsync_native_29.0.0\\OVRLipSyncNative\\Lib\\Win64\\OVRLipSyncShimd.lib", + "fragment" : "E:\\fay\\ovr_lipsync_native_29.0.0\\OVRLipSyncNative\\Lib\\Win64\\OVRLipSyncShim.lib", "role" : "libraries" }, { diff --git a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/toolchains-v1-cd2110f86f39477997fc.json b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/toolchains-v1-cd882c587e8085aad53b.json similarity index 81% rename from test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/toolchains-v1-cd2110f86f39477997fc.json rename to test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/toolchains-v1-cd882c587e8085aad53b.json index ee0a135..5b35f99 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/toolchains-v1-cd2110f86f39477997fc.json +++ b/test/ovr_lipsync/ovr_lipsync_exe/.cmake/api/v1/reply/toolchains-v1-cd882c587e8085aad53b.json @@ -13,8 +13,8 @@ "linkFrameworkDirectories" : [], "linkLibraries" : [] }, - "path" : "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe", - "version" : "19.29.30145.0" + "path" : "D:/vs2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe", + "version" : "19.29.30148.0" }, "language" : "CXX", "sourceFileExtensions" : diff --git a/test/ovr_lipsync/ovr_lipsync_exe/.ninja_deps b/test/ovr_lipsync/ovr_lipsync_exe/.ninja_deps index d2c546d..d270420 100644 Binary files a/test/ovr_lipsync/ovr_lipsync_exe/.ninja_deps and b/test/ovr_lipsync/ovr_lipsync_exe/.ninja_deps differ diff --git a/test/ovr_lipsync/ovr_lipsync_exe/.ninja_log b/test/ovr_lipsync/ovr_lipsync_exe/.ninja_log index fab9d19..9819147 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/.ninja_log +++ b/test/ovr_lipsync/ovr_lipsync_exe/.ninja_log @@ -1,6 +1,13 @@ # ninja log v5 -0 447 7067027683402536 CMakeFiles/ProcessWAV.dir/ProcessWAV.cpp.obj b28391b2cb7a7212 -449 1330 7067027691806813 ProcessWAV.exe 3ecd2b805f4edc42 -0 19 0 clean f0859c636203ad58 -0 915 7067031389568287 CMakeFiles/ProcessWAV.dir/ProcessWAV.cpp.obj b28391b2cb7a7212 -915 1344 7067031392674182 ProcessWAV.exe 3ecd2b805f4edc42 +0 20 0 clean 31ab3d799f8f12dc +0 969 7102595029209645 CMakeFiles/ProcessWAV.dir/ProcessWAV.cpp.obj 3d4f415e05e93de2 +971 1805 7102595036699602 ProcessWAV.exe 6de1b3aac8914d8f +0 19 0 clean 31ab3d799f8f12dc +1 865 7105949792569675 CMakeFiles/ProcessWAV.dir/ProcessWAV.cpp.obj 3d4f415e05e93de2 +866 1470 7105949797905075 ProcessWAV.exe 6de1b3aac8914d8f +0 18 0 clean 31ab3d799f8f12dc +1 755 7105958215942686 CMakeFiles/ProcessWAV.dir/ProcessWAV.cpp.obj 3d4f415e05e93de2 +756 1112 7105958218882388 ProcessWAV.exe 6de1b3aac8914d8f +1 18 0 clean 31ab3d799f8f12dc +1 762 7105964709745036 CMakeFiles/ProcessWAV.dir/ProcessWAV.cpp.obj 3d4f415e05e93de2 +762 1118 7105964712681991 ProcessWAV.exe 6de1b3aac8914d8f diff --git a/test/ovr_lipsync/ovr_lipsync_exe/CMakeCache.txt b/test/ovr_lipsync/ovr_lipsync_exe/CMakeCache.txt index b65e834..d80c310 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/CMakeCache.txt +++ b/test/ovr_lipsync/ovr_lipsync_exe/CMakeCache.txt @@ -1,6 +1,6 @@ # This is the CMakeCache file. -# For build in directory: e:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug -# It was generated by CMake: D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe +# For build in directory: e:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release +# It was generated by CMake: D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. # If you do want to change a value, simply edit, save, and exit the editor. @@ -15,13 +15,13 @@ ######################## //Path to a program. -CMAKE_AR:FILEPATH=D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/lib.exe +CMAKE_AR:FILEPATH=D:/vs2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/lib.exe //No help, variable specified on the command line. -CMAKE_BUILD_TYPE:STRING=Debug +CMAKE_BUILD_TYPE:STRING=RelWithDebInfo //No help, variable specified on the command line. -CMAKE_CXX_COMPILER:FILEPATH=D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe +CMAKE_CXX_COMPILER:FILEPATH=D:/vs2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe //Flags used by the CXX compiler during all build types. CMAKE_CXX_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3 /GR /EHsc @@ -60,13 +60,13 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL CMAKE_EXPORT_COMPILE_COMMANDS:BOOL= //No help, variable specified on the command line. -CMAKE_INSTALL_PREFIX:PATH=E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/install/x64-Debug +CMAKE_INSTALL_PREFIX:PATH=E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/install/x64-Release //Path to a program. -CMAKE_LINKER:FILEPATH=D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/link.exe +CMAKE_LINKER:FILEPATH=D:/vs2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/link.exe -//make program -CMAKE_MAKE_PROGRAM:FILEPATH=D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe +//No help, variable specified on the command line. +CMAKE_MAKE_PROGRAM:UNINITIALIZED=D:\VS2019\COMMUNITY\COMMON7\IDE\COMMONEXTENSIONS\MICROSOFT\CMAKE\Ninja\ninja.exe //Flags used by the linker during the creation of modules during // all build types. @@ -178,7 +178,7 @@ OVRLipSyncShimDbg:FILEPATH=E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Lib OVRLipSyncShimRel:FILEPATH=E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Lib/Win64/OVRLipSyncShim.lib //Value Computed by CMake -ProcessWAV_BINARY_DIR:STATIC=E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug +ProcessWAV_BINARY_DIR:STATIC=E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release //Value Computed by CMake ProcessWAV_SOURCE_DIR:STATIC=E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV @@ -191,7 +191,7 @@ ProcessWAV_SOURCE_DIR:STATIC=E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/S //ADVANCED property for variable: CMAKE_AR CMAKE_AR-ADVANCED:INTERNAL=1 //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=e:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug +CMAKE_CACHEFILE_DIR:INTERNAL=e:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 //Minor version of cmake used to create the current loaded cache @@ -199,11 +199,11 @@ CMAKE_CACHE_MINOR_VERSION:INTERNAL=20 //Patch version of cmake used to create the current loaded cache CMAKE_CACHE_PATCH_VERSION:INTERNAL=21032501 //Path to CMake executable. -CMAKE_COMMAND:INTERNAL=D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe +CMAKE_COMMAND:INTERNAL=D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe //Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe +CMAKE_CPACK_COMMAND:INTERNAL=D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe //Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe +CMAKE_CTEST_COMMAND:INTERNAL=D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe //ADVANCED property for variable: CMAKE_CXX_COMPILER CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS @@ -279,7 +279,7 @@ CMAKE_RC_FLAGS_RELEASE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_RC_FLAGS_RELWITHDEBINFO CMAKE_RC_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //Path to CMake installation. -CMAKE_ROOT:INTERNAL=D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20 +CMAKE_ROOT:INTERNAL=D:/vs2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG diff --git a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CMakeCXXCompiler.cmake b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CMakeCXXCompiler.cmake index c12df2b..2529a49 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CMakeCXXCompiler.cmake +++ b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CMakeCXXCompiler.cmake @@ -1,7 +1,7 @@ -set(CMAKE_CXX_COMPILER "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe") +set(CMAKE_CXX_COMPILER "D:/vs2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe") set(CMAKE_CXX_COMPILER_ARG1 "") set(CMAKE_CXX_COMPILER_ID "MSVC") -set(CMAKE_CXX_COMPILER_VERSION "19.29.30145.0") +set(CMAKE_CXX_COMPILER_VERSION "19.29.30148.0") set(CMAKE_CXX_COMPILER_VERSION_INTERNAL "") set(CMAKE_CXX_COMPILER_WRAPPER "") set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "14") @@ -21,11 +21,11 @@ set(CMAKE_CXX_COMPILER_ARCHITECTURE_ID x64) set(MSVC_CXX_ARCHITECTURE_ID x64) -set(CMAKE_AR "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/lib.exe") +set(CMAKE_AR "D:/vs2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/lib.exe") set(CMAKE_CXX_COMPILER_AR "") set(CMAKE_RANLIB ":") set(CMAKE_CXX_COMPILER_RANLIB "") -set(CMAKE_LINKER "D:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/link.exe") +set(CMAKE_LINKER "D:/vs2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/link.exe") set(CMAKE_MT "C:/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64/mt.exe") set(CMAKE_COMPILER_IS_GNUCXX ) set(CMAKE_CXX_COMPILER_LOADED 1) diff --git a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CMakeDetermineCompilerABI_CXX.bin b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CMakeDetermineCompilerABI_CXX.bin index 0070dd6..71b07d8 100644 Binary files a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CMakeDetermineCompilerABI_CXX.bin and b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CMakeDetermineCompilerABI_CXX.bin differ diff --git a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe index ab71671..92c2699 100644 Binary files a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe and b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.exe differ diff --git a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.obj b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.obj index ba1cabb..01ea50e 100644 Binary files a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.obj and b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/3.20.21032501-MSVC_2/CompilerIdCXX/CMakeCXXCompilerId.obj differ diff --git a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ProcessWAV.dir/ProcessWAV.cpp.obj b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ProcessWAV.dir/ProcessWAV.cpp.obj index 82fe2b5..451dce2 100644 Binary files a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ProcessWAV.dir/ProcessWAV.cpp.obj and b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ProcessWAV.dir/ProcessWAV.cpp.obj differ diff --git a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ProcessWAV.dir/manifest.rc b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ProcessWAV.dir/manifest.rc index 32c595e..b388b0d 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ProcessWAV.dir/manifest.rc +++ b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ProcessWAV.dir/manifest.rc @@ -1,2 +1,2 @@ #pragma code_page(65001) -1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug/CMakeFiles/ProcessWAV.dir/embed.manifest" \ No newline at end of file +1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release/CMakeFiles/ProcessWAV.dir/embed.manifest" \ No newline at end of file diff --git a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ProcessWAV.dir/vc140.pdb b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ProcessWAV.dir/vc140.pdb index e7e4db0..c947ce5 100644 Binary files a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ProcessWAV.dir/vc140.pdb and b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ProcessWAV.dir/vc140.pdb differ diff --git a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ShowIncludes/main.obj b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ShowIncludes/main.obj index 5a2b1e5..a026b56 100644 Binary files a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ShowIncludes/main.obj and b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/ShowIncludes/main.obj differ diff --git a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/TargetDirectories.txt b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/TargetDirectories.txt index 590839b..d46f9ad 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/TargetDirectories.txt +++ b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/TargetDirectories.txt @@ -1,3 +1,3 @@ -E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug/CMakeFiles/ProcessWAV.dir -E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug/CMakeFiles/edit_cache.dir -E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug/CMakeFiles/rebuild_cache.dir +E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release/CMakeFiles/ProcessWAV.dir +E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release/CMakeFiles/edit_cache.dir +E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release/CMakeFiles/rebuild_cache.dir diff --git a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/rules.ninja b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/rules.ninja index 6558486..878f806 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/rules.ninja +++ b/test/ovr_lipsync/ovr_lipsync_exe/CMakeFiles/rules.ninja @@ -7,7 +7,7 @@ # ============================================================================= # Project: ProcessWAV -# Configurations: Debug +# Configurations: RelWithDebInfo # ============================================================================= # ============================================================================= @@ -20,17 +20,17 @@ msvc_deps_prefix = 注意: 包含文件: ############################################# # Rule for compiling CXX files. -rule CXX_COMPILER__ProcessWAV_Debug +rule CXX_COMPILER__ProcessWAV_RelWithDebInfo deps = msvc - command = "D:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\cl.exe" /nologo /TP $DEFINES $INCLUDES $FLAGS /showIncludes /Fo$out /Fd$TARGET_COMPILE_PDB /FS -c $in + command = D:\vs2019\Community\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\cl.exe /nologo /TP $DEFINES $INCLUDES $FLAGS /showIncludes /Fo$out /Fd$TARGET_COMPILE_PDB /FS -c $in description = Building CXX object $out ############################################# # Rule for linking CXX executable. -rule CXX_EXECUTABLE_LINKER__ProcessWAV_Debug - command = cmd.exe /C "$PRE_LINK && "D:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -E vs_link_exe --intdir=$OBJECT_DIR --rc=C:\PROGRA~2\WI3CF2~1\10\bin\100190~1.0\x64\rc.exe --mt=C:\PROGRA~2\WI3CF2~1\10\bin\100190~1.0\x64\mt.exe --manifests $MANIFESTS -- "D:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\link.exe" /nologo $in /out:$TARGET_FILE /implib:$TARGET_IMPLIB /pdb:$TARGET_PDB /version:0.0 $LINK_FLAGS $LINK_PATH $LINK_LIBRARIES && $POST_BUILD" +rule CXX_EXECUTABLE_LINKER__ProcessWAV_RelWithDebInfo + command = cmd.exe /C "$PRE_LINK && D:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe -E vs_link_exe --intdir=$OBJECT_DIR --rc=C:\PROGRA~2\WI3CF2~1\10\bin\100190~1.0\x64\rc.exe --mt=C:\PROGRA~2\WI3CF2~1\10\bin\100190~1.0\x64\mt.exe --manifests $MANIFESTS -- D:\vs2019\Community\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\link.exe /nologo $in /out:$TARGET_FILE /implib:$TARGET_IMPLIB /pdb:$TARGET_PDB /version:0.0 $LINK_FLAGS $LINK_PATH $LINK_LIBRARIES && $POST_BUILD" description = Linking CXX executable $TARGET_FILE restat = $RESTAT @@ -47,7 +47,7 @@ rule CUSTOM_COMMAND # Rule for re-running cmake. rule RERUN_CMAKE - command = "D:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" --regenerate-during-build -SE:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Sample\ProcessWAV -BE:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Sample\ProcessWAV\out\build\x64-Debug + command = D:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe --regenerate-during-build -SE:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Sample\ProcessWAV -BE:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Sample\ProcessWAV\out\build\x64-Release description = Re-running CMake... generator = 1 @@ -56,7 +56,7 @@ rule RERUN_CMAKE # Rule for cleaning all built files. rule CLEAN - command = "D:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe" $FILE_ARG -t clean $TARGETS + command = D:\VS2019\COMMUNITY\COMMON7\IDE\COMMONEXTENSIONS\MICROSOFT\CMAKE\Ninja\ninja.exe $FILE_ARG -t clean $TARGETS description = Cleaning all built files... @@ -64,6 +64,6 @@ rule CLEAN # Rule for printing all primary targets available. rule HELP - command = "D:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe" -t targets + command = D:\VS2019\COMMUNITY\COMMON7\IDE\COMMONEXTENSIONS\MICROSOFT\CMAKE\Ninja\ninja.exe -t targets description = All primary targets available: diff --git a/test/ovr_lipsync/ovr_lipsync_exe/ProcessWAV.exe b/test/ovr_lipsync/ovr_lipsync_exe/ProcessWAV.exe index 65ca812..bffcdda 100644 Binary files a/test/ovr_lipsync/ovr_lipsync_exe/ProcessWAV.exe and b/test/ovr_lipsync/ovr_lipsync_exe/ProcessWAV.exe differ diff --git a/test/ovr_lipsync/ovr_lipsync_exe/ProcessWAV.ilk b/test/ovr_lipsync/ovr_lipsync_exe/ProcessWAV.ilk index 307e59d..5efdde1 100644 Binary files a/test/ovr_lipsync/ovr_lipsync_exe/ProcessWAV.ilk and b/test/ovr_lipsync/ovr_lipsync_exe/ProcessWAV.ilk differ diff --git a/test/ovr_lipsync/ovr_lipsync_exe/ProcessWAV.pdb b/test/ovr_lipsync/ovr_lipsync_exe/ProcessWAV.pdb index fcbb744..10742c4 100644 Binary files a/test/ovr_lipsync/ovr_lipsync_exe/ProcessWAV.pdb and b/test/ovr_lipsync/ovr_lipsync_exe/ProcessWAV.pdb differ diff --git a/test/ovr_lipsync/ovr_lipsync_exe/build.ninja b/test/ovr_lipsync/ovr_lipsync_exe/build.ninja index 99dc2c9..b8b05f4 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/build.ninja +++ b/test/ovr_lipsync/ovr_lipsync_exe/build.ninja @@ -12,7 +12,7 @@ # ============================================================================= # Project: ProcessWAV -# Configurations: Debug +# Configurations: RelWithDebInfo # ============================================================================= ############################################# @@ -24,7 +24,7 @@ ninja_required_version = 1.5 ############################################# # Set configuration variable for custom commands. -CONFIGURATION = Debug +CONFIGURATION = RelWithDebInfo # ============================================================================= # Include auxiliary files. @@ -43,8 +43,8 @@ include CMakeFiles\rules.ninja build cmake_object_order_depends_target_ProcessWAV: phony || CMakeFiles\ProcessWAV.dir -build CMakeFiles\ProcessWAV.dir\ProcessWAV.cpp.obj: CXX_COMPILER__ProcessWAV_Debug ..\..\..\ProcessWAV.cpp || cmake_object_order_depends_target_ProcessWAV - FLAGS = /DWIN32 /D_WINDOWS /W3 /GR /EHsc /MDd /Zi /Ob0 /Od /RTC1 +build CMakeFiles\ProcessWAV.dir\ProcessWAV.cpp.obj: CXX_COMPILER__ProcessWAV_RelWithDebInfo ..\..\..\ProcessWAV.cpp || cmake_object_order_depends_target_ProcessWAV + FLAGS = /DWIN32 /D_WINDOWS /W3 /GR /EHsc /MD /Zi /O2 /Ob1 /DNDEBUG INCLUDES = -I..\..\..\..\..\Include OBJECT_DIR = CMakeFiles\ProcessWAV.dir OBJECT_FILE_DIR = CMakeFiles\ProcessWAV.dir @@ -59,10 +59,10 @@ build CMakeFiles\ProcessWAV.dir\ProcessWAV.cpp.obj: CXX_COMPILER__ProcessWAV_Deb ############################################# # Link the executable ProcessWAV.exe -build ProcessWAV.exe: CXX_EXECUTABLE_LINKER__ProcessWAV_Debug CMakeFiles\ProcessWAV.dir\ProcessWAV.cpp.obj | E$:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Lib\Win64\OVRLipSyncShimd.lib - FLAGS = /DWIN32 /D_WINDOWS /W3 /GR /EHsc /MDd /Zi /Ob0 /Od /RTC1 +build ProcessWAV.exe: CXX_EXECUTABLE_LINKER__ProcessWAV_RelWithDebInfo CMakeFiles\ProcessWAV.dir\ProcessWAV.cpp.obj | E$:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Lib\Win64\OVRLipSyncShim.lib + FLAGS = /DWIN32 /D_WINDOWS /W3 /GR /EHsc /MD /Zi /O2 /Ob1 /DNDEBUG LINK_FLAGS = /machine:x64 /debug /INCREMENTAL /subsystem:console - LINK_LIBRARIES = E:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Lib\Win64\OVRLipSyncShimd.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib + LINK_LIBRARIES = E:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Lib\Win64\OVRLipSyncShim.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib OBJECT_DIR = CMakeFiles\ProcessWAV.dir POST_BUILD = cd . PRE_LINK = cd . @@ -76,7 +76,7 @@ build ProcessWAV.exe: CXX_EXECUTABLE_LINKER__ProcessWAV_Debug CMakeFiles\Process # Utility command for edit_cache build CMakeFiles\edit_cache.util: CUSTOM_COMMAND - COMMAND = cmd.exe /C "cd /D E:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Sample\ProcessWAV\out\build\x64-Debug && "D:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -E echo "No interactive CMake dialog available."" + COMMAND = cmd.exe /C "cd /D E:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Sample\ProcessWAV\out\build\x64-Release && D:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe -E echo "No interactive CMake dialog available."" DESC = No interactive CMake dialog available... restat = 1 @@ -87,7 +87,7 @@ build edit_cache: phony CMakeFiles\edit_cache.util # Utility command for rebuild_cache build CMakeFiles\rebuild_cache.util: CUSTOM_COMMAND - COMMAND = cmd.exe /C "cd /D E:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Sample\ProcessWAV\out\build\x64-Debug && "D:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" --regenerate-during-build -SE:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Sample\ProcessWAV -BE:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Sample\ProcessWAV\out\build\x64-Debug" + COMMAND = cmd.exe /C "cd /D E:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Sample\ProcessWAV\out\build\x64-Release && D:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe --regenerate-during-build -SE:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Sample\ProcessWAV -BE:\fay\ovr_lipsync_native_29.0.0\OVRLipSyncNative\Sample\ProcessWAV\out\build\x64-Release" DESC = Running CMake to regenerate build system... pool = console restat = 1 @@ -105,7 +105,7 @@ build ProcessWAV: phony ProcessWAV.exe # ============================================================================= ############################################# -# Folder: E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug +# Folder: E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release build all: phony ProcessWAV.exe @@ -116,14 +116,14 @@ build all: phony ProcessWAV.exe ############################################# # Re-run CMake if any of its inputs changed. -build build.ninja: RERUN_CMAKE | ..\..\..\CMakeLists.txt CMakeCache.txt CMakeFiles\3.20.21032501-MSVC_2\CMakeCXXCompiler.cmake CMakeFiles\3.20.21032501-MSVC_2\CMakeRCCompiler.cmake CMakeFiles\3.20.21032501-MSVC_2\CMakeSystem.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeCXXInformation.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeCommonLanguageInclude.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeGenericSystem.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeInitializeConfigs.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeLanguageInformation.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeRCInformation.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeSystemSpecificInformation.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeSystemSpecificInitialize.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Compiler\CMakeCommonCompilerMacros.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Compiler\MSVC-CXX.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\Windows-MSVC-CXX.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\Windows-MSVC.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\Windows.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\WindowsPaths.cmake +build build.ninja: RERUN_CMAKE | ..\..\..\CMakeLists.txt CMakeCache.txt CMakeFiles\3.20.21032501-MSVC_2\CMakeCXXCompiler.cmake CMakeFiles\3.20.21032501-MSVC_2\CMakeRCCompiler.cmake CMakeFiles\3.20.21032501-MSVC_2\CMakeSystem.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeCXXInformation.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeCommonLanguageInclude.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeGenericSystem.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeInitializeConfigs.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeLanguageInformation.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeRCInformation.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeSystemSpecificInformation.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeSystemSpecificInitialize.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Compiler\CMakeCommonCompilerMacros.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Compiler\MSVC-CXX.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\Windows-MSVC-CXX.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\Windows-MSVC.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\Windows.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\WindowsPaths.cmake pool = console ############################################# # A missing CMake input file is not an error. -build ..\..\..\CMakeLists.txt CMakeCache.txt CMakeFiles\3.20.21032501-MSVC_2\CMakeCXXCompiler.cmake CMakeFiles\3.20.21032501-MSVC_2\CMakeRCCompiler.cmake CMakeFiles\3.20.21032501-MSVC_2\CMakeSystem.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeCXXInformation.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeCommonLanguageInclude.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeGenericSystem.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeInitializeConfigs.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeLanguageInformation.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeRCInformation.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeSystemSpecificInformation.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeSystemSpecificInitialize.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Compiler\CMakeCommonCompilerMacros.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Compiler\MSVC-CXX.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\Windows-MSVC-CXX.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\Windows-MSVC.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\Windows.cmake D$:\Program$ Files$ (x86)\Microsoft$ Visual$ Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\WindowsPaths.cmake: phony +build ..\..\..\CMakeLists.txt CMakeCache.txt CMakeFiles\3.20.21032501-MSVC_2\CMakeCXXCompiler.cmake CMakeFiles\3.20.21032501-MSVC_2\CMakeRCCompiler.cmake CMakeFiles\3.20.21032501-MSVC_2\CMakeSystem.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeCXXInformation.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeCommonLanguageInclude.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeGenericSystem.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeInitializeConfigs.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeLanguageInformation.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeRCInformation.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeSystemSpecificInformation.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\CMakeSystemSpecificInitialize.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Compiler\CMakeCommonCompilerMacros.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Compiler\MSVC-CXX.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\Windows-MSVC-CXX.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\Windows-MSVC.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\Windows.cmake D$:\vs2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\share\cmake-3.20\Modules\Platform\WindowsPaths.cmake: phony ############################################# diff --git a/test/ovr_lipsync/ovr_lipsync_exe/cmake_install.cmake b/test/ovr_lipsync/ovr_lipsync_exe/cmake_install.cmake index 77a68dd..6079094 100644 --- a/test/ovr_lipsync/ovr_lipsync_exe/cmake_install.cmake +++ b/test/ovr_lipsync/ovr_lipsync_exe/cmake_install.cmake @@ -2,7 +2,7 @@ # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) - set(CMAKE_INSTALL_PREFIX "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/install/x64-Debug") + set(CMAKE_INSTALL_PREFIX "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/install/x64-Release") endif() string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") @@ -12,7 +12,7 @@ if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") else() - set(CMAKE_INSTALL_CONFIG_NAME "Debug") + set(CMAKE_INSTALL_CONFIG_NAME "RelWithDebInfo") endif() message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") endif() @@ -40,5 +40,5 @@ endif() string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT "${CMAKE_INSTALL_MANIFEST_FILES}") -file(WRITE "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Debug/${CMAKE_INSTALL_MANIFEST}" +file(WRITE "E:/fay/ovr_lipsync_native_29.0.0/OVRLipSyncNative/Sample/ProcessWAV/out/build/x64-Release/${CMAKE_INSTALL_MANIFEST}" "${CMAKE_INSTALL_MANIFEST_CONTENT}") diff --git a/test/ovr_lipsync/test_olipsync.py b/test/ovr_lipsync/test_olipsync.py index 640618b..4c1bf20 100644 --- a/test/ovr_lipsync/test_olipsync.py +++ b/test/ovr_lipsync/test_olipsync.py @@ -21,6 +21,8 @@ class LipSyncGenerator: def convert_mp3_to_wav(self, mp3_filepath): audio = AudioSegment.from_mp3(mp3_filepath) + # 使用 set_frame_rate 方法设置采样率 + audio = audio.set_frame_rate(44100) wav_filepath = mp3_filepath.rsplit(".", 1)[0] + ".wav" audio.export(wav_filepath, format="wav") return wav_filepath @@ -65,16 +67,16 @@ class LipSyncGenerator: if viseme == current_viseme: count += 1 else: - result.append({"Lip": current_viseme, "Time": count*10}) # Multiply by 10 for duration in ms + result.append({"Lip": current_viseme, "Time": count*33}) # Multiply by 10 for duration in ms current_viseme = viseme count = 1 # Add the last viseme to the result - result.append({"Lip": current_viseme, "Time": count*10}) # Multiply by 10 for duration in ms + result.append({"Lip": current_viseme, "Time": count*33}) # Multiply by 10 for duration in ms new_data = [] for i in range(len(result)): - if result[i]['Time'] < 60: + if result[i]['Time'] < 30: if len(new_data) > 0: new_data[-1]['Time'] += result[i]['Time'] else: @@ -83,7 +85,8 @@ class LipSyncGenerator: if __name__ == "__main__": start_time = time.time() lip_sync_generator = LipSyncGenerator() - viseme_list = lip_sync_generator.generate_visemes("C:\\Users\\Administrator\\Documents\\GitHub\\Fay\\bin\\x64-Debug\\fay.mp3") + viseme_list = lip_sync_generator.generate_visemes("E:\\github\\Fay\\samples\\fay-man.mp3") + print(viseme_list) consolidated_visemes = lip_sync_generator.consolidate_visemes(viseme_list) print(json.dumps(consolidated_visemes)) print(time.time() - start_time) diff --git a/test/rasa/data/nlu.yml b/test/rasa/data/nlu.yml index 4579742..3095fd1 100644 --- a/test/rasa/data/nlu.yml +++ b/test/rasa/data/nlu.yml @@ -30,6 +30,13 @@ nlu: - 请教 - 请问 +- intent: ask_goods + examples: | + - 我手里拿着是什么 + - 这是什么 + - 这个是什么东西 + + - intent: ask_date examples: | - 今天是几号？ diff --git a/test/rasa/data/rules.yml b/test/rasa/data/rules.yml index 66fa2a2..f18a43d 100644 --- a/test/rasa/data/rules.yml +++ b/test/rasa/data/rules.yml @@ -32,4 +32,9 @@ rules: - intent: ask_problem - action: action_ask_problem +- rule: 多模态 + steps: + - intent: ask_goods + - action: action_ask_goods + diff --git a/test/rasa/domain.yml b/test/rasa/domain.yml index 0643a78..e81db88 100644 --- a/test/rasa/domain.yml +++ b/test/rasa/domain.yml @@ -7,6 +7,7 @@ intents: - ask_date - out_of_scope - ask_problem + - ask_goods responses: utter_greet: @@ -25,4 +26,5 @@ actions: - action_ask_date - action_gpt_response - action_ask_problem + - action_ask_goods