superres

2 files changed, 12 insertions, 6 deletions

diff --git a/NOTES b/NOTES
index 762df82..f3b1e90 100644
--- a/NOTES
+++ b/NOTES
@@ -104,6 +104,12 @@ parser.add_argument('-iwd', '--input_wave_directory', type=Path,
 parser.add_argument('-g', '--gpu', type=int)
 
 
+# VOICE TRANSFORM
+
+PYTHONPATH=`pwd` /home/spawn/.virtualenv/yukarin/bin/python scripts/process.py \
+  --conv_model_directory /home/spawn/code/become-yukarin/data/mat-holly-24000/conversion-net/pp-el8-mat-2-holly/ \
+  --sr_model_directory /home/spawn/code/become-yukarin/data/holly-24000/net/ \
+  --gpu 0
 
 
 mkdir all
diff --git a/become_yukarin/acoustic_converter.py b/become_yukarin/acoustic_converter.py
index 706c6ac..f31b39d 100644
--- a/become_yukarin/acoustic_converter.py
+++ b/become_yukarin/acoustic_converter.py
@@ -1,6 +1,6 @@
 from functools import partial
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Any
 
 import chainer
 import numpy
@@ -119,17 +119,17 @@ class AcousticConverter(object):
         ).astype(numpy.float64)
         return out
 
-    def convert_from_audio_path(self, path: Path, out_sampling_rate: Optional[int] = None):
+    def convert_from_audio_path(self, path: Path, out_sampling_rate: Optional[int] = None, store_f0: Optional[bool] = False):
         wave = self._wave_process(str(path), test=True)
         feature = self._feature_process(wave, test=True)
-        f0 = feature.f0
+        f0 = feature.f0 if store_f0 else None
         return self.convert_from_feature(feature, out_sampling_rate, f0)
 
     def convert_from_feature_path(self, path: Path, out_sampling_rate: Optional[int] = None):
         feature = self._acoustic_feature_load_process(path, test=True)
         return self.convert_from_feature(feature, out_sampling_rate)
 
-    def convert_from_feature(self, input: AcousticFeature, out_sampling_rate: Optional[int] = None, f0=None):
+    def convert_from_feature(self, input: AcousticFeature, out_sampling_rate: Optional[int] = None, f0: Any = None):
         if out_sampling_rate is None:
             out_sampling_rate = self.config.dataset.param.voice_param.sample_rate
 
@@ -145,5 +145,5 @@ class AcousticConverter(object):
         )
         return Wave(out, sampling_rate=out_sampling_rate)
 
-    def __call__(self, voice_path: Path, out_sampling_rate: Optional[int] = None):
-        return self.convert_from_audio_path(voice_path, out_sampling_rate)
+    def __call__(self, voice_path: Path, out_sampling_rate: Optional[int] = None, store_f0: Optional[bool] = False):
+        return self.convert_from_audio_path(voice_path, out_sampling_rate, store_f0)