This commit is contained in:
Masato Kikuchi
2025-03-31 23:35:51 +09:00
parent a5d783bd65
commit 70c2341afd
3 changed files with 10 additions and 8 deletions

View File

@@ -383,7 +383,8 @@ impl TTSModelHolder {
if t.is_empty() {
continue;
}
let (bert_ori, phones, tones, lang_ids) = self.parse_text_neo(t.to_string(), given_tones.clone())?;
let (bert_ori, phones, tones, lang_ids) =
self.parse_text_neo(t.to_string(), given_tones.clone())?;
let vits2 = self
.find_model(ident)?

View File

@@ -210,4 +210,4 @@ pub fn kata_tone2phone_tone(kata_tone: Vec<(String, i32)>) -> Vec<(String, i32)>
}
results.push(("_".to_string(), 0));
results
}
}

View File

@@ -1,13 +1,17 @@
use axum::extract::State;
use axum::{
extract::Query,
http::header::CONTENT_TYPE,
response::IntoResponse,
routing::{get, post},
Json, Router,
http::header::CONTENT_TYPE,
};
use sbv2_core::tts_util::kata_tone2phone_tone;
use sbv2_core::{jtalk::JTalk, tts::{TTSModelHolder, SynthesizeOptions}, tts_util::preprocess_parse_text};
use sbv2_core::{
jtalk::JTalk,
tts::{SynthesizeOptions, TTSModelHolder},
tts_util::preprocess_parse_text,
};
use serde::{Deserialize, Serialize};
use tokio::{fs, net::TcpListener, sync::Mutex};
@@ -75,10 +79,7 @@ async fn synthesis(
.map(|query| (query.kana.clone(), query.tone))
.collect::<Vec<_>>();
let phone_tone = kata_tone2phone_tone(phone_tone);
let tones = phone_tone
.iter()
.map(|(_, tone)| *tone)
.collect::<Vec<_>>();
let tones = phone_tone.iter().map(|(_, tone)| *tone).collect::<Vec<_>>();
let buffer = {
let mut tts_model = state.tts_model.lock().await;
tts_model.easy_synthesize_neo(