From ad396fa970e85a00a45d75c8b40db6f100a40cc4 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Tue, 20 Jul 2021 13:33:26 +0200 Subject: [PATCH] remove "unvoiced quality" setting --- config_webrx.py | 3 --- csdr/__init__.py | 9 --------- owrx/config/defaults.py | 1 - owrx/controllers/settings/decoding.py | 6 ------ owrx/dsp.py | 2 -- 5 files changed, 21 deletions(-) diff --git a/config_webrx.py b/config_webrx.py index 4d61fbd..f06f50e 100644 --- a/config_webrx.py +++ b/config_webrx.py @@ -104,9 +104,6 @@ version = 7 #digimodes_fft_size = 2048 -# determines the quality, and thus the cpu usage, for the ambe codec used by digital voice modes -# if you're running on a Raspi (up to 3B+) you'll want to leave this on 1 -#digital_voice_unvoiced_quality = 1 # enables lookup of DMR ids using the radioid api #digital_voice_dmr_id_lookup = True diff --git a/csdr/__init__.py b/csdr/__init__.py index 4eed983..32e2b09 100644 --- a/csdr/__init__.py +++ b/csdr/__init__.py @@ -85,7 +85,6 @@ class Dsp(DirewolfConfigSubscriber): self.pipes = {} self.secondary_pipe_names = {"secondary_shift_pipe": Pipe.WRITE} self.secondary_offset_freq = 1000 - self.unvoiced_quality = 1 self.codecserver = None self.modification_lock = threading.Lock() self.output = output @@ -641,13 +640,6 @@ class Dsp(DirewolfConfigSubscriber): if self.running: self.pipes["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch))) - def set_unvoiced_quality(self, q): - self.unvoiced_quality = q - self.restart() - - def get_unvoiced_quality(self): - return self.unvoiced_quality - def set_codecserver(self, s): if self.codecserver == s: return @@ -769,7 +761,6 @@ class Dsp(DirewolfConfigSubscriber): nc_port=self.nc_port, output_rate=self.get_output_rate(), smeter_report_every=int(self.if_samp_rate() / 6000), - unvoiced_quality=self.get_unvoiced_quality(), codecserver_arg=self.get_codecserver_arg(), audio_rate=self.get_audio_rate(), wfm_deemphasis_tau=self.wfm_deemphasis_tau, diff --git a/owrx/config/defaults.py b/owrx/config/defaults.py index de81af9..f03dded 100644 --- a/owrx/config/defaults.py +++ b/owrx/config/defaults.py @@ -18,7 +18,6 @@ defaultConfig = PropertyLayer( fft_compression="adpcm", wfm_deemphasis_tau=50e-6, digimodes_fft_size=2048, - digital_voice_unvoiced_quality=1, digital_voice_dmr_id_lookup=True, digital_voice_nxdn_id_lookup=True, sdrs=PropertyLayer( diff --git a/owrx/controllers/settings/decoding.py b/owrx/controllers/settings/decoding.py index a21cd06..fb0e542 100644 --- a/owrx/controllers/settings/decoding.py +++ b/owrx/controllers/settings/decoding.py @@ -35,12 +35,6 @@ class DecodingSettingsController(SettingsFormController): ), Section( "Digital voice", - NumberInput( - "digital_voice_unvoiced_quality", - "Quality of unvoiced sounds in synthesized voice", - infotext="Determines the quality, and thus the cpu usage, for the ambe codec used by digital voice" - + " modes.
If you're running on a Raspberry Pi (up to 3B+) you should leave this set at 1", - ), TextInput( "digital_voice_codecserver", "Codecserver address", diff --git a/owrx/dsp.py b/owrx/dsp.py index 6df6544..b6a569f 100644 --- a/owrx/dsp.py +++ b/owrx/dsp.py @@ -67,7 +67,6 @@ class DspManager(Output, SdrSourceEventClient): "fft_compression", "digimodes_fft_size", "samp_rate", - "digital_voice_unvoiced_quality", "center_freq", "start_mod", "start_freq", @@ -128,7 +127,6 @@ class DspManager(Output, SdrSourceEventClient): self.props.wireProperty("low_cut", set_low_cut), self.props.wireProperty("high_cut", set_high_cut), self.props.wireProperty("mod", self.dsp.set_demodulator), - self.props.wireProperty("digital_voice_unvoiced_quality", self.dsp.set_unvoiced_quality), self.props.wireProperty("dmr_filter", self.dsp.set_dmr_filter), self.props.wireProperty("wfm_deemphasis_tau", self.dsp.set_wfm_deemphasis_tau), self.props.wireProperty("digital_voice_codecserver", self.dsp.set_codecserver),