joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ft8 audio sample rate issues with sox

Browse Source
This commit is contained in:
Jakob Ketterl 2019-07-10 22:31:06 +02:00
parent 32c76beaa2
commit 8a8768ed1d
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
csdr.py
View File

@ -167,9 +167,15 @@ class dsp(object):
chain += last_decimation_block chain += last_decimation_block
chain += [ chain += [
"csdr agc_ff", "csdr agc_ff",
"csdr limit_ff", "csdr limit_ff"
"csdr convert_f_s16"
] ]
# fixed sample rate necessary for the wsjt-x tools. fix with sox...
if self.get_secondary_demodulator() == "ft8" and self.get_audio_rate() != self.get_output_rate():
chain += [
"sox -t raw -r {audio_rate} -e floating-point -b 32 -c 1 --buffer 32 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - "
]
else:
chain += ["csdr convert_f_s16"]
if self.audio_compression=="adpcm": if self.audio_compression=="adpcm":
chain += ["csdr encode_ima_adpcm_i16_u8"] chain += ["csdr encode_ima_adpcm_i16_u8"]
@ -472,7 +478,8 @@ class dsp(object):
flowcontrol=int(self.samp_rate*2), start_bufsize=self.base_bufsize*self.decimation, nc_port=self.nc_port, flowcontrol=int(self.samp_rate*2), start_bufsize=self.base_bufsize*self.decimation, nc_port=self.nc_port,
squelch_pipe=self.squelch_pipe, smeter_pipe=self.smeter_pipe, meta_pipe=self.meta_pipe, iqtee_pipe=self.iqtee_pipe, iqtee2_pipe=self.iqtee2_pipe, squelch_pipe=self.squelch_pipe, smeter_pipe=self.smeter_pipe, meta_pipe=self.meta_pipe, iqtee_pipe=self.iqtee_pipe, iqtee2_pipe=self.iqtee2_pipe,
output_rate = self.get_output_rate(), smeter_report_every = int(self.if_samp_rate()/6000), output_rate = self.get_output_rate(), smeter_report_every = int(self.if_samp_rate()/6000),
unvoiced_quality = self.get_unvoiced_quality(), dmr_control_pipe = self.dmr_control_pipe) unvoiced_quality = self.get_unvoiced_quality(), dmr_control_pipe = self.dmr_control_pipe,
audio_rate = self.get_audio_rate())
logger.debug("[openwebrx-dsp-plugin:csdr] Command = %s", command) logger.debug("[openwebrx-dsp-plugin:csdr] Command = %s", command)
my_env=os.environ.copy() my_env=os.environ.copy()

2
owrx/feature.py
View File

@ -23,7 +23,7 @@ class FeatureDetector(object):
"airspy": [ "airspy_rx" ], "airspy": [ "airspy_rx" ],
"digital_voice_digiham": [ "digiham", "sox" ], "digital_voice_digiham": [ "digiham", "sox" ],
"digital_voice_dsd": [ "dsd", "sox", "digiham" ], "digital_voice_dsd": [ "dsd", "sox", "digiham" ],
"wsjt-x": [ "wsjtx" ] "wsjt-x": [ "wsjtx", "sox" ]
} }
def feature_availability(self): def feature_availability(self):