Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SynthesizerからMutexを外す #666

Merged
merged 1 commit into from
Oct 30, 2023
Merged

SynthesizerからMutexを外す #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

102 changes: 35 additions & 67 deletions crates/voicevox_core_java_api/src/synthesizer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use jni::{
sys::{jboolean, jint, jobject},
JNIEnv,
};
use std::sync::{Arc, Mutex};
use std::sync::Arc;

#[no_mangle]
unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsNewWithInitialize<'local>(
Expand Down Expand Up @@ -52,7 +52,7 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsNewWithIn
open_jtalk,
Box::leak(Box::new(options)),
))?;
env.set_rust_field(&this, "handle", Arc::new(Mutex::new(internal)))?;
env.set_rust_field(&this, "handle", Arc::new(internal))?;
Ok(())
})
}
Expand All @@ -68,12 +68,9 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsLoadVoice
.get_rust_field::<_, _, Arc<voicevox_core::VoiceModel>>(&model, "handle")?
.clone();
let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();
{
let internal = internal.lock().unwrap();
RUNTIME.block_on(internal.load_voice_model(&model))?;
}
RUNTIME.block_on(internal.load_voice_model(&model))?;
Ok(())
})
}
Expand All @@ -88,14 +85,10 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsUnloadVoi
let model_id: String = env.get_string(&model_id)?.into();

let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();

{
let internal = internal.lock().unwrap();

internal.unload_voice_model(&voicevox_core::VoiceModelId::new(model_id))?;
}
internal.unload_voice_model(&voicevox_core::VoiceModelId::new(model_id))?;

Ok(())
})
Expand All @@ -113,13 +106,10 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsIsLoadedV
let model_id: String = env.get_string(&model_id)?.into();

let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();

let is_loaded = {
let internal = internal.lock().unwrap();
internal.is_loaded_voice_model(&voicevox_core::VoiceModelId::new(model_id))
};
let is_loaded = internal.is_loaded_voice_model(&voicevox_core::VoiceModelId::new(model_id));

Ok(is_loaded)
})
Expand All @@ -140,15 +130,12 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsAudioQuer
let style_id = style_id as u32;

let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();

let audio_query = {
let internal = internal.lock().unwrap();
RUNTIME.block_on(
internal.audio_query_from_kana(&kana, voicevox_core::StyleId::new(style_id)),
)?
};
let audio_query = RUNTIME.block_on(
internal.audio_query_from_kana(&kana, voicevox_core::StyleId::new(style_id)),
)?;

let query_json = serde_json::to_string(&audio_query).expect("should not fail");

Expand All @@ -170,13 +157,11 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsAudioQuer
let style_id = style_id as u32;

let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();

let audio_query = {
let internal = internal.lock().unwrap();
RUNTIME.block_on(internal.audio_query(&text, voicevox_core::StyleId::new(style_id)))?
};
let audio_query =
RUNTIME.block_on(internal.audio_query(&text, voicevox_core::StyleId::new(style_id)))?;

let query_json = serde_json::to_string(&audio_query).expect("should not fail");

Expand All @@ -200,16 +185,12 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsAccentPhr
let style_id = style_id as u32;

let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();

let accent_phrases = {
let internal = internal.lock().unwrap();
RUNTIME.block_on(
internal
.create_accent_phrases_from_kana(&kana, voicevox_core::StyleId::new(style_id)),
)?
};
let accent_phrases = RUNTIME.block_on(
internal.create_accent_phrases_from_kana(&kana, voicevox_core::StyleId::new(style_id)),
)?;

let query_json = serde_json::to_string(&accent_phrases).expect("should not fail");

Expand All @@ -231,15 +212,12 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsAccentPhr
let style_id = style_id as u32;

let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();

let accent_phrases = {
let internal = internal.lock().unwrap();
RUNTIME.block_on(
internal.create_accent_phrases(&text, voicevox_core::StyleId::new(style_id)),
)?
};
let accent_phrases = RUNTIME.block_on(
internal.create_accent_phrases(&text, voicevox_core::StyleId::new(style_id)),
)?;

let query_json = serde_json::to_string(&accent_phrases).expect("should not fail");

Expand All @@ -263,15 +241,12 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsReplaceMo
let style_id = style_id as u32;

let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();

let replaced_accent_phrases = {
let internal = internal.lock().unwrap();
RUNTIME.block_on(
internal.replace_mora_data(&accent_phrases, voicevox_core::StyleId::new(style_id)),
)?
};
let replaced_accent_phrases = RUNTIME.block_on(
internal.replace_mora_data(&accent_phrases, voicevox_core::StyleId::new(style_id)),
)?;

let replaced_accent_phrases_json =
serde_json::to_string(&replaced_accent_phrases).expect("should not fail");
Expand All @@ -296,11 +271,10 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsReplacePh
let style_id = style_id as u32;

let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();

let replaced_accent_phrases = {
let internal = internal.lock().unwrap();
RUNTIME.block_on(
internal
.replace_phoneme_length(&accent_phrases, voicevox_core::StyleId::new(style_id)),
Expand Down Expand Up @@ -328,15 +302,12 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsReplaceMo
let style_id = style_id as u32;

let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();

let replaced_accent_phrases = {
let internal = internal.lock().unwrap();
RUNTIME.block_on(
internal.replace_mora_pitch(&accent_phrases, voicevox_core::StyleId::new(style_id)),
)?
};
let replaced_accent_phrases = RUNTIME.block_on(
internal.replace_mora_pitch(&accent_phrases, voicevox_core::StyleId::new(style_id)),
)?;

let replaced_accent_phrases_json =
serde_json::to_string(&replaced_accent_phrases).expect("should not fail");
Expand All @@ -360,11 +331,10 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsSynthesis
let style_id = style_id as u32;

let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();

let wave = {
let internal = internal.lock().unwrap();
let options = voicevox_core::SynthesisOptions {
enable_interrogative_upspeak: enable_interrogative_upspeak != 0,
// ..Default::default()
Expand Down Expand Up @@ -395,11 +365,10 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsTtsFromKa
let style_id = style_id as u32;

let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();

let wave = {
let internal = internal.lock().unwrap();
let options = voicevox_core::TtsOptions {
enable_interrogative_upspeak: enable_interrogative_upspeak != 0,
// ..Default::default()
Expand Down Expand Up @@ -430,11 +399,10 @@ unsafe extern "system" fn Java_jp_hiroshiba_voicevoxcore_Synthesizer_rsTts<'loca
let style_id = style_id as u32;

let internal = env
.get_rust_field::<_, _, Arc<Mutex<voicevox_core::Synthesizer>>>(&this, "handle")?
.get_rust_field::<_, _, Arc<voicevox_core::Synthesizer>>(&this, "handle")?
.clone();

let wave = {
let internal = internal.lock().unwrap();
let options = voicevox_core::TtsOptions {
enable_interrogative_upspeak: enable_interrogative_upspeak != 0,
// ..Default::default()
Expand Down
2 changes: 0 additions & 2 deletions crates/voicevox_core_python_api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ directml = ["voicevox_core/directml"]
[dependencies]
easy-ext.workspace = true
log = "0.4.17"
once_cell.workspace = true
pyo3 = { version = "0.19.2", features = ["abi3-py38", "extension-module"] }
pyo3-asyncio = { version = "0.19.0", features = ["tokio-runtime"] }
pyo3-log = "0.9.0"
serde.workspace = true
serde_json.workspace = true
tokio.workspace = true
uuid.workspace = true
voicevox_core.workspace = true
Loading
Loading