diff --git a/c/src/cm_stream.c b/c/src/cm_stream.c index 78803e4..6878bf8 100644 --- a/c/src/cm_stream.c +++ b/c/src/cm_stream.c @@ -339,7 +339,9 @@ static void detect(stream_t *s) double m = 0; for (int n = 0; n < N2; n++) m += e[n]; - lg += log(e[B] / (m / N2) + 1e-12); + /* an all-zero window (digital silence) has no peak: ratio 1, + * not 0/0, which made the metric NaN and passed the threshold */ + lg += log((m > 0 ? e[B] / (m / N2) : 1.0) + 1e-12); } s->met[i] = exp(lg / L); } @@ -347,7 +349,7 @@ static void detect(stream_t *s) /* accept local maxima above threshold once their neighbourhood is in */ for (long k = s->k_next; k <= k_final; k++) { long i = k - s->w0; - if (i < 0 || s->met[i] < 4.0) + if (i < 0 || !(s->met[i] >= 4.0)) /* written so that NaN fails too */ continue; int best = 1; for (long j = k - n_pre; j <= k + n_pre && best; j++) { diff --git a/c/src/cm_tx.c b/c/src/cm_tx.c index 09ef7ac..4dda9b9 100644 --- a/c/src/cm_tx.c +++ b/c/src/cm_tx.c @@ -280,32 +280,61 @@ long chirpmodem_tx_cw_id(chirpmodem_tx *t, const char *call, double wpm, float * long kr = (long)(0.005 * fs); /* raised-cosine smoothing */ if (kr < 1) kr = 1; - double *wr = malloc(sizeof(double) * (size_t)kr), ws = 0; + /* cum[m] = wr[0] + ... + wr[m-1], so cum[0] = 0 and cum[kr] = sum */ + double *cum = malloc(sizeof(double) * (size_t)(kr + 1)); cf64 *tone = malloc(sizeof(cf64) * (size_t)n); - if (!env || !wr || !tone) { + long (*run)[2] = malloc(sizeof *run * (size_t)(n / 2 + 1)); + if (!env || !cum || !tone || !run) { free(env); - free(wr); + free(cum); free(tone); + free(run); return CHIRPMODEM_ENOMEM; } cw_envelope(text, dot, env); - for (long k = 0; k < kr; k++) { - wr[k] = 0.5 - 0.5 * cos(M_PI * k / kr); - ws += wr[k]; + cum[0] = 0; + for (long k = 0; k < kr; k++) + cum[k + 1] = cum[k] + (0.5 - 0.5 * cos(M_PI * k / kr)); + double ws = cum[kr]; + /* The keyed runs [a, b) of the 0/1 envelope */ + long nr = 0; + for (long v = 0; v < n;) { + if (env[v] == 0) { + v++; + continue; + } + long a = v; + while (v < n && env[v] != 0) + v++; + run[nr][0] = a; + run[nr++][1] = v; } + /* s(u) = sum over k in [0, kr) of env[u + kr/2 - k] * wr[k]. A run [a, b) + * contributes the window taps k from u + kr/2 - b + 1 to u + kr/2 - a, so a + * difference of two cumulative sums: O(n) instead of O(n * kr). Runs are + * at least a dot long, so the window spans only a few of them. */ double fi = t->cfg.if_offset; + long first = 0; /* first run that can still reach u */ for (long u = 0; u < n; u++) { + long c = u + kr / 2; + while (first < nr && run[first][1] <= c - kr + 1) + first++; double s = 0; - for (long k = 0; k < kr; k++) { - long v = u + kr / 2 - k; - if (v >= 0 && v < n) - s += env[v] * wr[k]; + for (long r = first; r < nr && run[r][0] <= c; r++) { + long k0 = c - run[r][1] + 1, k1 = c - run[r][0]; /* taps k0..k1 */ + if (k0 < 0) + k0 = 0; + if (k1 > kr - 1) + k1 = kr - 1; + if (k0 <= k1) + s += cum[k1 + 1] - cum[k0]; } tone[u] = s / ws * cexp(2.0 * M_PI * I * fmod(fi * u / fs, 1.0)); } store(t, tone, n, iq); free(env); - free(wr); + free(cum); free(tone); + free(run); return n; }