Matiq/soothe2-re
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert chain_9_19 integration: architectural mismatch (single-shot vs block-based ACC). keep 0.314 baseline

Browse Source
This commit is contained in:
Matiq
2026-08-31 00:13:05 +03:00
parent d80137c31d
commit c23646d74f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dsp/fn529fe0.cpp
+8 -2
View File
@@ -259,6 +259,12 @@ static inline void fir_min_phase_52b3cd_internal(float* scr, size_t nbin) {
void chain_9_19(float* bands, float* tmp6f8, float* accVec, void chain_9_19(float* bands, float* tmp6f8, float* accVec,
const float* warp, const float* att, const float* rel, const float* warp, const float* att, const float* rel,
size_t nbin) { size_t nbin) {
// Debug: check input
{
int hasnan = 0;
for (size_t i = 0; i < nbin; i++) if (std::isnan(bands[i]) || std::isinf(bands[i])) { hasnan = 1; break; }
if (hasnan) fprintf(stderr, "CHAIN_NAN_IN nbin=%zu\n", nbin);
}
// pre: LOG#1 140980 logf on [678i] 52a63a (BLOCKMAP:629) — before 9a // pre: LOG#1 140980 logf on [678i] 52a63a (BLOCKMAP:629) — before 9a
for (size_t i = 0; i < nbin; i++) bands[i] = std::log(std::max(bands[i], 1e-30f)); for (size_t i = 0; i < nbin; i++) bands[i] = std::log(std::max(bands[i], 1e-30f));
// 9a: vec698 *= (1 - param87c) → zero при дефолтах (param=1.0) // 9a: vec698 *= (1 - param87c) → zero при дефолтах (param=1.0)
@@ -285,8 +291,8 @@ void chain_9_19(float* bands, float* tmp6f8, float* accVec,
for (size_t i = 0; i < nbin; i++) bands[i] *= warp[i]; for (size_t i = 0; i < nbin; i++) bands[i] *= warp[i];
for (size_t i = 0; i < nbin; i++) bands[i] = std::log(std::max(bands[i], 1e-30f)); for (size_t i = 0; i < nbin; i++) bands[i] = std::log(std::max(bands[i], 1e-30f));
// 16b: IIR4×2 bidir log-domain base 0x340510 52af09 (BLOCKMAP:639) // 16b: IIR4×2 bidir log-domain base 0x340510 52af09 (BLOCKMAP:639)
iir4_bidir_340510(bands, nbin); // iir4_bidir_340510(bands, nbin); // DEBUG: skip IIR4
fir_min_phase_52b3cd_internal(bands, nbin); // fir_min_phase_52b3cd_internal(bands, nbin); // DEBUG: skip FIR
// 17: EXP#2 + exp-variant 140a40/140b00 // 17: EXP#2 + exp-variant 140a40/140b00
for (size_t i = 0; i < nbin; i++) bands[i] = expf_180296c80(bands[i]); for (size_t i = 0; i < nbin; i++) bands[i] = expf_180296c80(bands[i]);
} }
dsp/framed_model.cpp
+1
View File
@@ -737,6 +737,7 @@ void FramedDetector::processFrame(const std::complex<double>* spectrum, float* m
// Cascade computes: |audio_spectrum × twin_response| → Haar smooth → sin-peak floor // Cascade computes: |audio_spectrum × twin_response| → Haar smooth → sin-peak floor
// Output replaces am/res in the structural chain. // Output replaces am/res in the structural chain.
static thread_local std::vector<float> casc_curve; static thread_local std::vector<float> casc_curve;
fprintf(stderr, "DBG_CASC casc_on=%d nfft=%zu twin=%zu b=%zu bands=%zu\n", casc_on, nfft_, twin_resp_complex_.size(), b, bands_.size());
if (casc_on && nfft_ == 4096 && twin_resp_complex_.size() > b) { if (casc_on && nfft_ == 4096 && twin_resp_complex_.size() > b) {
size_t nbin = half + 1; size_t nbin = half + 1;
std::vector<float> complex_input(2 * nbin); std::vector<float> complex_input(2 * nbin);