sjg/trx-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix](trx-server): preserve decoder history timestamps

Browse Source 
Co-authored-by: OpenAI Codex <codex@openai.com>
Signed-off-by: Stan Grams <sjg@haxx.space>
This commit is contained in:
Stan Grams
2026-03-06 16:08:34 +01:00
parent e3378d5f49
commit 69b2aee753
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trx-server/src/audio.rs
+24 -6
View File
@@ -173,7 +173,10 @@ impl DecoderHistories {
} }
} }
pub fn record_ais_message(&self, msg: AisMessage) { pub fn record_ais_message(&self, mut msg: AisMessage) {
if msg.ts_ms.is_none() {
msg.ts_ms = Some(current_timestamp_ms());
}
let mut h = self.ais.lock().expect("ais history mutex poisoned"); let mut h = self.ais.lock().expect("ais history mutex poisoned");
h.push_back((Instant::now(), msg)); h.push_back((Instant::now(), msg));
Self::prune_ais(&mut h); Self::prune_ais(&mut h);
@@ -198,7 +201,10 @@ impl DecoderHistories {
} }
} }
pub fn record_vdes_message(&self, msg: VdesMessage) { pub fn record_vdes_message(&self, mut msg: VdesMessage) {
if msg.ts_ms.is_none() {
msg.ts_ms = Some(current_timestamp_ms());
}
let mut h = self.vdes.lock().expect("vdes history mutex poisoned"); let mut h = self.vdes.lock().expect("vdes history mutex poisoned");
h.push_back((Instant::now(), msg)); h.push_back((Instant::now(), msg));
Self::prune_vdes(&mut h); Self::prune_vdes(&mut h);
@@ -223,10 +229,13 @@ impl DecoderHistories {
} }
} }
pub fn record_aprs_packet(&self, pkt: AprsPacket) { pub fn record_aprs_packet(&self, mut pkt: AprsPacket) {
if !pkt.crc_ok { if !pkt.crc_ok {
return; return;
} }
if pkt.ts_ms.is_none() {
pkt.ts_ms = Some(current_timestamp_ms());
}
let mut h = self.aprs.lock().expect("aprs history mutex poisoned"); let mut h = self.aprs.lock().expect("aprs history mutex poisoned");
h.push_back((Instant::now(), pkt)); h.push_back((Instant::now(), pkt));
Self::prune_aprs(&mut h); Self::prune_aprs(&mut h);
@@ -946,7 +955,10 @@ pub async fn run_ais_decoder(
match recv { match recv {
Ok(frame) => { Ok(frame) => {
was_active = true; was_active = true;
for msg in decoder_a.process_samples(&downmix_if_needed(frame, channels), "A") { for mut msg in decoder_a.process_samples(&downmix_if_needed(frame, channels), "A") {
if msg.ts_ms.is_none() {
msg.ts_ms = Some(current_timestamp_ms());
}
histories.record_ais_message(msg.clone()); histories.record_ais_message(msg.clone());
let _ = decode_tx.send(DecodedMessage::Ais(msg)); let _ = decode_tx.send(DecodedMessage::Ais(msg));
} }
@@ -961,7 +973,10 @@ pub async fn run_ais_decoder(
match recv { match recv {
Ok(frame) => { Ok(frame) => {
was_active = true; was_active = true;
for msg in decoder_b.process_samples(&downmix_if_needed(frame, channels), "B") { for mut msg in decoder_b.process_samples(&downmix_if_needed(frame, channels), "B") {
if msg.ts_ms.is_none() {
msg.ts_ms = Some(current_timestamp_ms());
}
histories.record_ais_message(msg.clone()); histories.record_ais_message(msg.clone());
let _ = decode_tx.send(DecodedMessage::Ais(msg)); let _ = decode_tx.send(DecodedMessage::Ais(msg));
} }
@@ -1030,7 +1045,10 @@ pub async fn run_vdes_decoder(
match recv { match recv {
Ok(block) => { Ok(block) => {
was_active = true; was_active = true;
for msg in decoder.process_samples(&block, "Main") { for mut msg in decoder.process_samples(&block, "Main") {
if msg.ts_ms.is_none() {
msg.ts_ms = Some(current_timestamp_ms());
}
histories.record_vdes_message(msg.clone()); histories.record_vdes_message(msg.clone());
let _ = decode_tx.send(DecodedMessage::Vdes(msg)); let _ = decode_tx.send(DecodedMessage::Vdes(msg));
} }