mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
logging in own thread
and also a small cleanup
This commit is contained in:
parent
8a0caf7f43
commit
3c01ff1301
2 changed files with 25 additions and 19 deletions
|
@ -53,6 +53,8 @@ class Test():
|
||||||
self.MODEM_SAMPLE_RATE = codec2.api.FREEDV_FS_8000
|
self.MODEM_SAMPLE_RATE = codec2.api.FREEDV_FS_8000
|
||||||
self.AUDIO_SAMPLE_RATE_RX = 48000
|
self.AUDIO_SAMPLE_RATE_RX = 48000
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# make sure our resampler will work
|
# make sure our resampler will work
|
||||||
assert (self.AUDIO_SAMPLE_RATE_RX / self.MODEM_SAMPLE_RATE) == codec2.api.FDMDV_OS_48
|
assert (self.AUDIO_SAMPLE_RATE_RX / self.MODEM_SAMPLE_RATE) == codec2.api.FDMDV_OS_48
|
||||||
|
|
||||||
|
@ -138,6 +140,10 @@ class Test():
|
||||||
self.datac3_nin = codec2.api.freedv_nin(self.datac3_freedv)
|
self.datac3_nin = codec2.api.freedv_nin(self.datac3_freedv)
|
||||||
|
|
||||||
|
|
||||||
|
self.LOGGER_THREAD = threading.Thread(target=self.print_stats, name="LOGGER_THREAD")
|
||||||
|
self.LOGGER_THREAD.start()
|
||||||
|
|
||||||
|
|
||||||
def callback(self, data_in48k, frame_count, time_info, status):
|
def callback(self, data_in48k, frame_count, time_info, status):
|
||||||
|
|
||||||
x = np.frombuffer(data_in48k, dtype=np.int16)
|
x = np.frombuffer(data_in48k, dtype=np.int16)
|
||||||
|
@ -161,7 +167,6 @@ class Test():
|
||||||
if self.rx_frames_datac0 == self.N_FRAMES_PER_BURST:
|
if self.rx_frames_datac0 == self.N_FRAMES_PER_BURST:
|
||||||
self.rx_frames_datac0 = 0
|
self.rx_frames_datac0 = 0
|
||||||
self.rx_bursts_datac0 = self.rx_bursts_datac0 + 1
|
self.rx_bursts_datac0 = self.rx_bursts_datac0 + 1
|
||||||
self.print_stats()
|
|
||||||
|
|
||||||
|
|
||||||
while self.datac1_buffer.nbuffer >= self.datac1_nin:
|
while self.datac1_buffer.nbuffer >= self.datac1_nin:
|
||||||
|
@ -176,7 +181,7 @@ class Test():
|
||||||
if self.rx_frames_datac1 == self.N_FRAMES_PER_BURST:
|
if self.rx_frames_datac1 == self.N_FRAMES_PER_BURST:
|
||||||
self.rx_frames_datac1 = 0
|
self.rx_frames_datac1 = 0
|
||||||
self.rx_bursts_datac1 = self.rx_bursts_datac1 + 1
|
self.rx_bursts_datac1 = self.rx_bursts_datac1 + 1
|
||||||
self.print_stats()
|
|
||||||
|
|
||||||
while self.datac3_buffer.nbuffer >= self.datac3_nin:
|
while self.datac3_buffer.nbuffer >= self.datac3_nin:
|
||||||
# demodulate audio
|
# demodulate audio
|
||||||
|
@ -190,15 +195,16 @@ class Test():
|
||||||
if self.rx_frames_datac3 == self.N_FRAMES_PER_BURST:
|
if self.rx_frames_datac3 == self.N_FRAMES_PER_BURST:
|
||||||
self.rx_frames_datac3 = 0
|
self.rx_frames_datac3 = 0
|
||||||
self.rx_bursts_datac3 = self.rx_bursts_datac3 + 1
|
self.rx_bursts_datac3 = self.rx_bursts_datac3 + 1
|
||||||
self.print_stats()
|
|
||||||
|
|
||||||
if self.rx_bursts_datac0 == self.N_BURSTS and self.rx_bursts_datac1 == self.N_BURSTS and self.rx_bursts_datac3 == self.N_BURSTS:
|
|
||||||
|
if (self.rx_bursts_datac0 and self.rx_bursts_datac1 and self.rx_bursts_datac3) == self.N_BURSTS:
|
||||||
self.receive = False
|
self.receive = False
|
||||||
|
|
||||||
|
|
||||||
return (None, pyaudio.paContinue)
|
return (None, pyaudio.paContinue)
|
||||||
|
|
||||||
def print_stats(self):
|
def print_stats(self):
|
||||||
|
while self.receive:
|
||||||
|
time.sleep(0.01)
|
||||||
if self.DEBUGGING_MODE:
|
if self.DEBUGGING_MODE:
|
||||||
self.datac0_rxstatus = codec2.api.freedv_get_rx_status(self.datac0_freedv)
|
self.datac0_rxstatus = codec2.api.freedv_get_rx_status(self.datac0_freedv)
|
||||||
self.datac0_rxstatus = codec2.api.rx_sync_flags_to_text[self.datac0_rxstatus]
|
self.datac0_rxstatus = codec2.api.rx_sync_flags_to_text[self.datac0_rxstatus]
|
||||||
|
|
|
@ -221,7 +221,7 @@ class Test():
|
||||||
self.rx_bursts_datac3 = self.rx_bursts_datac3 + 1
|
self.rx_bursts_datac3 = self.rx_bursts_datac3 + 1
|
||||||
self.print_stats()
|
self.print_stats()
|
||||||
|
|
||||||
if self.rx_bursts_datac0 == self.N_BURSTS and self.rx_bursts_datac1 == self.N_BURSTS and self.rx_bursts_datac3 == self.N_BURSTS:
|
if (self.rx_bursts_datac0 and self.rx_bursts_datac1 and self.rx_bursts_datac3) == self.N_BURSTS:
|
||||||
self.receive = False
|
self.receive = False
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue