Merge pull request #285 from cmusphinx/make_samprate_an_int

dhdaines · web-flow · commit 0af2477805f8 · 2022-08-22T11:54:47.000-04:00
Make -samprate an int after all these years
diff --git a/cython/_pocketsphinx.pyx b/cython/_pocketsphinx.pyx
@@ -738,7 +738,7 @@ cdef class Decoder:
         fsg(str): Path to FSG grammar file (only one of ``lm``, ``jsgf``,
                   or ``fsg`` should be specified).
         toprule(str): Name of top-level rule in JSGF file to use as entry point.
-        samprate(float): Sampling rate for raw audio data.
+        samprate(int): Sampling rate for raw audio data.
         loglevel(str): Logging level, one of "INFO", "ERROR", "FATAL".
         logfn(str): File to write log messages to.
     Raises:
diff --git a/cython/test/config_test.py b/cython/test/config_test.py
@@ -12,16 +12,16 @@ class TestConfig(unittest.TestCase):
     def test_config(self):
         config = Decoder.default_config()
         intval = 256
-        floatval = 8000.0
+        floatval = 0.025
         stringval = "~/pocketsphinx"
         boolval = True
 
         # Check values that was previously set.
-        s = config.get_float("-samprate")
+        s = config.get_float("-wlen")
         print("Float:", floatval, " ", s)
-        self.assertEqual(s, 16000.0)
-        config.set_float("-samprate", floatval)
-        s = config.get_float("-samprate")
+        self.assertEqual(s, 0.025625)
+        config.set_float("-wlen", floatval)
+        s = config.get_float("-wlen")
         self.assertEqual(s, floatval)
 
         s = config.get_int("-nfft")
@@ -69,25 +69,25 @@ def test_config_file(self):
 class TestConfigHash(unittest.TestCase):
     def test_config__getitem(self):
         config = Config()
-        self.assertEqual(config["samprate"], 16000.0)
+        self.assertEqual(config["samprate"], 16000)
         self.assertEqual(config["nfft"], 0)
         self.assertEqual(config["fsg"], None)
         self.assertEqual(config["backtrace"], False)
         self.assertEqual(config["feat"], "1s_c_d_dd")
 
     def test_config_easyinit(self):
-        config = Config(samprate=11025.0, fsg=None, backtrace=False, feat="1s_c_d_dd")
-        self.assertEqual(config["samprate"], 11025.0)
-        self.assertEqual(config.get_float("-samprate"), 11025.0)
+        config = Config(samprate=11025, fsg=None, backtrace=False, feat="1s_c_d_dd")
+        self.assertEqual(config["samprate"], 11025)
+        self.assertEqual(config.get_int("-samprate"), 11025)
         self.assertEqual(config["nfft"], 0)
         self.assertEqual(config["fsg"], None)
         self.assertEqual(config["backtrace"], False)
         self.assertEqual(config["feat"], "1s_c_d_dd")
 
     def test_config_coercion(self):
         config = Config()
-        config["samprate"] = 48000
-        self.assertEqual(config["samprate"], 48000.0)
+        config["samprate"] = 48000.0
+        self.assertEqual(config["samprate"], 48000)
         config["nfft"] = "1024"
         self.assertEqual(config["nfft"], 1024)
 
diff --git a/cython/test/decoder_test.py b/cython/test/decoder_test.py
@@ -83,11 +83,11 @@ def test_reinit(self):
         decoder.add_word("_forward", "F AO R W ER D", True)
         self._run_decode(decoder)
         # should preserve dict words, but make decoding fail
-        config.set_float("-samprate", 48000)
+        config.set_int("-samprate", 48000)
         decoder.reinit_feat(config)
         self.assertEqual("F AO R W ER D", decoder.lookup_word("_forward"))
         self._run_decode(decoder, expect_fail=True)
-        config.set_float("-samprate", 16000)
+        config.set_int("-samprate", 16000)
         # should erase dict words
         decoder.reinit(config)
         self.assertEqual(None, decoder.lookup_word("_forward"))
diff --git a/docs/source/config_params.rst b/docs/source/config_params.rst
@@ -25,7 +25,7 @@ default values.
    :keyword bool smoothspec: Write out cepstral-smoothed logspectral files, defaults to ``False``
    :keyword str transform: Which type of transform to use to calculate cepstra (legacy, dct, or htk), defaults to ``legacy``
    :keyword float alpha: Preemphasis parameter, defaults to ``0.97``
-   :keyword float samprate: Sampling rate, defaults to ``16000.0``
+   :keyword int samprate: Sampling rate, defaults to ``16000``
    :keyword int frate: Frame rate, defaults to ``100``
    :keyword float wlen: Hamming window length, defaults to ``0.025625``
    :keyword int nfft: Size of FFT, or 0 to set automatically (recommended), defaults to ``0``
diff --git a/examples/live.py b/examples/live.py
@@ -17,7 +17,7 @@ def main():
         hmm=os.path.join(MODELDIR, "en-us/en-us"),
         lm=os.path.join(MODELDIR, "en-us/en-us.lm.bin"),
         dict=os.path.join(MODELDIR, "en-us/cmudict-en-us.dict"),
-        samprate=float(ep.sample_rate),
+        samprate=ep.sample_rate,
     )
     soxcmd = f"sox -q -r {ep.sample_rate} -c 1 -b 16 -e signed-integer -d -t raw -"
     sox = subprocess.Popen(soxcmd.split(), stdout=subprocess.PIPE)
diff --git a/examples/simple.c b/examples/simple.c
@@ -39,13 +39,13 @@ main(int argc, char *argv[])
         E_FATAL("PocketSphinx decoder init failed\n");
     #define SOXCMD "sox -q -r %d -c 1 -b 16 -e signed-integer -d -t raw -"
     len = snprintf(NULL, 0, SOXCMD,
-                   (int)cmd_ln_float_r(config, "-samprate"));
+                   cmd_ln_int_r(config, "-samprate"));
     if ((soxcmd = malloc(len + 1)) == NULL)
         E_FATAL_SYSTEM("Failed to allocate string");
     if (signal(SIGINT, catch_sig) == SIG_ERR)
         E_FATAL_SYSTEM("Failed to set SIGINT handler");
     if (snprintf(soxcmd, len + 1, SOXCMD,
-                 (int)cmd_ln_float_r(config, "-samprate")) != len)
+                 cmd_ln_int_r(config, "-samprate")) != len)
         E_FATAL_SYSTEM("snprintf() failed");
     if ((sox = popen(soxcmd, "r")) == NULL)
         E_FATAL_SYSTEM("Failed to popen(%s)", soxcmd);
diff --git a/examples/simple.py b/examples/simple.py
@@ -14,7 +14,7 @@
     lm=os.path.join(MODELDIR, "en-us/en-us.lm.bin"),
     dict=os.path.join(MODELDIR, "en-us/cmudict-en-us.dict"),
 )
-sample_rate = int(decoder.config["samprate"])
+sample_rate = decoder.config["samprate"]
 soxcmd = f"sox -q -r {sample_rate} -c 1 -b 16 -e signed-integer -d -t raw -"
 with subprocess.Popen(soxcmd.split(), stdout=subprocess.PIPE) as sox:
     decoder.start_utt()
diff --git a/include/sphinxbase/fe.h b/include/sphinxbase/fe.h
@@ -84,7 +84,7 @@ extern "C" {
  * DEFAULT_SAMPLING_RATE/DEFAULT_FRAME_RATE) */
 #define DEFAULT_FRAME_SHIFT 160
 /** Default size of each frame (410 samples @ 16000Hz). */
-#define DEFAULT_WINDOW_LENGTH 0.025625 
+#define DEFAULT_WINDOW_LENGTH 0.025625
 /** Default number of FFT points. */
 #define DEFAULT_FFT_SIZE 512
 /** Default number of MFCC coefficients in output. */
@@ -132,7 +132,7 @@ extern "C" {
     "Preemphasis parameter" }, \
    \
   { "-samprate", \
-    ARG_FLOATING, \
+    ARG_INTEGER, \
     ARG_STRINGIFY(DEFAULT_SAMPLING_RATE), \
     "Sampling rate" }, \
    \
diff --git a/programs/pocketsphinx_batch.c b/programs/pocketsphinx_batch.c
@@ -472,13 +472,13 @@ process_ctl_line(ps_decoder_t *ps, cmd_ln_t *config,
         
         if (ef != -1) {
             ef = (int32)((ef - sf)
-                         * (cmd_ln_float32_r(config, "-samprate")
-                            / cmd_ln_int32_r(config, "-frate"))
-                         + (cmd_ln_float32_r(config, "-samprate")
-                            * cmd_ln_float32_r(config, "-wlen")));
+                         * ((double)cmd_ln_int_r(config, "-samprate")
+                            / cmd_ln_int_r(config, "-frate"))
+                         + ((double)cmd_ln_int_r(config, "-samprate")
+                            * cmd_ln_float_r(config, "-wlen")));
         }
         sf = (int32)(sf
-                     * (cmd_ln_float32_r(config, "-samprate")
+                     * ((double)cmd_ln_int_r(config, "-samprate")
                         / cmd_ln_int32_r(config, "-frate")));
         fseek(infh, cmd_ln_int32_r(config, "-adchdr") + sf * sizeof(int16), SEEK_SET);
         ps_decode_raw(ps, infh, ef);
diff --git a/src/fe/fe_interface.c b/src/fe/fe_interface.c
@@ -66,8 +66,8 @@ fe_parse_general_params(cmd_ln_t *config, fe_t * fe)
     int j, frate, window_samples;
 
     fe->config = cmd_ln_retain(config);
-    fe->sampling_rate = cmd_ln_float32_r(config, "-samprate");
-    frate = cmd_ln_int32_r(config, "-frate");
+    fe->sampling_rate = cmd_ln_int_r(config, "-samprate");
+    frate = cmd_ln_int_r(config, "-frate");
     if (frate > MAX_INT16 || frate > fe->sampling_rate || frate < 1) {
         E_ERROR
             ("Frame rate %d can not be bigger than sample rate %.02f\n",

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ def main():`
`17`	`17`	`hmm=os.path.join(MODELDIR, "en-us/en-us"),`
`18`	`18`	`lm=os.path.join(MODELDIR, "en-us/en-us.lm.bin"),`
`19`	`19`	`dict=os.path.join(MODELDIR, "en-us/cmudict-en-us.dict"),`
`20`		`- samprate=float(ep.sample_rate),`
	`20`	`+ samprate=ep.sample_rate,`
`21`	`21`	`)`
`22`	`22`	`soxcmd = f"sox -q -r {ep.sample_rate} -c 1 -b 16 -e signed-integer -d -t raw -"`
`23`	`23`	`sox = subprocess.Popen(soxcmd.split(), stdout=subprocess.PIPE)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`lm=os.path.join(MODELDIR, "en-us/en-us.lm.bin"),`
`15`	`15`	`dict=os.path.join(MODELDIR, "en-us/cmudict-en-us.dict"),`
`16`	`16`	`)`
`17`		`-sample_rate = int(decoder.config["samprate"])`
	`17`	`+sample_rate = decoder.config["samprate"]`
`18`	`18`	`soxcmd = f"sox -q -r {sample_rate} -c 1 -b 16 -e signed-integer -d -t raw -"`
`19`	`19`	`with subprocess.Popen(soxcmd.split(), stdout=subprocess.PIPE) as sox:`
`20`	`20`	`decoder.start_utt()`