Update submodule (#299)

* Update submodule

* make generateのhash replaceが一部状態で動かない状態なので修正

* make generate

* 新しいシグネチャに合わせてコードとサンプル、テストの書き換え

* fix sample code

Author: yamachu

binding/Makefile

@@ -5,8 +5,8 @@ generate:
 	$(MAKE) replace-hash
 
 replace-hash:
-	$(eval VERSION := $(shell cat ../.git/modules/binding/voicevox_core/HEAD))
-	$(shell sed -i.bak 's/<VoicevoxCoreCommitHash>.*<\/VoicevoxCoreCommitHash>/<VoicevoxCoreCommitHash>$(VERSION)<\/VoicevoxCoreCommitHash>/' ../src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props)
+	$(eval VERSION := $(shell git -C voicevox_core rev-parse HEAD))
+	$(shell sed -i.bak 's|<VoicevoxCoreCommitHash>.*</VoicevoxCoreCommitHash>|<VoicevoxCoreCommitHash>$(VERSION)</VoicevoxCoreCommitHash>|' ../src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props)
 
 build/dev-library:
 	cd voicevox_core; cargo build --release -p voicevox_core_c_api --features load-onnxruntime -F voicevox_core/buildtime-download-onnxruntime

binding/voicevox_core

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -50,7 +50,7 @@ void Start()
             return;
         }
 
-        result = synthesizer.LoadVoiceModel(voiceModel);
+        result = synthesizer.LoadVoiceModel(voiceModel, LoadVoiceModelOptions.Default());
         if (result != ResultCode.RESULT_OK)
         {
             Debug.LogError(result.ToMessage());

examples/UnitySample/Assets/SampleVoicevoxCoreSharpScript.cs

@@ -1,10 +1,9 @@
 using System.CommandLine;
 using System.CommandLine.Parsing;
 using Microsoft.Extensions.FileSystemGlobbing;
-
 using VoicevoxCoreSharp.Core;
-using VoicevoxCoreSharp.Core.Struct;
 using VoicevoxCoreSharp.Core.Enum;
+using VoicevoxCoreSharp.Core.Struct;
 
 const string OutputWavName = "audio.wav";
 const uint StyleId = 0;
@@ -50,7 +49,7 @@ static int RunTts(string text, string? resourcePath = "voicevox_core")
             return 1;
         }
 
-        result = synthesizer.LoadVoiceModel(voiceModel);
+        result = synthesizer.LoadVoiceModel(voiceModel, LoadVoiceModelOptions.Default());
         if (result != ResultCode.RESULT_OK)
         {
             Console.Error.WriteLine(result.ToMessage());

examples/cli/Program.cs

@@ -0,0 +1,51 @@
+using System;
+using VoicevoxCoreSharp.Core.Native;
+
+namespace VoicevoxCoreSharp.Core.Enum
+{
+    /// <summary>
+    /// ::voicevox_synthesizer_load_voice_model の実行時に、同じIDの ::VoicevoxVoiceModelFile が既に読み込まれていたときのふるまい。
+    /// </summary>
+    public enum OnExistingVoiceModelId : int
+    {
+        /// <summary>
+        /// エラーにする。デフォルトのふるまい
+        /// </summary>
+        VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_ERROR = 0,
+        /// <summary>
+        /// 再読み込みする。VOICEVOX COREでは、長文のテキストを一度に音声合成するとCPU/GPUメモリが大量に占有されたままになる。再読み込みを行うとメモリの使用量が元に戻る
+        /// </summary>
+        VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_RELOAD = 1,
+        /// <summary>
+        /// 何もしない
+        /// </summary>
+        VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_SKIP = 2,
+    }
+
+    internal static class OnExistingVoiceModelIdExt
+    {
+        public static OnExistingVoiceModelId FromNative(this VoicevoxOnExistingVoiceModelId mode)
+        {
+#pragma warning disable CS8524
+            return mode switch
+            {
+                VoicevoxOnExistingVoiceModelId.VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_ERROR => OnExistingVoiceModelId.VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_ERROR,
+                VoicevoxOnExistingVoiceModelId.VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_RELOAD => OnExistingVoiceModelId.VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_RELOAD,
+                VoicevoxOnExistingVoiceModelId.VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_SKIP => OnExistingVoiceModelId.VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_SKIP,
+            };
+#pragma warning restore CS8524
+        }
+
+        public static VoicevoxOnExistingVoiceModelId ToNative(this OnExistingVoiceModelId mode)
+        {
+#pragma warning disable CS8524
+            return mode switch
+            {
+                OnExistingVoiceModelId.VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_ERROR => VoicevoxOnExistingVoiceModelId.VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_ERROR,
+                OnExistingVoiceModelId.VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_RELOAD => VoicevoxOnExistingVoiceModelId.VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_RELOAD,
+                OnExistingVoiceModelId.VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_SKIP => VoicevoxOnExistingVoiceModelId.VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_SKIP,
+            };
+#pragma warning restore CS8524
+        }
+    }
+}

src/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Enum/OnExistingVoiceModelId.cs

@@ -535,18 +535,28 @@ internal static unsafe partial class CoreUnsafe
         [DllImport(__DllName, EntryPoint = "voicevox_synthesizer_delete", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         internal static extern void voicevox_synthesizer_delete(VoicevoxSynthesizer* synthesizer);
 
+        /// <summary>
+        ///  デフォルトの `voicevox_synthesizer_load_voice_model` のオプションを生成する
+        ///  @return デフォルト値が設定された `voicevox_synthesizer_load_voice_model` のオプション
+        ///
+        ///  \no-orig-impl{voicevox_make_default_load_voice_model_options}
+        /// </summary>
+        [DllImport(__DllName, EntryPoint = "voicevox_make_default_load_voice_model_options", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
+        internal static extern VoicevoxLoadVoiceModelOptions voicevox_make_default_load_voice_model_options();
+
         /// <summary>
         ///  音声モデルを読み込む。
         ///
         ///  @param [in] synthesizer 音声シンセサイザ
         ///  @param [in] model 音声モデル
+        ///  @param [in] options オプション
         ///
         ///  @returns 結果コード
         ///
         ///  \orig-impl{voicevox_synthesizer_load_voice_model}
         /// </summary>
         [DllImport(__DllName, EntryPoint = "voicevox_synthesizer_load_voice_model", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        internal static extern VoicevoxResultCode voicevox_synthesizer_load_voice_model(VoicevoxSynthesizer* synthesizer, VoicevoxVoiceModelFile* model);
+        internal static extern VoicevoxResultCode voicevox_synthesizer_load_voice_model(VoicevoxSynthesizer* synthesizer, VoicevoxVoiceModelFile* model, VoicevoxLoadVoiceModelOptions options);
 
         /// <summary>
         ///  音声モデルの読み込みを解除する。
@@ -1374,6 +1384,12 @@ internal unsafe partial struct VoicevoxSynthesizer
     {
     }
 
+    [StructLayout(LayoutKind.Sequential)]
+    internal unsafe partial struct VoicevoxLoadVoiceModelOptions
+    {
+        public VoicevoxOnExistingVoiceModelId on_existing;
+    }
+
     [StructLayout(LayoutKind.Sequential)]
     internal unsafe partial struct VoicevoxSynthesisOptions
     {
@@ -1437,6 +1453,13 @@ internal enum VoicevoxResultCode : int
         VOICEVOX_RESULT_INCOMPATIBLE_QUERIES_ERROR = 35,
     }
 
+    internal enum VoicevoxOnExistingVoiceModelId : int
+    {
+        VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_ERROR = 0,
+        VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_RELOAD = 1,
+        VOICEVOX_ON_EXISTING_VOICE_MODEL_ID_SKIP = 2,
+    }
+
     internal enum VoicevoxAccelerationMode : int
     {
         VOICEVOX_ACCELERATION_MODE_AUTO = 0,

src/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Enum/OnExistingVoiceModelId.cs.meta

@@ -0,0 +1,46 @@
+using System;
+using VoicevoxCoreSharp.Core.Enum;
+using VoicevoxCoreSharp.Core.Native;
+
+namespace VoicevoxCoreSharp.Core.Struct
+{
+    /// <summary>
+    /// ::voicevox_synthesizer_load_voice_model のオプション。
+    /// </summary>
+    public struct LoadVoiceModelOptions
+    {
+        /// <summary>
+        /// 同じIDの ::VoicevoxVoiceModelFile が既に読み込まれていたときのふるまい
+        /// </summary>
+        public OnExistingVoiceModelId OnExisting { get; set; }
+
+        public static LoadVoiceModelOptions Default()
+        {
+            return LoadVoiceModelOptionsDefault.Value;
+        }
+    }
+
+    internal static class LoadVoiceModelOptionsDefault
+    {
+        public static readonly LoadVoiceModelOptions Value = CoreUnsafe.voicevox_make_default_load_voice_model_options().FromNative();
+    }
+
+    internal static class LoadVoiceModelOptionsExt
+    {
+        internal static VoicevoxLoadVoiceModelOptions ToNative(this LoadVoiceModelOptions loadVoiceModelOptions)
+        {
+            return new VoicevoxLoadVoiceModelOptions
+            {
+                on_existing = loadVoiceModelOptions.OnExisting.ToNative()
+            };
+        }
+
+        internal static LoadVoiceModelOptions FromNative(this VoicevoxLoadVoiceModelOptions loadVoiceModelOptions)
+        {
+            return new LoadVoiceModelOptions
+            {
+                OnExisting = loadVoiceModelOptions.on_existing.FromNative()
+            };
+        }
+    }
+}

src/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Native/CoreUnsafe.g.cs

@@ -60,11 +60,12 @@ public static ResultCode New(Onnxruntime onnxruntime, OpenJtalk openJtalk, Initi
             }
         }
 
-        public ResultCode LoadVoiceModel(VoiceModelFile voiceModel)
+        public ResultCode LoadVoiceModel(VoiceModelFile voiceModel, LoadVoiceModelOptions options)
         {
             unsafe
             {
-                return CoreUnsafe.voicevox_synthesizer_load_voice_model((VoicevoxSynthesizer*)Handle, (VoicevoxVoiceModelFile*)voiceModel.Handle).FromNative();
+                var loadVoiceModelOptions = options.ToNative();
+                return CoreUnsafe.voicevox_synthesizer_load_voice_model((VoicevoxSynthesizer*)Handle, (VoicevoxVoiceModelFile*)voiceModel.Handle, loadVoiceModelOptions).FromNative();
             }
         }