Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

resampler on test_rx.py is doing something sensible

Browse source
This commit is contained in:
drowe67 2021-12-16 12:10:03 +10:30 committed by David Rowe
parent 84f5cd315e
commit 5b9ca6d463
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
test/001_highsnr_stdio_audio/test_rx.py
View file

@ -47,12 +47,12 @@ DEBUGGING_MODE = args.DEBUGGING_MODE
TIMEOUT = args.TIMEOUT
# AUDIO PARAMETERS
AUDIO_FRAMES_PER_BUFFER = 2048 # seems to be best if >=1024
AUDIO_FRAMES_PER_BUFFER = 2400 # seems to be best if >=1024
MODEM_SAMPLE_RATE = codec2.api.FREEDV_FS_8000
AUDIO_SAMPLE_RATE_RX = 48000
# make sure our resampler will work
assert (AUDIO_SAMPLE_RATE_RX / MODEM_SAMPLE_RATE) == api.FDMDV_OS_48
assert (AUDIO_SAMPLE_RATE_RX / MODEM_SAMPLE_RATE) == codec2.api.FDMDV_OS_48
# check if we want to use an audio device then do an pyaudio init
if AUDIO_INPUT_DEVICE != -1:
@ -104,6 +104,8 @@ rx_errors = 0
timeout = time.time() + TIMEOUT
receive = True
audio_buffer = codec2.audio_buffer(codec2.api.freedv_get_n_max_modem_samples(freedv))
AUDIO_FRAMES_PER_BUFFER_8K = int(AUDIO_FRAMES_PER_BUFFER/codec2.api.FDMDV_OS_48)
resampler = codec2.resampler(AUDIO_FRAMES_PER_BUFFER,AUDIO_FRAMES_PER_BUFFER_8K)
# initial number of samples we need
nin = codec2.api.freedv_nin(freedv)
@ -115,13 +117,11 @@ while receive and time.time() < timeout:
else:
data_in48k = sys.stdin.buffer.read(AUDIO_FRAMES_PER_BUFFER*2)
# resample to 8 kHz
data_in8k = resampler.resample(data_in48k)
# insert samples in buffer
x = np.frombuffer(data_in8k, dtype=np.int16)
if len(x) == 0:
receive = False
x = np.frombuffer(data_in48k, dtype=np.int16)
if len(x) != AUDIO_FRAMES_PER_BUFFER:
break
x = resampler.resample48_to_8(x)
audio_buffer.push(x)
# when we have enough samples call FreeDV Rx

12
test/codec2.py
View file

@ -137,12 +137,12 @@ class resampler:
def __init__(self, n48, n8):
print("create 48<->8 kHz resampler with buffers of %d at 48 kHz and %d at 8 kHz" % (n48, n8))
assert (n48 / n8) == api.FDMDV_OS_48
self.n8 = n8
self.n48 = n48
self.in8 = np.zeros(self.MEM8 + n8, dtype=np.int16)
self.out48 = np.zeros(n48, dtype=np.int16)
self.in48 = np.zeros(self.MEM48 + n48, dtype=np.int16)
self.out8 = np.zeros(n8, dtype=np.int16)
self.n8 = int(n8)
self.n48 = int(n48)
self.in8 = np.zeros(self.MEM8 + self.n8, dtype=np.int16)
self.out48 = np.zeros(self.n48, dtype=np.int16)
self.in48 = np.zeros(self.MEM48 + self.n48, dtype=np.int16)
self.out8 = np.zeros(self.n8, dtype=np.int16)
def resample48_to_8(self,in48):
assert in48.dtype == np.int16
assert len(in48) == self.n48