WildDragonLLC/dragonflight
1
0
Fork 0
Code Issues 18 Pull requests 3 Projects Releases Packages Wiki Activity Actions

fix(timeline): cap right-trim at source asset boundary

Browse source 
When duration_ms is known, dragging the right-trim handle past the end
of the source clip could push timeline_out_frames beyond what the source
material covers.  Cap the delta so neither timeline_out_frames nor
source_out_frames can extend past the available source frames.

Also changed assetFrames fallback from origSrcOut (prevents any extension
when duration is unknown) to null, so the guard is simply skipped when
we don't have duration metadata.
This commit is contained in:
Zac Gaetano 2026-05-19 00:02:34 -04:00
parent 3c689ccddf
commit 0ea8d7ce33
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
services/web-ui/public/js/timeline.js
View file

@ -337,14 +337,14 @@
var origTlOut = clip.timeline_out_frames;
var origSrcIn = clip.source_in_frames;
var origSrcOut = clip.source_out_frames;
// Maximum source out is the asset's full duration in frames
// Full asset duration in frames (null when unknown)
var assetFrames = clip.duration_ms
? Math.round((clip.duration_ms / 1000) * s.fps)
: origSrcOut;
: null;
function onMove(ev) {
var dx = ev.clientX - startX;
var dFr = pxToFrames(dx);
var dx = ev.clientX - startX;
var dFr = pxToFrames(dx);
if (side === 'left') {
var newTlIn = Math.max(0, Math.min(origTlIn + dFr, origTlOut - 1));
var dIn = newTlIn - origTlIn;
@ -353,8 +353,15 @@
} else {
var newTlOut = Math.max(origTlIn + 1, origTlOut + dFr);
var dOut = newTlOut - origTlOut;
clip.timeline_out_frames = newTlOut;
clip.source_out_frames = Math.min(assetFrames, origSrcOut + dOut);
// When we know the asset duration, don't extend past the source boundary
if (assetFrames !== null) {
var maxOut = assetFrames - origSrcOut;
if (dOut > maxOut) dOut = maxOut;
}
clip.timeline_out_frames = origTlOut + dOut;
clip.source_out_frames = assetFrames !== null
? Math.min(assetFrames, origSrcOut + dOut)
: origSrcOut + dOut;
}
_renderClips();
}