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

[fix](trx-server): gate cw decode strictly by mode

Browse Source 
Co-authored-by: Codex <codex@openai.com>
Signed-off-by: Stanislaw Grams <stanislawgrams@gmail.com>
This commit is contained in:
Stan Grams
2026-02-09 19:50:08 +01:00
parent 3dbf590472
commit b9c58844f0
1 changed files with 68 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trx-server/src/audio.rs
+47 -13
View File
@@ -409,35 +409,45 @@ pub async fn run_cw_decoder(
sample_rate: u32, sample_rate: u32,
channels: u16, channels: u16,
mut pcm_rx: broadcast::Receiver<Vec<f32>>, mut pcm_rx: broadcast::Receiver<Vec<f32>>,
state_rx: watch::Receiver<RigState>, mut state_rx: watch::Receiver<RigState>,
decode_tx: broadcast::Sender<DecodedMessage>, decode_tx: broadcast::Sender<DecodedMessage>,
) { ) {
info!("CW decoder started ({}Hz, {} ch)", sample_rate, channels); info!("CW decoder started ({}Hz, {} ch)", sample_rate, channels);
let mut decoder = decode::cw::CwDecoder::new(sample_rate); let mut decoder = decode::cw::CwDecoder::new(sample_rate);
let mut was_active = false; let mut was_active = false;
let mut last_reset_seq: u64 = 0; let mut last_reset_seq: u64 = 0;
let mut active = matches!(state_rx.borrow().status.mode, RigMode::CW | RigMode::CWR);
loop { loop {
match pcm_rx.recv().await { if !active {
Ok(frame) => { match state_rx.changed().await {
let state = state_rx.borrow().clone(); Ok(()) => {
let active = true; let state = state_rx.borrow();
active = matches!(state.status.mode, RigMode::CW | RigMode::CWR);
// Check for reset request if active {
pcm_rx = pcm_rx.resubscribe();
}
if state.cw_decode_reset_seq != last_reset_seq { if state.cw_decode_reset_seq != last_reset_seq {
last_reset_seq = state.cw_decode_reset_seq; last_reset_seq = state.cw_decode_reset_seq;
decoder.reset(); decoder.reset();
info!("CW decoder reset (seq={})", last_reset_seq); info!("CW decoder reset (seq={})", last_reset_seq);
} }
}
if !active { Err(_) => break,
if was_active {
decoder.reset();
was_active = false;
} }
continue; continue;
} }
was_active = true;
tokio::select! {
recv = pcm_rx.recv() => {
match recv {
Ok(frame) => {
let state = state_rx.borrow();
if state.cw_decode_reset_seq != last_reset_seq {
last_reset_seq = state.cw_decode_reset_seq;
decoder.reset();
info!("CW decoder reset (seq={})", last_reset_seq);
}
// Downmix to mono if stereo // Downmix to mono if stereo
let mono = if channels > 1 { let mono = if channels > 1 {
@@ -451,6 +461,7 @@ pub async fn run_cw_decoder(
frame frame
}; };
was_active = true;
for evt in decoder.process_samples(&mono) { for evt in decoder.process_samples(&mono) {
let _ = decode_tx.send(DecodedMessage::Cw(evt)); let _ = decode_tx.send(DecodedMessage::Cw(evt));
} }
@@ -461,6 +472,29 @@ pub async fn run_cw_decoder(
Err(broadcast::error::RecvError::Closed) => break, Err(broadcast::error::RecvError::Closed) => break,
} }
} }
changed = state_rx.changed() => {
match changed {
Ok(()) => {
let state = state_rx.borrow();
active = matches!(state.status.mode, RigMode::CW | RigMode::CWR);
if state.cw_decode_reset_seq != last_reset_seq {
last_reset_seq = state.cw_decode_reset_seq;
decoder.reset();
info!("CW decoder reset (seq={})", last_reset_seq);
}
if !active && was_active {
decoder.reset();
was_active = false;
}
if active {
pcm_rx = pcm_rx.resubscribe();
}
}
Err(_) => break,
}
}
}
}
} }
/// Run the audio TCP listener, accepting client connections. /// Run the audio TCP listener, accepting client connections.