[fix](trx-frontend): account for WFM interference in auto bandwidth

src/decoders/trx-wefax/src/image.rs

@@ -274,7 +274,8 @@ mod tests {
 
         // Pseudo-random noise vs gradient — correlation should be low.
         let noise: Vec<u8> = (0..256)
-            .map(|i| ((i * 1103515245 + 12345) as u32 >> 8 & 0xff) as u8)
+            .map(|i| (i as u32).wrapping_mul(1_103_515_245).wrapping_add(12_345))
+            .map(|value| ((value >> 8) & 0xff) as u8)
             .collect();
         let r = asm.correlation_with_last(&noise).expect("r");
         assert!(

src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js

@@ -840,6 +840,8 @@ let jogMult = loadSetting("jogMult", 1);      // divisor: 1, 10, 100
 let jogStep = Math.max(Math.round(jogUnit / jogMult), 1);
 let minFreqStepHz = 1;
 let lastModeName = "";
+let lastWfmCci = 0;
+let lastWfmAci = 0;
 const VFO_COLORS = ["var(--accent-green)", "var(--accent-yellow)"];
 function vfoColor(idx) {
   if (idx < VFO_COLORS.length) return VFO_COLORS[idx];
@@ -3293,8 +3295,14 @@ function render(update) {
       wfmStFlagEl.classList.toggle("wfm-st-flag-stereo", detected);
       wfmStFlagEl.classList.toggle("wfm-st-flag-mono", !detected);
     }
-    if (typeof update.filter.wfm_cci === "number") updateIntfBar(wfmCciFillEl, wfmCciValEl, update.filter.wfm_cci);
-    if (typeof update.filter.wfm_aci === "number") updateIntfBar(wfmAciFillEl, wfmAciValEl, update.filter.wfm_aci);
+    if (typeof update.filter.wfm_cci === "number") {
+      lastWfmCci = Math.max(0, Math.min(100, update.filter.wfm_cci));
+      updateIntfBar(wfmCciFillEl, wfmCciValEl, lastWfmCci);
+    }
+    if (typeof update.filter.wfm_aci === "number") {
+      lastWfmAci = Math.max(0, Math.min(100, update.filter.wfm_aci));
+      updateIntfBar(wfmAciFillEl, wfmAciValEl, lastWfmAci);
+    }
     if (samStereoWidthEl && typeof update.filter.sam_stereo_width === "number") {
       samStereoWidthEl.value = String(Math.round(update.filter.sam_stereo_width * 100));
     }
@@ -4268,7 +4276,7 @@ const MODE_BW_DEFAULTS = {
   FM:     [12_500, 2_500, 25_000, 500],
   AIS:    [25_000, 12_500, 50_000, 500],
   VDES:   [100_000, 25_000, 200_000, 1_000],
-  WFM:    [180_000, 50_000,300_000,5_000],
+  WFM:    [180_000, 60_000,300_000,5_000],
   DIG:    [3_000,  300,   6_000,  100],
   PKT:    [25_000, 300,  50_000,  500],
 };
@@ -4348,64 +4356,110 @@ async function applyBandwidthFromInput() {
   } catch (_) {}
 }
 
-function estimateBandwidthAroundPeak(data, centerHz) {
+function estimateOccupiedBandwidth(data, centerHz, interference = {}) {
   if (!data || !isBinsArray(data.bins) || data.bins.length < 3 || !Number.isFinite(centerHz)) {
     return null;
   }
 
   const bins = data.bins;
   const maxIdx = bins.length - 1;
+  const hzPerBin = data.sample_rate / maxIdx;
   const fullLoHz = data.center_hz - data.sample_rate / 2;
   const centerIdx = Math.max(
     1,
     Math.min(maxIdx - 1, Math.round(((centerHz - fullLoHz) / data.sample_rate) * maxIdx)),
   );
-  const searchRadius = Math.max(6, Math.min(120, Math.round(maxIdx * 0.03)));
-  const searchLo = Math.max(1, centerIdx - searchRadius);
-  const searchHi = Math.min(maxIdx - 1, centerIdx + searchRadius);
-
-  let peakIdx = centerIdx;
-  for (let i = searchLo; i <= searchHi; i++) {
-    if (bins[i] > bins[peakIdx]) peakIdx = i;
-  }
+  const mode = (modeEl ? modeEl.value : "USB").toUpperCase();
+  const [defaultBw, minBw, maxBw, stepBw] = mwDefaultsForMode(mode);
+  const oneSided = mode === "USB" || mode === "DIG" || mode === "CW"
+    ? 1
+    : mode === "LSB" || mode === "CWR" ? -1 : 0;
+  const isWfm = mode === "WFM";
 
+  // Reduce single-bin peaks and holes before finding occupied-channel edges.
+  // WFM needs a wider smoothing window because its energy is noise-like and
+  // spread across the entire channel rather than concentrated at a carrier.
+  const smoothRadius = isWfm ? 3 : 1;
+  const smoothed = bins.map((_, i) => {
+    let sum = 0;
+    let count = 0;
+    for (let j = Math.max(0, i - smoothRadius); j <= Math.min(maxIdx, i + smoothRadius); j++) {
+      sum += bins[j];
+      count += 1;
+    }
+    return sum / count;
+  });
   const sorted = [...bins].sort((a, b) => a - b);
   const noise = sorted[Math.floor(sorted.length * 0.2)];
-  const peak = bins[peakIdx];
-  const threshold = Math.max(noise + 4, peak - Math.max(8, (peak - noise) * 0.35));
+  const maxSpanBins = Math.max(2, Math.ceil(maxBw / hzPerBin));
+  const searchHalfBins = oneSided === 0 ? Math.ceil(maxSpanBins / 2) : maxSpanBins;
+  const searchLo = Math.max(1, centerIdx - (oneSided > 0 ? 2 : searchHalfBins));
+  const searchHi = Math.min(maxIdx - 1, centerIdx + (oneSided < 0 ? 2 : searchHalfBins));
+  let peak = -Infinity;
+  for (let i = searchLo; i <= searchHi; i++) peak = Math.max(peak, smoothed[i]);
+  const snr = peak - noise;
+  if (!Number.isFinite(snr) || snr < (isWfm ? 5 : 4)) return isWfm ? minBw : defaultBw;
 
-  let left = peakIdx;
-  let right = peakIdx;
-  let belowCount = 0;
-  for (let i = peakIdx; i > 1; i--) {
-    if (bins[i] < threshold) belowCount += 1;
-    else belowCount = 0;
-    if (belowCount >= 2) break;
-    left = i;
+  // A threshold relative to the noise floor finds occupied bandwidth much
+  // more reliably than one relative to the peak.  The latter fails for WFM,
+  // whose multiplex spectrum has peaks, notches, and no narrow centre carrier.
+  const threshold = noise + Math.max(3, Math.min(isWfm ? 6 : 10, snr * (isWfm ? 0.18 : 0.28)));
+  const allowedGap = Math.max(isWfm ? 4 : 2, Math.ceil((isWfm ? 12_000 : stepBw) / hzPerBin));
+
+  function occupiedExtent(direction, limitBins) {
+    let lastOccupied = centerIdx;
+    let gap = 0;
+    for (let n = 0; n <= limitBins; n++) {
+      const i = centerIdx + direction * n;
+      if (i <= 0 || i >= maxIdx) break;
+      if (smoothed[i] >= threshold) {
+        lastOccupied = i;
+        gap = 0;
+      } else if (++gap > allowedGap) {
+        break;
+      }
+    }
+    return Math.abs(lastOccupied - centerIdx) * hzPerBin;
   }
 
-  belowCount = 0;
-  for (let i = peakIdx; i < maxIdx - 1; i++) {
-    if (bins[i] < threshold) belowCount += 1;
-    else belowCount = 0;
-    if (belowCount >= 2) break;
-    right = i;
+  let rawBw;
+  if (oneSided !== 0) {
+    rawBw = occupiedExtent(oneSided, maxSpanBins);
+  } else {
+    const leftHz = occupiedExtent(-1, searchHalfBins);
+    const rightHz = occupiedExtent(1, searchHalfBins);
+    // A symmetric RF filter must contain the larger of the two sidebands.
+    rawBw = 2 * Math.max(leftHz, rightHz);
   }
 
-  const shoulderPad = Math.max(1, Math.round((right - left) * 0.08));
-  left = Math.max(0, left - shoulderPad);
-  right = Math.min(maxIdx, right + shoulderPad);
-
-  const hzPerBin = data.sample_rate / maxIdx;
-  const rawBw = Math.max(hzPerBin, (right - left) * hzPerBin);
-  const [, minBw, maxBw, stepBw] = mwDefaultsForMode(modeEl ? modeEl.value : "USB");
+  // Add a transition-band margin.  Weak WFM deliberately falls back to the
+  // 60 kHz mode floor above: a narrower filter trades stereo/RDS content for
+  // a useful improvement in intelligibility when the signal is very poor.
+  rawBw *= isWfm ? 1.08 : 1.12;
+  if (isWfm) {
+    const aci = Math.max(0, Math.min(100, Number(interference.aci) || 0)) / 100;
+    const cci = Math.max(0, Math.min(100, Number(interference.cci) || 0)) / 100;
+    // Adjacent-channel energy is outside the wanted modulation, so ACI can
+    // safely drive the cap all the way from the 300 kHz ceiling to 60 kHz.
+    const aciCap = maxBw - (maxBw - minBw) * aci;
+    // CCI overlaps the wanted station and cannot be removed by an RF filter.
+    // Only distrust the widest edge estimates, retaining at least 65% of the
+    // useful range between the weak-signal floor and nominal WFM bandwidth.
+    const cciFloor = minBw + (defaultBw - minBw) * 0.65;
+    const cciCap = maxBw - (maxBw - cciFloor) * cci;
+    rawBw = Math.min(rawBw, aciCap, cciCap);
+  }
   const clamped = Math.max(minBw, Math.min(maxBw, rawBw));
   return Math.max(stepBw, Math.round(clamped / stepBw) * stepBw);
 }
 
 async function applyAutoBandwidth() {
   if (!lastSpectrumData || lastFreqHz == null) return;
-  const estimated = estimateBandwidthAroundPeak(lastSpectrumData, lastFreqHz);
+  // WFM interference telemetry belongs to the primary DSP channel. Do not
+  // apply it to a virtual channel, where it would describe the wrong signal.
+  const onVirtual = typeof vchanIsOnVirtual === "function" && vchanIsOnVirtual();
+  const interference = onVirtual ? {} : { cci: lastWfmCci, aci: lastWfmAci };
+  const estimated = estimateOccupiedBandwidth(lastSpectrumData, lastFreqHz, interference);
   if (!Number.isFinite(estimated) || estimated <= 0) {
     syncBandwidthInput(currentBandwidthHz);
     return;

src/trx-server/src/audio.rs

@@ -6,7 +6,9 @@
 
 #[cfg(feature = "ft2")]
 use std::collections::HashMap;
-use std::collections::{HashSet, VecDeque};
+use std::collections::HashSet;
+#[cfg(test)]
+use std::collections::VecDeque;
 use std::net::SocketAddr;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
@@ -33,10 +35,9 @@ use trx_core::audio::{
     AUDIO_MSG_VCHAN_MODE, AUDIO_MSG_VCHAN_REMOVE, AUDIO_MSG_VCHAN_SUB, AUDIO_MSG_VCHAN_UNSUB,
     AUDIO_MSG_VDES_DECODE, AUDIO_MSG_WEFAX_DECODE, AUDIO_MSG_WEFAX_PROGRESS, AUDIO_MSG_WSPR_DECODE,
 };
-use trx_core::decode::{
-    AisMessage, AprsPacket, CwEvent, DecodedMessage, Ft8Message, LrptImage, LrptProgress,
-    WsprMessage,
-};
+#[cfg(test)]
+use trx_core::decode::{AisMessage, AprsPacket, CwEvent};
+use trx_core::decode::{DecodedMessage, Ft8Message, LrptImage, LrptProgress, WsprMessage};
 use trx_core::rig::state::{RigMode, RigState};
 use trx_core::vchan::SharedVChanManager;
 use trx_cw::CwDecoder;
@@ -46,9 +47,9 @@ use trx_wspr::WsprDecoder;
 use uuid::Uuid;
 
 use crate::config::AudioConfig;
-use crate::history_policy::{
-    current_timestamp_ms, enforce_capacity, lock_or_recover, prune_by_age, MAX_HISTORY_ENTRIES,
-};
+use crate::history_policy::{current_timestamp_ms, lock_or_recover};
+#[cfg(test)]
+use crate::history_policy::{enforce_capacity, prune_by_age, MAX_HISTORY_ENTRIES};
 use trx_decode_log::DecoderLoggers;
 
 /// Silence timeout before auto-finalising an LRPT pass (30 s without new MCUs).

src/trx-server/trx-backend/trx-backend-soapysdr/src/dsp/filter.rs

@@ -251,9 +251,9 @@ fn mul_freq_domain(buf: &mut [FftComplex<f32>], h_freq: &[FftComplex<f32>], scal
         unsafe {
             mul_freq_domain_neon(buf, h_freq, scale);
         }
-        return;
     }
 
+    #[cfg(not(target_arch = "aarch64"))]
     mul_freq_domain_scalar(buf, h_freq, scale);
 }