From 7ade8283c78f78476ae482ea66c8599188c4abc9 Mon Sep 17 00:00:00 2001 From: liwenhao2 Date: Wed, 16 Sep 2026 15:26:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E9=80=9A=E9=81=93=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3(=E8=B8=A9=E4=BA=86v8.1=E7=9F=AD=E7=AA=97=E9=9B=B7:2s?= =?UTF-8?q?=E7=AA=97+base=E6=A8=A1=E5=9E=8B=E5=90=8C=E4=BA=BA=E7=9B=B8?= =?UTF-8?q?=E4=BC=BC=E5=BA=A60.05~0.7=E7=8B=82=E9=9C=87,90=E7=A7=927?= =?UTF-8?q?=E6=AC=A1=E8=AF=AF=E5=88=87S2-S7):=E5=88=A4=E5=AE=9A=E7=AA=97?= =?UTF-8?q?=E6=94=B9=E5=9B=9E4s(=E4=B8=8E=E4=B8=BB=E9=80=9A=E9=81=93?= =?UTF-8?q?=E5=90=8C=E6=BA=90)=E3=80=81=E5=91=A8=E6=9C=9F1s=E4=BF=9D?= =?UTF-8?q?=E7=95=99(=E5=94=AF=E4=B8=80=E6=8F=90=E9=80=9F=E6=9D=A5?= =?UTF-8?q?=E6=BA=90)=E3=80=81=E9=98=88=E5=80=BC=E5=9B=9E0.35;=E5=8D=A0?= =?UTF-8?q?=E5=8F=B7=E5=89=8D=E5=85=88=E6=9F=A5=E6=B3=A8=E5=86=8C=E8=A1=A8?= =?UTF-8?q?=E2=80=94=E2=80=94=E8=AE=A4=E5=87=BA=E5=BD=93=E5=89=8D=E4=BA=BA?= =?UTF-8?q?=E9=94=80=E6=A1=88/=E8=AE=A4=E5=87=BA=E5=88=AB=E4=BA=BA?= =?UTF-8?q?=E5=A4=8D=E7=94=A8=E7=BC=96=E5=8F=B7/=E9=99=8C=E7=94=9F?= =?UTF-8?q?=E6=89=8D=E5=8F=91=E6=96=B0=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/k2fsa/sherpa/onnx/MainActivity.kt | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/k2fsa/sherpa/onnx/MainActivity.kt b/app/src/main/java/com/k2fsa/sherpa/onnx/MainActivity.kt index 8066916..88253e2 100644 --- a/app/src/main/java/com/k2fsa/sherpa/onnx/MainActivity.kt +++ b/app/src/main/java/com/k2fsa/sherpa/onnx/MainActivity.kt @@ -221,13 +221,14 @@ class MainActivity : AppCompatActivity() { private val onsetMinSamples = 19200 // 1.2s 开口窗 // 喂料恒定滞后(2026-09-16):识别流滞后 1.2s 喂入,切点前的音频可改道; // 全局字幕延迟 ~1.2s 的代价换取换人零串行 - // 快速滚动通道(2026-09-16 用户拍板乐观快切):2s 尾窗/1s 周期/偏离 - // 0.32 即切;准确复核只善后,切错由判定链并回自愈 + // 快速滚动通道(2026-09-16 用户拍板乐观快切):4s 窗(与主通道同源 + // 同尺寸——base 模型短窗(≤2s)同人相似度 0.05~0.7 狂震是 v8.1 + // 换人风暴的根因,勿再踩)/1s 周期(唯一提速来源)/0.35 与主通道同款; + // 占号前先查注册表复用编号;准确复核只善后,切错由判定链并回自愈 private val fastRollEnabled = true - private val fastRollDrop = 0.32f private val fastStepSamples = 16000 // 1s - private val fastWinSamples = 32000 // 2s 尾窗 - private val fastMinSamples = 24000 // ≥1.5s 才判 + private val fastWinSamples = 64000 // 4s 窗(全窗) + private val fastMinSamples = 48000 // ≥3s 才判(同 judgeMinSamples) private val feedLagSamples = 24000 // 1.5s:覆盖判定链(1.2s采集+计算)的 // 余量,开口渗漏≈0;全局字幕延迟即此值,调参范围 1.2~1.5s @Volatile private var onsetSeq = 0L // 行切换/会话开始作废在途开口判定 @@ -744,20 +745,27 @@ class MainActivity : AppCompatActivity() { tailF, sampleRateInHz) ?: return@post if (rseq != onsetSeq) return@post val sim = SpeakerRecognition.similarity(emb, anchor) - if (sim >= fastRollDrop) return@post + if (sim >= speakerSwitchDrop) return@post + val active = activeLabelForWindow + // 先查注册表:认出当前人 → 销案(白捡的防护); + // 认出别人 → 复用其编号;彻底陌生才发新号 + val known = rollingSpeakerSearch(emb) + if (known != null && known == active) return@post val nowMs = SystemClock.elapsedRealtime() if (nowMs - lastForceSwitchAtMs < 3_000L) { Log.i(TAG, "FASTROLL suppressed (cooldown)") return@post } lastForceSwitchAtMs = nowMs - val active = activeLabelForWindow - val label = SpeakerRecognition.nextAutoLabel().also { - SpeakerRecognition.fastRegistry.addAuto(it, emb) - } + val label = known + ?: SpeakerRecognition.nextAutoLabel().also { + SpeakerRecognition.fastRegistry.addAuto(it, emb) + } Log.i(TAG, "FASTROLL-SWITCH sim=" + "%.2f".format(sim) + - " label=$label active=${active ?: "-"}") + " label=$label kind=" + + (if (known != null) "known" else "new") + + " active=${active ?: "-"}") cutRequested = true uiHandler.post { onOnsetSwitch(label) } accurateRecheckAfterSwitch(tailF, label, active, "FASTROLL")