<[[T; N]]>::as_flattened

VOICEVOX · Aug 11, 2024 · 21c23a5 · 21c23a5
1 parent c195675
commit 21c23a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/crates/voicevox_core/src/engine/acoustic_feature_extractor.rs b/crates/voicevox_core/src/engine/acoustic_feature_extractor.rs
@@ -70,8 +70,8 @@ pub(crate) struct OjtPhoneme {
 }
 
 impl OjtPhoneme {
-    pub(crate) fn num_phoneme() -> usize {
-        PHONEME_MAP.len()
+    pub(crate) const fn num_phoneme() -> usize {
+        PHONEME_LIST.len() // == PHONEME_MAP.len()
     }
 
     fn space_phoneme() -> String {

diff --git a/crates/voicevox_core/src/synthesizer.rs b/crates/voicevox_core/src/synthesizer.rs
@@ -318,7 +318,7 @@ pub(crate) mod blocking {
 
             let (_, _, vowel_indexes) = split_mora(&phoneme_data_list);
 
-            let mut phoneme: Vec<Vec<f32>> = Vec::new();
+            let mut phoneme = Vec::new();
             let mut f0: Vec<f32> = Vec::new();
             {
                 const RATE: f32 = 24000. / 256.;
@@ -335,7 +335,7 @@ pub(crate) mod blocking {
                     let phoneme_id = phoneme_data_list[i].phoneme_id();
 
                     for _ in 0..phoneme_length {
-                        let mut phonemes_vec = vec![0.; OjtPhoneme::num_phoneme()];
+                        let mut phonemes_vec = [0.; OjtPhoneme::num_phoneme()];
                         phonemes_vec[phoneme_id as usize] = 1.;
                         phoneme.push(phonemes_vec)
                     }
@@ -352,14 +352,11 @@ pub(crate) mod blocking {
                 }
             }
 
-            // 2次元のvectorを1次元に変換し、アドレスを連続させる
-            let flatten_phoneme = phoneme.into_iter().flatten().collect::<Vec<_>>();
-
             let wave = &self.decode(
                 f0.len(),
                 OjtPhoneme::num_phoneme(),
                 &f0,
-                &flatten_phoneme,
+                phoneme.as_flattened(),
                 style_id,
             )?;
             return Ok(to_wav(wave, audio_query));