Update F0Extractor.py

F0Extractor.py

@@ -12,6 +12,9 @@ import os
 from rvc.lib.predictors.RMVPE import RMVPE0Predictor
 from rvc.configs.config import Config
 
+# ✅ Import DJCM
+from djcm import DJCMExtractor  
+
 config = Config()
 
 
@@ -51,6 +54,7 @@ class F0Extractor:
                 device=config.device,
             )
             f0 = f0[0].cpu().numpy()
+
         elif method == "fcpe":
             audio = librosa.to_mono(self.x)
             audio_length = len(audio)
@@ -75,6 +79,7 @@ class F0Extractor:
                 output_interp_target_length=f0_target_length,
             )
             f0 = f0.squeeze().cpu().numpy()
+
         elif method == "rmvpe":
             model_rmvpe = RMVPE0Predictor(
                 os.path.join("rvc", "models", "predictors", "rmvpe.pt"),
@@ -83,8 +88,14 @@ class F0Extractor:
             )
             f0 = model_rmvpe.infer_from_audio(self.wav16k, thred=0.03)
 
+        elif method == "djcm":  
+            if not hasattr(self, "_djcm"):
+                self._djcm = DJCMExtractor("rvc/models/predictors/djcm.pt", device=config.device)
+            f0 = self._djcm(self.wav16k, sr=16000)
+
         else:
             raise ValueError(f"Unknown method: {self.method}")
+
         return self.hz_to_cents(f0, librosa.midi_to_hz(0))
 
     def plot_f0(self, f0):