Sakurai/poke
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update css/player-base.js

Browse Source
This commit is contained in:
ashley 2025-10-17 21:45:09 +02:00
parent b8fe4d611d
commit fec40d2063
1 changed files with 86 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
css/player-base.js
View File

@ -73,7 +73,7 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
handleFullscreen(); handleFullscreen();
}); });
// ----- state ----- // ---------- state ----------
let syncing = false; let syncing = false;
let restarting = false; let restarting = false;
let firstSeekDone = false; let firstSeekDone = false;
@ -103,7 +103,7 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
try { videoEl.loop = false; videoEl.removeAttribute?.('loop'); } catch {} try { videoEl.loop = false; videoEl.removeAttribute?.('loop'); } catch {}
try { audio.loop = false; audio.removeAttribute?.('loop'); } catch {} try { audio.loop = false; audio.removeAttribute?.('loop'); } catch {}
// ----- helpers ----- // ---------- helpers ----------
const clamp01 = v => Math.max(0, Math.min(1, Number(v))); const clamp01 = v => Math.max(0, Math.min(1, Number(v)));
const EPS = 0.15; const EPS = 0.15;
const MICRO_DRIFT = 0.05; const MICRO_DRIFT = 0.05;
@ -127,65 +127,62 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
const hasExternalAudio = !!audio && audio.tagName === 'AUDIO' && !!pickAudioSrc(); const hasExternalAudio = !!audio && audio.tagName === 'AUDIO' && !!pickAudioSrc();
let syncInterval = null; let syncInterval = null;
let lastAT = 0, lastATts = 0; // audio watchdog let lastAT = 0, lastATts = 0;
let aligning = false; // prevents overlapping soft-aligns
// ------- clickless volume ramps (no WebAudio needed) ------- // ---------- NORMALIZED / STABLE VOLUME (no fades) ----------
let volAnim = null; // Web Audio pipeline: DC blocker -> Dynamics compressor -> fixed makeup gain
function setImmediateVolume(val) { let audioCtx = null, srcNode = null, dcBlock = null, comp = null, makeup = null;
try { audio.volume = clamp01(val); } catch {}
}
function getBaseTargetVol() {
const vVol = clamp01(typeof video.volume === 'function' ? video.volume() : videoEl.volume ?? 1);
const vMuted = typeof video.muted === 'function' ? video.muted() : videoEl.muted;
const hardMuted = vMuted || userMutedVideo || userMutedAudio;
return hardMuted ? 0 : vVol;
}
function rampVolumeTo(target, ms = 60) {
target = clamp01(target);
const from = clamp01(audio.volume);
if (!isFinite(from)) { setImmediateVolume(target); return Promise.resolve(); }
if (ms <= 0 || Math.abs(target - from) < 0.001) { setImmediateVolume(target); return Promise.resolve(); }
if (volAnim && volAnim.cancel) volAnim.cancel(true); // tuning: transparent leveling, no audible pumping
let cancelFlag = false; const NORMALIZER = {
volAnim = { cancel: (v) => { cancelFlag = !!v; } }; enabled: true,
dcHighpassHz: 25,
compressor: {
threshold: -20, // dB
knee: 24, // dB
ratio: 3.5, // :1
attack: 0.003, // s
release: 0.25 // s
},
makeupGain: 1.15 // ~+1.2x loudness
};
const start = performance.now(); function initAudioPipeline() {
return new Promise(resolve => { if (!NORMALIZER.enabled) return;
const step = () => { if (audioCtx) return;
if (cancelFlag) return resolve();
const t = Math.min(1, (performance.now() - start) / ms);
const val = from + (target - from) * t;
setImmediateVolume(val);
if (t < 1) requestAnimationFrame(step);
else resolve();
};
requestAnimationFrame(step);
});
}
async function softMuteAudio(ms = 40) {
await rampVolumeTo(0, ms);
}
async function softUnmuteAudio(ms = 60) {
await rampVolumeTo(getBaseTargetVol(), ms);
}
function updateAudioGainImmediate() {
setImmediateVolume(getBaseTargetVol());
}
async function softAlignAudioTo(t, fadeDown = 40, fadeUp = 60) {
if (aligning) return;
aligning = true;
try { try {
await softMuteAudio(fadeDown); const Ctx = window.AudioContext || window.webkitAudioContext;
safeSetCT(audio, t); if (!Ctx) return;
if (intendedPlaying) await softUnmuteAudio(fadeUp); audioCtx = new Ctx({ latencyHint: 'interactive' });
} finally { srcNode = audioCtx.createMediaElementSource(audio);
aligning = false;
} dcBlock = audioCtx.createBiquadFilter();
dcBlock.type = 'highpass';
dcBlock.frequency.value = NORMALIZER.dcHighpassHz;
dcBlock.Q.value = 0.707;
comp = audioCtx.createDynamicsCompressor();
comp.threshold.value = NORMALIZER.compressor.threshold;
comp.knee.value = NORMALIZER.compressor.knee;
comp.ratio.value = NORMALIZER.compressor.ratio;
comp.attack.value = NORMALIZER.compressor.attack;
comp.release.value = NORMALIZER.compressor.release;
makeup = audioCtx.createGain();
makeup.gain.value = NORMALIZER.makeupGain;
srcNode.connect(dcBlock).connect(comp).connect(makeup).connect(audioCtx.destination);
} catch {}
}
async function ensureAudioContextRunning() {
if (!NORMALIZER.enabled) return;
try {
initAudioPipeline();
if (audioCtx && audioCtx.state === 'suspended') {
await audioCtx.resume();
}
} catch {}
} }
// ----------------------------------------------------------
function timeInBuffered(media, t) { function timeInBuffered(media, t) {
try { try {
@ -231,10 +228,9 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
try { audio.muted = val; } catch {} try { audio.muted = val; } catch {}
queueMicrotask(() => { squelchMuteEvents = Math.max(0, squelchMuteEvents - 1); }); queueMicrotask(() => { squelchMuteEvents = Math.max(0, squelchMuteEvents - 1); });
} }
async function ensureUnmutedIfNotUserMuted() { function ensureUnmutedIfNotUserMuted() {
if (!userMutedVideo) setVideoMuted(false); if (!userMutedVideo) setVideoMuted(false);
if (!userMutedAudio) setAudioMuted(false); if (!userMutedAudio) setAudioMuted(false);
await softUnmuteAudio(80);
} }
function startSyncLoop() { function startSyncLoop() {
@ -247,7 +243,7 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
// strict co-play enforcement // strict co-play enforcement
if (intendedPlaying) { if (intendedPlaying) {
if (video.paused() && !audio.paused) { try { video.play(); } catch {} } if (video.paused() && !audio.paused) { try { video.play(); } catch {} }
if (!video.paused() && audio.paused) { try { audio.play().then(()=>softUnmuteAudio(80)).catch(()=>{}); } catch {} } if (!video.paused() && audio.paused) { try { audio.play().catch(()=>{}); } catch {} }
} else { } else {
if (!video.paused()) { try { video.pause(); } catch {} } if (!video.paused()) { try { video.pause(); } catch {} }
if (!audio.paused) { try { audio.pause(); } catch {} } if (!audio.paused) { try { audio.pause(); } catch {} }
@ -263,10 +259,11 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
} }
if (Math.abs(delta) > BIG_DRIFT) { if (Math.abs(delta) > BIG_DRIFT) {
// clickless hard realign // hard realign (no volume ramps as requested)
softAlignAudioTo(vt, 30, 80); safeSetCT(audio, vt);
try { audio.playbackRate = 1; } catch {}
} else if (Math.abs(delta) > MICRO_DRIFT) { } else if (Math.abs(delta) > MICRO_DRIFT) {
// gentle time-stretch // gentle time-stretch window (±10%)
const targetRate = 1 + (delta * 0.12); const targetRate = 1 + (delta * 0.12);
try { audio.playbackRate = Math.max(0.9, Math.min(1.1, targetRate)); } catch {} try { audio.playbackRate = Math.max(0.9, Math.min(1.1, targetRate)); } catch {}
} else { } else {
@ -283,7 +280,7 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
} }
} catch {} } catch {}
// audio progress watchdog (kick without clicks) // audio progress watchdog
const now = performance.now(); const now = performance.now();
if (!audio.paused && intendedPlaying) { if (!audio.paused && intendedPlaying) {
if (Math.abs(at - lastAT) < 0.001) { if (Math.abs(at - lastAT) < 0.001) {
@ -305,11 +302,10 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
async function kickAudio() { async function kickAudio() {
try { try {
const t = Number(audio.currentTime) || 0; const t = Number(audio.currentTime) || 0;
await softMuteAudio(25);
audio.pause(); audio.pause();
safeSetCT(audio, t + 0.001); safeSetCT(audio, t + 0.001);
await audio.play().catch(()=>{}); await audio.play().catch(()=>{});
await softUnmuteAudio(60); await ensureAudioContextRunning();
} catch {} } catch {}
} }
@ -327,37 +323,33 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
intendedPlaying = true; intendedPlaying = true;
lastPlayKickTs = performance.now(); lastPlayKickTs = performance.now();
try { try {
await ensureAudioContextRunning();
const t = Number(video.currentTime()); const t = Number(video.currentTime());
if (isFinite(t) && Math.abs(Number(audio.currentTime) - t) > 0.05) { if (isFinite(t) && Math.abs(Number(audio.currentTime) - t) > 0.05) {
await softAlignAudioTo(t, 25, 70); safeSetCT(audio, t);
} }
let vOk = true, aOk = true; let vOk = true, aOk = true;
try { const p = video.play(); if (p && p.then) await p; } catch { vOk = false; } try { const p = video.play(); if (p && p.then) await p; } catch { vOk = false; }
aOk = await tryPlay(audio); aOk = await tryPlay(audio);
// minimal autoplay workaround (mute only if absolutely needed)
if (allowMutedRetry && (!vOk || !aOk)) { if (allowMutedRetry && (!vOk || !aOk)) {
const prevVideoMuted = !!video.muted(); const prevVideoMuted = !!video.muted();
const prevAudioMuted = !!audio.muted; const prevAudioMuted = !!audio.muted;
// fade down before toggling mute to avoid pop
await softMuteAudio(40);
setVideoMuted(true); setVideoMuted(true);
setAudioMuted(true); setAudioMuted(true);
try { const p = video.play(); if (p && p.then) await p; } catch {} try { const p = video.play(); if (p && p.then) await p; } catch {}
await tryPlay(audio); await tryPlay(audio);
// restore previous user states + fade up setTimeout(() => {
setTimeout(async () => {
if (!userMutedVideo) setVideoMuted(prevVideoMuted); if (!userMutedVideo) setVideoMuted(prevVideoMuted);
if (!userMutedAudio) setAudioMuted(prevAudioMuted); if (!userMutedAudio) setAudioMuted(prevAudioMuted);
await softUnmuteAudio(90);
}, 160); }, 160);
suppressMirrorUntil = performance.now() + MUTE_SQUELCH_MS; suppressMirrorUntil = performance.now() + MUTE_SQUELCH_MS;
} else {
// normal fade-in at start to avoid click
await softUnmuteAudio(90);
} }
if (!syncInterval) startSyncLoop(); if (!syncInterval) startSyncLoop();
@ -421,7 +413,6 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
video.currentTime(saved); video.currentTime(saved);
safeSetCT(audio, saved); safeSetCT(audio, saved);
firstSeekDone = true; firstSeekDone = true;
updateAudioGainImmediate();
} }
} catch {} } catch {}
} }
@ -450,7 +441,8 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
if (!intendedPlaying) return; if (!intendedPlaying) return;
const t = Number(video.currentTime()); const t = Number(video.currentTime());
if (bothPlayableAt(t)) { if (bothPlayableAt(t)) {
await ensureUnmutedIfNotUserMuted(); ensureUnmutedIfNotUserMuted();
await ensureAudioContextRunning();
playTogether({ allowMutedRetry: true }); playTogether({ allowMutedRetry: true });
} }
}; };
@ -477,45 +469,33 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
safeSetCT(audio, t); safeSetCT(audio, t);
} }
setupMediaSession(); setupMediaSession();
updateAudioGainImmediate();
}; };
oneShotReady(audio, () => { audioReady = true; }); oneShotReady(audio, () => { audioReady = true; });
oneShotReady(videoEl, () => { videoReady = true; }); oneShotReady(videoEl, () => { videoReady = true; });
// volume/mute coupling (no random mutes; fade around mute flips) // volume/mute coupling (no random mutes)
video.on('volumechange', () => { video.on('volumechange', () => {
if (squelchMuteEvents) return; if (squelchMuteEvents) return;
userMutedVideo = !!video.muted(); userMutedVideo = !!video.muted();
if (performance.now() < suppressMirrorUntil || seekingActive || restarting) { if (performance.now() < suppressMirrorUntil || seekingActive || restarting) return;
// defer mirroring during squelch; just update gain target setAudioMuted(video.muted());
rampVolumeTo(getBaseTargetVol(), 80); if (!video.muted()) audio.volume = clamp01(video.volume());
return;
}
if (video.muted()) {
softMuteAudio(80).then(() => setAudioMuted(true));
} else {
setAudioMuted(false);
softUnmuteAudio(100);
}
// follow volume level smoothly
if (!video.muted()) rampVolumeTo(getBaseTargetVol(), 120);
}); });
audio.addEventListener('volumechange', () => { audio.addEventListener('volumechange', () => {
if (squelchMuteEvents) return; if (squelchMuteEvents) return;
userMutedAudio = !!audio.muted; userMutedAudio = !!audio.muted;
// audio->video mute isn't mirrored; video UI is the authority // audio->video mute isn't mirrored; video UI is the authority.
}); });
// playback rate // playback rate
video.on('ratechange', () => { try { audio.playbackRate = video.playbackRate(); } catch {} }); video.on('ratechange', () => { try { audio.playbackRate = video.playbackRate(); } catch {} });
// user play/pause drives both // user play/pause drives both
video.on('play', () => { intendedPlaying = true; ensureUnmutedIfNotUserMuted().then(()=>playTogether()); }); video.on('play', () => { intendedPlaying = true; ensureUnmutedIfNotUserMuted(); playTogether(); });
video.on('pause', () => { if (!restarting) pauseTogether(); }); video.on('pause', () => { if (!restarting) pauseTogether(); });
// seek auto-play policy with clickless alignment // seek auto-play policy
let wasPlayingBeforeSeek = false; let wasPlayingBeforeSeek = false;
let seekStartTime = 0; let seekStartTime = 0;
@ -535,19 +515,18 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
suppressMirrorUntil = performance.now() + MUTE_SQUELCH_MS; suppressMirrorUntil = performance.now() + MUTE_SQUELCH_MS;
}); });
video.on('seeked', async () => { video.on('seeked', () => {
if (restarting) return; if (restarting) return;
const newTime = Number(video.currentTime()); const newTime = Number(video.currentTime());
const diff = Math.abs(newTime - seekStartTime); const diff = Math.abs(newTime - seekStartTime);
const { small, large, huge } = computeSeekThresholds(); const { small, large, huge } = computeSeekThresholds();
// clickless align for anything > ~120ms, straight set for tiny nudges // align audio to video (no fades)
if (diff > 0.12) await softAlignAudioTo(newTime, 30, 80); safeSetCT(audio, newTime);
else safeSetCT(audio, newTime);
if (!firstSeekDone) { firstSeekDone = true; seekingActive = false; return; } if (!firstSeekDone) { firstSeekDone = true; seekingActive = false; return; }
await ensureUnmutedIfNotUserMuted(); ensureUnmutedIfNotUserMuted();
if (diff <= small) { if (diff <= small) {
if (wasPlayingBeforeSeek && bothPlayableAt(newTime)) { if (wasPlayingBeforeSeek && bothPlayableAt(newTime)) {
@ -568,10 +547,10 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
} else { } else {
intendedPlaying = false; intendedPlaying = false;
pauseHard(); pauseHard();
setTimeout(async () => { setTimeout(() => {
if (wasPlayingBeforeSeek) { if (wasPlayingBeforeSeek) {
intendedPlaying = true; intendedPlaying = true;
await ensureUnmutedIfNotUserMuted(); ensureUnmutedIfNotUserMuted();
playTogether({ allowMutedRetry: true }); playTogether({ allowMutedRetry: true });
} }
}, 160); }, 160);
@ -593,9 +572,10 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
pauseHard(); pauseHard();
const startAt = 0.001; const startAt = 0.001;
suppressEndedUntil = performance.now() + 800; suppressEndedUntil = performance.now() + 800;
await softAlignAudioTo(startAt, 30, 80); safeSetCT(audio, startAt);
intendedPlaying = true; intendedPlaying = true;
await ensureUnmutedIfNotUserMuted(); ensureUnmutedIfNotUserMuted();
await ensureAudioContextRunning();
await playTogether(); await playTogether();
} finally { restarting = false; } } finally { restarting = false; }
} }
@ -617,7 +597,7 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
const tryAutoResume = async () => { const tryAutoResume = async () => {
if (!intendedPlaying) return; if (!intendedPlaying) return;
const t = Number(video.currentTime()); const t = Number(video.currentTime());
if (bothPlayableAt(t)) { await ensureUnmutedIfNotUserMuted(); playTogether({ allowMutedRetry: true }); } if (bothPlayableAt(t)) { await ensureAudioContextRunning(); playTogether({ allowMutedRetry: true }); }
}; };
videoEl.addEventListener('canplay', tryAutoResume); videoEl.addEventListener('canplay', tryAutoResume);
audio.addEventListener('canplay', tryAutoResume); audio.addEventListener('canplay', tryAutoResume);
@ -643,7 +623,7 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
setupMediaSession(); setupMediaSession();
} }
}); });
// https://codeberg.org/ashley/poke/src/branch/main/src/libpoketube/libpoketube-youtubei-objects.json // https://codeberg.org/ashley/poke/src/branch/main/src/libpoketube/libpoketube-youtubei-objects.json