From 82796417c1cd00c6e8ef169f9ae263fdea12fa09 Mon Sep 17 00:00:00 2001 From: locphamtran Date: Sat, 29 Aug 2026 17:54:36 +0700 Subject: [PATCH] V45.4 fix SF loop wrap gap: worklet KEEP 4->16 (85ms che stall 68-82ms, het underrun wrap dien hinh) + wrap underrun bo flush (D17 da skip engine flush; worklet flush pha gap seam) + resumeFill 8 (~43ms) thay FILL 24 (~128ms) - gap wrap ~110-235ms giam con vai chuc ms, v=202608291752 --- app/static/js/app.precompiled.js | 4 +- app/static/js/sf-fx-realtime.js | 34 ++++++-- app/templates/index.html | 2 +- patch_q2_wrap.py | 131 +++++++++++++++++++++++++++++++ 4 files changed, 160 insertions(+), 11 deletions(-) create mode 100644 patch_q2_wrap.py diff --git a/app/static/js/app.precompiled.js b/app/static/js/app.precompiled.js index 43b97b3..9ac3c5d 100644 --- a/app/static/js/app.precompiled.js +++ b/app/static/js/app.precompiled.js @@ -339,7 +339,7 @@ else if(fxRt.chainKey!==ck){fxRtSetChain(chain);fxRt.chainKey=ck;return;}else re // node → bypass vô hiệu. Mỗi fxRtStop() bump startToken → mọi checkpoint // dưới đây thấy mismatch → hủy session vừa tạo, không nối node. const token=++fxRt.startToken;fxRt.starting=true;const ctx=getAudioContext();if(!ctx||!ctx.audioWorklet||!masterBus||!masterBus.output||!masterBus.analyser||!masterBus.masterFxGain||!masterBus.masterFxDryGain)return;const chainPayload=chain.map(s=>s.type==='vst3'?{type:'vst3',path:s.path,name:s.name||s.path,preset_b64:s.preset_b64||'',bypass:!!s.bypass||!!(window.currentMasteringSettings||{}).vstBypass}:{type:'builtin',id:s.type,params:s.params&&Object.keys(s.params).length?s.params:{},bypass:!!s.bypass});let st;try{st=await window.SonicAPI.fxRealtimeStart({fx_chain:chainPayload,sample_rate:ctx.sampleRate||44100});}catch(e){console.warn('[FX RT] start fail:',e);showToast('Không khởi động VST FX realtime: '+(e.message||e),'warning');fxRt.starting=false;return;}if(token!==fxRt.startToken){// Bypass/stop giữa lúc engine đang load chain — hủy session vừa tạo. -console.warn('[FX RT] start cancelled mid-flight — session stopped');try{window.SonicAPI.fxRealtimeStop({session_id:st.session_id}).catch(()=>{});}catch(e2){}fxRt.starting=false;return;}fxRt.sessionId=st.session_id;fxRtGuiPushShm();try{await ctx.audioWorklet.addModule(`${API_BASE_URL}/static/js/sf-fx-realtime.js?v=45.3`);if(token!==fxRt.startToken){fxRt.starting=false;return;}fxRt.node=new AudioWorkletNode(ctx,'sf-fx-realtime',{numberOfInputs:1,numberOfOutputs:1,outputChannelCount:[2]});const u=new URL(API_BASE_URL);const wsProto=u.protocol==='https:'?'wss://':'ws://';// WS to 'localhost' bi tre ~300ms: Chromium thu ::1 truoc (Windows khong +console.warn('[FX RT] start cancelled mid-flight — session stopped');try{window.SonicAPI.fxRealtimeStop({session_id:st.session_id}).catch(()=>{});}catch(e2){}fxRt.starting=false;return;}fxRt.sessionId=st.session_id;fxRtGuiPushShm();try{await ctx.audioWorklet.addModule(`${API_BASE_URL}/static/js/sf-fx-realtime.js?v=202608291752`);if(token!==fxRt.startToken){fxRt.starting=false;return;}fxRt.node=new AudioWorkletNode(ctx,'sf-fx-realtime',{numberOfInputs:1,numberOfOutputs:1,outputChannelCount:[2]});const u=new URL(API_BASE_URL);const wsProto=u.protocol==='https:'?'wss://':'ws://';// WS to 'localhost' bi tre ~300ms: Chromium thu ::1 truoc (Windows khong // co listener IPv6 -> SYN hang ~2s) roi moi fallback 127.0.0.1. Dung // thang 127.0.0.1 (loopback) -> WS open ~5ms. Server chap nhan loopback. const wsHost=u.hostname==='localhost'||u.hostname==='::1'?'127.0.0.1'+(u.port?':'+u.port:''):u.host;const tok=localStorage.getItem('sonic_token')||'';const wsUrl=`${wsProto}${wsHost}${st.ws_url}${tok?'?token='+encodeURIComponent(tok):''}`;const ws=new WebSocket(wsUrl);fxRt.ws=ws;ws.binaryType='arraybuffer';ws.onopen=()=>{if(token!==fxRt.startToken){try{ws.close();}catch(e){}fxRt.starting=false;return;}fxRt.active=true;fxRt.flushing=false;fxRt.starting=false;fxRt.inQueue=[];// bỏ audio stale sản xuất trước khi WS open (~4s load VST) — hết lag khởi đầu @@ -1936,7 +1936,7 @@ fxRtTrackReconcile(trackId,node,track);}catch(e){console.warn('rebuildTrackFxGra // Cần activeTrackNodesRef/isPlayingRef. Session giống master (fxRtStart): // fetch start → AudioWorkletNode 'sf-fx-realtime' → WS; WS open → splice // worklet vào chain hiện tại (đọc mods MỚI NHẤT — an toàn với rebuild). -const fxRtTrackStart=async(trackId,track,path)=>{const key=trackId+':'+path;const chain=fxRtTrackChain(track);if(!chain.length)return;if(fxRtTracks[key]){if(!fxRtTracks[key].node||fxRtTracks[key].node.context!==getAudioContext())fxRtTrackStop(trackId,path,true);else return;}const ctx=getAudioContext();if(!ctx||!ctx.audioWorklet)return;const chainPayload=chain.map(s=>s.type==='vst3'?{type:'vst3',path:s.path,name:s.name||s.path,preset_b64:s.preset_b64||'',bypass:!!s.bypass||!!(track&&track.vstFxBypass)}:{type:'builtin',id:s.type,params:s.params&&Object.keys(s.params).length?s.params:{},bypass:!!s.bypass});let st;try{st=await window.SonicAPI.fxRealtimeStart({fx_chain:chainPayload,sample_rate:ctx.sampleRate||44100});}catch(e){console.warn('[FX RT track] start fail',trackId,path,e);return;}const entry={sessionId:st.session_id,ws:null,node:null,ready:false,path,spliced:null,chainKey:fxRtTrackChainKey(chain)+'|vb:'+(track&&track.vstFxBypass?'1':'0'),paramsBySlot:chain.map(s=>fxRtEntryParams(s,null)),inQueue:[],pumpTimer:null,lastInSent:0,flushing:false,flushTimer:null};fxRtTracks[key]=entry;fxRtGuiPushShm();try{await ctx.audioWorklet.addModule(`${API_BASE_URL}/static/js/sf-fx-realtime.js?v=45.3`);const node=new AudioWorkletNode(ctx,'sf-fx-realtime',{numberOfInputs:1,numberOfOutputs:1,outputChannelCount:[2]});entry.node=node;const u=new URL(API_BASE_URL);const wsProto=u.protocol==='https:'?'wss://':'ws://';// WS to 'localhost' bi tre ~300ms (Chromium thu ::1 truoc roi fallback) - dung 127.0.0.1 +const fxRtTrackStart=async(trackId,track,path)=>{const key=trackId+':'+path;const chain=fxRtTrackChain(track);if(!chain.length)return;if(fxRtTracks[key]){if(!fxRtTracks[key].node||fxRtTracks[key].node.context!==getAudioContext())fxRtTrackStop(trackId,path,true);else return;}const ctx=getAudioContext();if(!ctx||!ctx.audioWorklet)return;const chainPayload=chain.map(s=>s.type==='vst3'?{type:'vst3',path:s.path,name:s.name||s.path,preset_b64:s.preset_b64||'',bypass:!!s.bypass||!!(track&&track.vstFxBypass)}:{type:'builtin',id:s.type,params:s.params&&Object.keys(s.params).length?s.params:{},bypass:!!s.bypass});let st;try{st=await window.SonicAPI.fxRealtimeStart({fx_chain:chainPayload,sample_rate:ctx.sampleRate||44100});}catch(e){console.warn('[FX RT track] start fail',trackId,path,e);return;}const entry={sessionId:st.session_id,ws:null,node:null,ready:false,path,spliced:null,chainKey:fxRtTrackChainKey(chain)+'|vb:'+(track&&track.vstFxBypass?'1':'0'),paramsBySlot:chain.map(s=>fxRtEntryParams(s,null)),inQueue:[],pumpTimer:null,lastInSent:0,flushing:false,flushTimer:null};fxRtTracks[key]=entry;fxRtGuiPushShm();try{await ctx.audioWorklet.addModule(`${API_BASE_URL}/static/js/sf-fx-realtime.js?v=202608291752`);const node=new AudioWorkletNode(ctx,'sf-fx-realtime',{numberOfInputs:1,numberOfOutputs:1,outputChannelCount:[2]});entry.node=node;const u=new URL(API_BASE_URL);const wsProto=u.protocol==='https:'?'wss://':'ws://';// WS to 'localhost' bi tre ~300ms (Chromium thu ::1 truoc roi fallback) - dung 127.0.0.1 const wsHost=u.hostname==='localhost'||u.hostname==='::1'?'127.0.0.1'+(u.port?':'+u.port:''):u.host;const tok=localStorage.getItem('sonic_token')||'';const ws=new WebSocket(`${wsProto}${wsHost}${st.ws_url}${tok?'?token='+encodeURIComponent(tok):''}`);entry.ws=ws;ws.binaryType='arraybuffer';ws.onopen=()=>{entry.ready=true;entry.inQueue=[];// bỏ audio stale trước khi WS open — hết lag khởi đầu fxRtTrackSplice(trackId,path);try{(entry.paramsBySlot||[]).forEach((pl,slot)=>pl.forEach(p=>ws.send(JSON.stringify({cmd:'set_param',slot,key:p.key,value:p.value}))));}catch(e){}};ws.onmessage=ev=>{if(typeof ev.data==='string'){try{const d=JSON.parse(ev.data);if(d&&d.cmd==='flush_done'){entry.flushing=false;if(entry.flushTimer){clearTimeout(entry.flushTimer);entry.flushTimer=null;}if(entry.node)entry.node.port.postMessage({type:'flush_done'});}}catch(e){}return;}if(!(ev.data instanceof ArrayBuffer)||!entry.node)return;if(entry.flushing)return;// V24: output stale trong luc flush — drop const f=new Float32Array(ev.data);const half=f.length/2;const l=new Float32Array(half);const r=new Float32Array(half);for(let i=0;ifxRtTrackStop(trackId,path,true);ws.onerror=()=>{try{ws.close();}catch(e){}};entry.node.port.onmessage=ev=>{const d=ev.data;if(!d||!entry.ws)return;if(d.type==='flush'){// V24: nhu master — worklet underrun-resume → flush engine ring diff --git a/app/static/js/sf-fx-realtime.js b/app/static/js/sf-fx-realtime.js index f593153..bd3697f 100644 --- a/app/static/js/sf-fx-realtime.js +++ b/app/static/js/sf-fx-realtime.js @@ -57,6 +57,7 @@ class SfFxRealtimeProcessor extends AudioWorkletProcessor { this.lastOutR = 0.0; this.wrapFadeBlocks = -1; // V42: số block tail pass cũ còn lại sau clear_queue('loop') — đếm ngược để crossfade đúng seam tail→head this.latencySamples = 0; // G3: latency chain thật (engine qua WS) — align wrap fade theo processed tail + this.wrapMode = false; // V45.3: dang trong wrap (clear_queue loop) — resume underrun bo flush + re-buffer nho this.WRAP_FADE = 256; // V42: crossfade 256 mẫu (~5.3ms @48k) tại seam wrap — che click jump nội dung end→start (FX path) this.fadeFromL = 0.0; // mẫu cố định khi fade-out underrun (fade tuyến tính tới 0) this.fadeFromR = 0.0; @@ -79,6 +80,7 @@ class SfFxRealtimeProcessor extends AudioWorkletProcessor { this.resumeFadeIn = true; this.resumeFill = this.RESUME_FILL; this.silenced = false; + this.wrapMode = false; // V30: fade-out tu mau output CUOI (lastOut) — truoc day dung fadeFrom // cu (mac dinh 0) -> jump mau -> click/crackle ngay khi stop. this.fadeFromL = this.lastOutL; @@ -110,11 +112,18 @@ class SfFxRealtimeProcessor extends AudioWorkletProcessor { // G3: align processed-tail — tail pass cũ còn in-flight trong bridge // (FX latency thật từ engine) chưa về queue; đếm đủ block tới seam // (block đầu pass mới lên front) → crossfade đúng chỗ jump end→start. - // V45.2 (option B): cắt bớt tail cũ giữ KEEP block (~21ms cushion) thay - // vì giữ nguyên FILL 24 (~128ms) → downbeat pass mới không trễ ~110ms. - // skipFade crossfade từ lastOut che jump cắt front; wrapFadeBlocks đếm - // lại từ KEEP để seam crossfade vẫn đúng lúc. - const KEEP = 4; + // V45.2 (option B): cắt bớt tail cũ giữ KEEP block thay vì giữ nguyên + // FILL 24 (~128ms) → downbeat pass mới không trễ ~110ms. skipFade + // crossfade từ lastOut che jump cắt front; wrapFadeBlocks đếm lại từ + // KEEP để seam crossfade vẫn đúng lúc. + // V45.3: KEEP 4 -> 16 (~85ms): KEEP 4 (~21ms) engine (stall bridge + // 68-138ms sau transport play) khong refill kip -> queue can -> underrun + // -> flush + re-buffer FILL 24 = gap ~110-235ms moi wrap (WORSE hon + // truoc V45.2: downbeat tre 106-128ms nhung khong gap). KEEP 16 che + // stall dien hinh 68-82ms lien tuc (khong gap, downbeat ~85ms); stall + // dai hon roi vao nhanh resume wrap (bo flush + resumeFill 8). + const KEEP = 16; + this.wrapMode = true; if (this.outQueue.length > KEEP) { const head = this.outQueue.length - KEEP; this.outQueue.splice(0, head); @@ -139,6 +148,7 @@ class SfFxRealtimeProcessor extends AudioWorkletProcessor { this.outPos = 0; this.playing = false; this.wrapFadeBlocks = -1; // V42: wipe — hủy wrap crossfade chờ (không có tail cũ) + this.wrapMode = false; // V45.3: play/seek — het context wrap this.resumeFadeIn = true; // V34: mode phan biet — play re-buffer FILL 8 (~43ms, cushion du hap thu // engine ramp/jitter dau play); ARM live note giu RESUME_FILL 8 (~43ms) — preview @@ -303,18 +313,26 @@ class SfFxRealtimeProcessor extends AudioWorkletProcessor { // tại (giữa fade) — hết jump. const wasInterrupted = !this.resumeFadeIn && (this.holdFadeLeft > 0 || this.silenced) && this.hasStarted; if (wasInterrupted) { + // V45.3: wrap (loop restart) — engine da transport('play') tu main + // (D17): block moi = audio pass moi, KHONG phai backlog stale (boi + // worklet flush gui 'flush' xuong engine ring = lam mat tac dung D17 + // skip-flush o stopAllPlayback -> gap giua seam). Bo flush (round-trip) + // + re-buffer nho hon FILL 24 (~128ms) -> resume sau stall som hon + // (~43ms) -> gap wrap giam tu ~110-235ms xuong con vai chuc ms. + const _wrap = this.wrapMode; this.outQueue.length = 0; this.outPos = 0; - this.flushPending = true; this.resumeFadeIn = true; - this.resumeFill = this.FILL; // underrun-stall: giữ cushion FILL đầy đủ (V25 wobble) - this.port.postMessage({ type: 'flush' }); + this.resumeFill = _wrap ? 8 : this.FILL; + this.flushPending = _wrap ? false : true; + if (!_wrap) this.port.postMessage({ type: 'flush' }); i--; continue; } this.playing = true; this.outPos = 0; this.holdFadeLeft = 0; + this.wrapMode = false; // V45.3: resume xong — ve che do thuong (underrun sau nay flush nhu cu) if (this.dbgPlayFirst) { this.dbgPlayFirst = false; this.port.postMessage({ type: 'dbg', tag: 'fx_play_first', t: Math.round(currentTime * 1000), q: this.outQueue.length }); diff --git a/app/templates/index.html b/app/templates/index.html index 0f66d5a..f2b4590 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -51,7 +51,7 @@ - +