From c06e842eb7333c803e10548691018d70f7bc9b98 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Sun, 22 Feb 2015 16:24:24 +0200 Subject: [PATCH] config: use lower sample rate for slowest bitrates this will use much less CPU. --- amodem/config.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/amodem/config.py b/amodem/config.py index 0487e2b..d9812f1 100644 --- a/amodem/config.py +++ b/amodem/config.py @@ -51,24 +51,24 @@ class Configuration(object): # MODEM configurations for various bitrates [kbps] bitrates = { - 1: Configuration(F0=8e3, Npoints=2, Nfreq=1), - 2: Configuration(F0=8e3, Npoints=4, Nfreq=1), - 4: Configuration(F0=8e3, Npoints=16, Nfreq=1), - 8: Configuration(F0=8e3, Npoints=16, Nfreq=2), - 12: Configuration(F0=6e3, Npoints=16, Nfreq=3), - 16: Configuration(F0=6e3, Npoints=16, Nfreq=4), - 18: Configuration(F0=5e3, Npoints=16, Nfreq=5), - 24: Configuration(F0=5e3, Npoints=16, Nfreq=6), - 28: Configuration(F0=4e3, Npoints=16, Nfreq=7), - 32: Configuration(F0=3e3, Npoints=16, Nfreq=8), - 36: Configuration(F0=4e3, Npoints=64, Nfreq=6), - 42: Configuration(F0=4e3, Npoints=64, Nfreq=7), - 48: Configuration(F0=3e3, Npoints=64, Nfreq=8), - 54: Configuration(F0=3e3, Npoints=64, Nfreq=9), - 60: Configuration(F0=2e3, Npoints=64, Nfreq=10), - 64: Configuration(F0=3e3, Npoints=256, Nfreq=8), - 72: Configuration(F0=2e3, Npoints=256, Nfreq=9), - 80: Configuration(F0=2e3, Npoints=256, Nfreq=10), + 1: Configuration(F0=2e3, Npoints=2, Nfreq=1, Fs=8e3), + 2: Configuration(F0=2e3, Npoints=4, Nfreq=1, Fs=8e3), + 4: Configuration(F0=2e3, Npoints=16, Nfreq=1, Fs=8e3), + 8: Configuration(F0=2e3, Npoints=16, Nfreq=2, Fs=8e3), + 12: Configuration(F0=3e3, Npoints=16, Nfreq=3, Fs=16e3), + 16: Configuration(F0=3e3, Npoints=16, Nfreq=4, Fs=16e3), + 18: Configuration(F0=2e3, Npoints=16, Nfreq=5, Fs=16e3), + 24: Configuration(F0=2e3, Npoints=16, Nfreq=6, Fs=16e3), + 28: Configuration(F0=4e3, Npoints=16, Nfreq=7, Fs=32e3), + 32: Configuration(F0=3e3, Npoints=16, Nfreq=8, Fs=32e3), + 36: Configuration(F0=4e3, Npoints=64, Nfreq=6, Fs=32e3), + 42: Configuration(F0=4e3, Npoints=64, Nfreq=7, Fs=32e3), + 48: Configuration(F0=3e3, Npoints=64, Nfreq=8, Fs=32e3), + 54: Configuration(F0=3e3, Npoints=64, Nfreq=9, Fs=32e3), + 60: Configuration(F0=2e3, Npoints=64, Nfreq=10, Fs=32e3), + 64: Configuration(F0=3e3, Npoints=256, Nfreq=8, Fs=32e3), + 72: Configuration(F0=2e3, Npoints=256, Nfreq=9, Fs=32e3), + 80: Configuration(F0=2e3, Npoints=256, Nfreq=10, Fs=32e3), }