From 68c0414bde084e781f9f84ab5071a4500b8c461c Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Sat, 3 Dec 2022 11:51:05 +0800
Subject: [PATCH] Change the way how FrameExtractionOptions is displayed

---
 kaldifeat/python/csrc/feature-window.cc | 55 ++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/kaldifeat/python/csrc/feature-window.cc b/kaldifeat/python/csrc/feature-window.cc
index 5abaf36..dc80c50 100644
--- a/kaldifeat/python/csrc/feature-window.cc
+++ b/kaldifeat/python/csrc/feature-window.cc
@@ -4,6 +4,7 @@
 
 #include "kaldifeat/python/csrc/feature-window.h"
 
+#include <memory>
 #include <string>
 
 #include "kaldifeat/csrc/feature-window.h"
@@ -14,7 +15,38 @@ namespace kaldifeat {
 static void PybindFrameExtractionOptions(py::module &m) {
   using PyClass = FrameExtractionOptions;
   py::class_<PyClass>(m, "FrameExtractionOptions")
-      .def(py::init<>())
+      .def(
+          py::init([](float samp_freq = 16000, float frame_shift_ms = 10.0f,
+                      float frame_length_ms = 25.0f, float dither = 1.0f,
+                      float preemph_coeff = 0.97f, bool remove_dc_offset = true,
+                      const std::string &window_type = "povey",
+                      bool round_to_power_of_two = true,
+                      float blackman_coeff = 0.42f, bool snip_edges = true,
+                      int32_t max_feature_vectors =
+                          -1) -> std::unique_ptr<FrameExtractionOptions> {
+            auto opts = std::make_unique<FrameExtractionOptions>();
+
+            opts->samp_freq = samp_freq;
+            opts->frame_shift_ms = frame_shift_ms;
+            opts->frame_length_ms = frame_length_ms;
+            opts->dither = dither;
+            opts->preemph_coeff = preemph_coeff;
+            opts->remove_dc_offset = remove_dc_offset;
+            opts->window_type = window_type;
+            opts->round_to_power_of_two = round_to_power_of_two;
+            opts->blackman_coeff = blackman_coeff;
+            opts->snip_edges = snip_edges;
+            opts->max_feature_vectors = max_feature_vectors;
+
+            return opts;
+          }),
+          py::arg("samp_freq") = 16000, py::arg("frame_shift_ms") = 10.0f,
+          py::arg("frame_length_ms") = 25.0f, py::arg("dither") = 1.0f,
+          py::arg("preemph_coeff") = 0.97f, py::arg("remove_dc_offset") = true,
+          py::arg("window_type") = "povey",
+          py::arg("round_to_power_of_two") = true,
+          py::arg("blackman_coeff") = 0.42f, py::arg("snip_edges") = true,
+          py::arg("max_feature_vectors") = -1)
       .def_readwrite("samp_freq", &PyClass::samp_freq)
       .def_readwrite("frame_shift_ms", &PyClass::frame_shift_ms)
       .def_readwrite("frame_length_ms", &PyClass::frame_length_ms)
@@ -38,7 +70,26 @@ static void PybindFrameExtractionOptions(py::module &m) {
       .def_readwrite("allow_upsample", &PyClass::allow_upsample)
 #endif
       .def("__str__",
-           [](const PyClass &self) -> std::string { return self.ToString(); })
+           [](const PyClass &self) -> std::string {
+             std::ostringstream os;
+             os << "FrameExtractionOptions(";
+             os << "samp_freq=" << self.samp_freq << ", ";
+             os << "frame_shift_ms=" << self.frame_shift_ms << ", ";
+             os << "frame_length_ms=" << self.frame_length_ms << ", ";
+             os << "dither=" << self.dither << ", ";
+             os << "preemph_coeff=" << self.preemph_coeff << ", ";
+             os << "remove_dc_offset="
+                << (self.remove_dc_offset ? "True" : "False") << ", ";
+             os << "window_type=" << '"' << self.window_type << '"' << ", ";
+             os << "round_to_power_of_two="
+                << (self.round_to_power_of_two ? "True" : "False") << ", ";
+             os << "blackman_coeff=" << self.blackman_coeff << ", ";
+             os << "snip_edges=" << (self.snip_edges ? "True" : "False")
+                << ", ";
+             os << "max_feature_vectors=" << self.max_feature_vectors << ")";
+
+             return os.str();
+           })
       .def(py::pickle(
           [](const PyClass &self) -> py::dict { return AsDict(self); },
           [](py::dict dict) -> PyClass {