update pitch_spec

Author: takenori-y

include/SPTK/analysis/spectrum_extraction.h

@@ -45,10 +45,11 @@ class SpectrumExtraction {
    * @param[in] fft_length FFT length.
    * @param[in] frame_shift Frame shift in point.
    * @param[in] sampling_rate Sampling rate in Hz.
+   * @param[in] f0_refinement Whether to refine F0.
    * @param[in] algorithm Algorithm used for spectrum extraction.
    */
   SpectrumExtraction(int fft_length, int frame_shift, double sampling_rate,
-                     Algorithms algorithm);
+                     bool f0_refinement, Algorithms algorithm);
 
   virtual ~SpectrumExtraction() {
     delete spectrum_extraction_;

include/SPTK/analysis/spectrum_extraction_by_world.h

@@ -33,9 +33,10 @@ class SpectrumExtractionByWorld : public SpectrumExtractionInterface {
    * @param[in] fft_length FFT length.
    * @param[in] frame_shift Frame shift in point.
    * @param[in] sampling_rate Sampling rate in Hz.
+   * @param[in] f0_refinement Whether to refine F0.
    */
   SpectrumExtractionByWorld(int fft_length, int frame_shift,
-                            double sampling_rate);
+                            double sampling_rate, bool f0_refinement);
 
   ~SpectrumExtractionByWorld() override {
   }
@@ -81,6 +82,7 @@ class SpectrumExtractionByWorld : public SpectrumExtractionInterface {
   const int fft_length_;
   const int frame_shift_;
   const double sampling_rate_;
+  const bool f0_refinement_;
 
   bool is_valid_;
 

src/analysis/spectrum_extraction.cc

@@ -25,12 +25,12 @@
 namespace sptk {
 
 SpectrumExtraction::SpectrumExtraction(
-    int fft_length, int frame_shift, double sampling_rate,
+    int fft_length, int frame_shift, double sampling_rate, bool f0_refinement,
     SpectrumExtraction::Algorithms algorithm) {
   switch (algorithm) {
     case kWorld: {
-      spectrum_extraction_ =
-          new SpectrumExtractionByWorld(fft_length, frame_shift, sampling_rate);
+      spectrum_extraction_ = new SpectrumExtractionByWorld(
+          fft_length, frame_shift, sampling_rate, f0_refinement);
       break;
     }
     default: {

src/analysis/spectrum_extraction_by_world.cc

@@ -27,10 +27,12 @@ namespace sptk {
 
 SpectrumExtractionByWorld::SpectrumExtractionByWorld(int fft_length,
                                                      int frame_shift,
-                                                     double sampling_rate)
+                                                     double sampling_rate,
+                                                     bool f0_refinement)
     : fft_length_(fft_length),
       frame_shift_(frame_shift),
       sampling_rate_(sampling_rate),
+      f0_refinement_(f0_refinement),
       is_valid_(true) {
   if (!sptk::IsPowerOfTwo(fft_length_) || fft_length <= 3 ||
       frame_shift_ <= 0 || !sptk::IsInRange(sampling_rate_, 8000.0, 98000.0)) {
@@ -98,14 +100,17 @@ bool SpectrumExtractionByWorld::Run(
 
   // Modify F0 for pitch-adaptive spectrum estimation.
   std::vector<double> modified_f0(f0_length);
-  world::StoneMask(waveform.data(), static_cast<int>(waveform.size()),
-                   static_cast<int>(sampling_rate_), time_axis.data(),
-                   f0.data(), f0_length, modified_f0.data());
+  if (f0_refinement_) {
+    world::StoneMask(waveform.data(), static_cast<int>(waveform.size()),
+                     static_cast<int>(sampling_rate_), time_axis.data(),
+                     f0.data(), f0_length, modified_f0.data());
+  }
 
   // Estimate spectrum.
   world::CheapTrick(waveform.data(), static_cast<int>(waveform.size()),
                     static_cast<int>(sampling_rate_), time_axis.data(),
-                    modified_f0.data(), f0_length, &option, pointers.data());
+                    f0_refinement_ ? modified_f0.data() : f0.data(), f0_length,
+                    &option, pointers.data());
 
   return true;
 }

src/main/pitch_spec.cc

@@ -39,6 +39,7 @@ const double kDefaultSamplingRate(16.0);
 const InputFormats kDefaultInputFormat(kPitch);
 const sptk::SpectrumToSpectrum::InputOutputFormats kDefaultOutputFormat(
     sptk::SpectrumToSpectrum::kLogAmplitudeSpectrumInDecibels);
+const bool kDefaultF0Refinement(true);
 
 void PrintUsage(std::ostream* stream) {
   // clang-format off
@@ -63,6 +64,7 @@ void PrintUsage(std::ostream* stream) {
   *stream << "                 1 (ln|H(z)|)" << std::endl;
   *stream << "                 2 (|H(z)|)" << std::endl;
   *stream << "                 3 (|H(z)|^2)" << std::endl;
+  *stream << "       -x    : skip f0 refinement  (  bool)[" << std::setw(5) << std::right << sptk::ConvertBooleanToString(!kDefaultF0Refinement) << "]" << std::endl;  // NOLINT
   *stream << "       -h    : print this message" << std::endl;
   *stream << "  infile:" << std::endl;
   *stream << "       waveform                    (double)[stdin]" << std::endl;
@@ -104,6 +106,8 @@ void PrintUsage(std::ostream* stream) {
  *     \arg @c 1 @f$\log |H(z)|@f$
  *     \arg @c 2 @f$|H(z)|@f$
  *     \arg @c 3 @f$|H(z)|^2@f$
+ * - @b -x
+ *   - disable f0 refinement
  * - @b infile @e str
  *   - double-type waveform
  * - @b f0file @e str
@@ -130,9 +134,11 @@ int main(int argc, char* argv[]) {
   InputFormats input_format(kDefaultInputFormat);
   sptk::SpectrumToSpectrum::InputOutputFormats output_format(
       kDefaultOutputFormat);
+  bool f0_refinement(kDefaultF0Refinement);
 
   for (;;) {
-    const int option_char(getopt_long(argc, argv, "a:l:p:s:q:o:h", NULL, NULL));
+    const int option_char(
+        getopt_long(argc, argv, "a:l:p:s:q:o:xh", NULL, NULL));
     if (-1 == option_char) break;
 
     switch (option_char) {
@@ -222,6 +228,10 @@ int main(int argc, char* argv[]) {
             static_cast<sptk::SpectrumToSpectrum::InputOutputFormats>(tmp);
         break;
       }
+      case 'x': {
+        f0_refinement = false;
+        break;
+      }
       case 'h': {
         PrintUsage(&std::cout);
         return 0;
@@ -320,8 +330,8 @@ int main(int argc, char* argv[]) {
   }
   if (waveform.empty()) return 0;
 
-  sptk::SpectrumExtraction spectrum_extraction(fft_length, frame_shift,
-                                               sampling_rate_in_hz, algorithm);
+  sptk::SpectrumExtraction spectrum_extraction(
+      fft_length, frame_shift, sampling_rate_in_hz, f0_refinement, algorithm);
   if (!spectrum_extraction.IsValid()) {
     std::ostringstream error_message;
     error_message << "FFT length must be a power of 2";

tools/Makefile

@@ -14,8 +14,8 @@
 # limitations under the License.                                           #
 # ------------------------------------------------------------------------ #
 
-PYTHON_VERSION     := 3.9
-BATS_VERSION       := 1.11.0
+PYTHON_VERSION     := 3.10
+BATS_VERSION       := 1.11.1
 CPPCHECK_VERSION   := 2.16.0
 DOXYGEN_VERSION    := 1.9.1
 SHELLCHECK_VERSION := 0.10.0