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

use new adpcm methods in csdr++

Browse Source
This commit is contained in:
Jakob Ketterl 2021-07-05 17:20:57 +02:00
parent 59de2628c3
commit fc5fb9166e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
csdr/__init__.py
View File

@ -116,7 +116,7 @@ class Dsp(DirewolfConfigSubscriber):
"csdr++ fftswap {fft_size}", "csdr++ fftswap {fft_size}",
] ]
if self.fft_compression == "adpcm": if self.fft_compression == "adpcm":
chain += ["csdr compress_fft_adpcm_f_u8 {fft_size}"] chain += ["csdr++ fftadpcm {fft_size}"]
return chain return chain
chain += ["csdr++ shift --fifo {shift_pipe}"] chain += ["csdr++ shift --fifo {shift_pipe}"]
if self.decimation > 1: if self.decimation > 1:
@ -239,7 +239,7 @@ class Dsp(DirewolfConfigSubscriber):
chain += ["csdr++ convert -i float -o s16"] chain += ["csdr++ convert -i float -o s16"]
if self.audio_compression == "adpcm": if self.audio_compression == "adpcm":
chain += ["csdr encode_ima_adpcm_i16_u8"] chain += ["csdr++ adpcm -e"]
return chain return chain
def secondary_chain(self, which): def secondary_chain(self, which):
@ -253,7 +253,7 @@ class Dsp(DirewolfConfigSubscriber):
"csdr++ fftswap {secondary_fft_input_size}", "csdr++ fftswap {secondary_fft_input_size}",
] ]
if self.fft_compression == "adpcm": if self.fft_compression == "adpcm":
chain += ["csdr compress_fft_adpcm_f_u8 {secondary_fft_size}"] chain += ["csdr++ fftadpcm {secondary_fft_size}"]
return chain return chain
elif which == "bpsk31" or which == "bpsk63": elif which == "bpsk31" or which == "bpsk63":
return chain + [ return chain + [