@@ -21,6 +21,7 @@ import {
2121 sourceTimeAt ,
2222 timeAtSourceTime ,
2323 type RateSpec ,
24+ exportClipWindow ,
2425 hasClipStarted ,
2526 isInClipWindow ,
2627 parseStrictFiniteTimingNumber ,
@@ -2199,7 +2200,6 @@ function getFrameIndexAtTime(
21992200 holdLastFrame = false ,
22002201 playbackRate : RateSpec = 1 ,
22012202) : number | null {
2202- if ( ! hasClipStarted ( globalTime , videoStart ) ) return null ;
22032203 let localTime = Math . max ( 0 , globalTime - videoStart ) ;
22042204 const normalizedPlaybackRate = normalizeRateSpec ( playbackRate ) ;
22052205 const loopDuration = timeAtSourceTime (
@@ -2237,6 +2237,7 @@ export function getFrameAtTime(
22372237 loop = false ,
22382238 mediaStart = 0 ,
22392239) : string | null {
2240+ if ( ! hasClipStarted ( globalTime , videoStart ) ) return null ;
22402241 const frameIndex = getFrameIndexAtTime ( extracted , globalTime , videoStart , loop , mediaStart ) ;
22412242 return frameIndex == null ? null : extracted . framePaths . get ( frameIndex ) || null ;
22422243}
@@ -2270,7 +2271,7 @@ export class FrameLookupTable {
22702271 {
22712272 extracted : ExtractedFrames ;
22722273 start : number ;
2273- end : number ;
2274+ clipWindow : { start : number ; end : number } ;
22742275 mediaStart : number ;
22752276 loop : boolean ;
22762277 playbackRate : RateSpec ;
@@ -2280,7 +2281,7 @@ export class FrameLookupTable {
22802281 videoId : string ;
22812282 extracted : ExtractedFrames ;
22822283 start : number ;
2283- end : number ;
2284+ clipWindow : { start : number ; end : number } ;
22842285 mediaStart : number ;
22852286 loop : boolean ;
22862287 playbackRate : RateSpec ;
@@ -2289,6 +2290,9 @@ export class FrameLookupTable {
22892290 private startCursor = 0 ;
22902291 private lastTime : number | null = null ;
22912292
2293+ /** The render's `fps`, so a clip shows in exactly export visibility's frames; omit for authored times. */
2294+ constructor ( private readonly fps ?: number ) { }
2295+
22922296 addVideo (
22932297 extracted : ExtractedFrames ,
22942298 start : number ,
@@ -2300,21 +2304,21 @@ export class FrameLookupTable {
23002304 this . videos . set ( extracted . videoId , {
23012305 extracted,
23022306 start,
2303- end,
2307+ clipWindow : this . fps ? exportClipWindow ( start , end , this . fps ) : { start , end } ,
23042308 mediaStart,
23052309 loop,
23062310 playbackRate : normalizeRateSpec ( playbackRate ) ,
23072311 } ) ;
23082312 this . orderedVideos = Array . from ( this . videos . entries ( ) )
23092313 . map ( ( [ videoId , video ] ) => ( { videoId, ...video } ) )
2310- . sort ( ( a , b ) => a . start - b . start ) ;
2314+ . sort ( ( a , b ) => a . clipWindow . start - b . clipWindow . start ) ;
23112315 this . resetActiveState ( ) ;
23122316 }
23132317
23142318 getFrame ( videoId : string , globalTime : number ) : string | null {
23152319 const video = this . videos . get ( videoId ) ;
23162320 if ( ! video ) return null ;
2317- if ( ! isInClipWindow ( globalTime , video . start , video . end ) ) return null ;
2321+ if ( ! isInClipWindow ( globalTime , video . clipWindow . start , video . clipWindow . end ) ) return null ;
23182322 const frameIndex = getFrameIndexAtTime (
23192323 video . extracted ,
23202324 globalTime ,
@@ -2334,14 +2338,13 @@ export class FrameLookupTable {
23342338 }
23352339
23362340 private refreshActiveSet ( globalTime : number ) : void {
2337- // The runtime's half-open window. Rendered times stay below the composition end, so its
2338- // terminal hold (isClipVisibleAt) never applies here.
2341+ // Half-open exportClipWindow; rendered times stay below the composition end, so no terminal hold here.
23392342 if ( this . lastTime == null || globalTime < this . lastTime ) {
23402343 this . activeVideoIds . clear ( ) ;
23412344 this . startCursor = 0 ;
23422345 for ( const entry of this . orderedVideos ) {
2343- if ( ! hasClipStarted ( globalTime , entry . start ) ) break ;
2344- if ( isInClipWindow ( globalTime , entry . start , entry . end ) ) {
2346+ if ( ! hasClipStarted ( globalTime , entry . clipWindow . start ) ) break ;
2347+ if ( isInClipWindow ( globalTime , entry . clipWindow . start , entry . clipWindow . end ) ) {
23452348 this . activeVideoIds . add ( entry . videoId ) ;
23462349 }
23472350 this . startCursor += 1 ;
@@ -2353,18 +2356,18 @@ export class FrameLookupTable {
23532356 while ( this . startCursor < this . orderedVideos . length ) {
23542357 const candidate = this . orderedVideos [ this . startCursor ] ;
23552358 if ( ! candidate ) break ;
2356- if ( ! hasClipStarted ( globalTime , candidate . start ) ) {
2359+ if ( ! hasClipStarted ( globalTime , candidate . clipWindow . start ) ) {
23572360 break ;
23582361 }
2359- if ( isInClipWindow ( globalTime , candidate . start , candidate . end ) ) {
2362+ if ( isInClipWindow ( globalTime , candidate . clipWindow . start , candidate . clipWindow . end ) ) {
23602363 this . activeVideoIds . add ( candidate . videoId ) ;
23612364 }
23622365 this . startCursor += 1 ;
23632366 }
23642367
23652368 for ( const videoId of Array . from ( this . activeVideoIds ) ) {
23662369 const video = this . videos . get ( videoId ) ;
2367- if ( ! video || ! isInClipWindow ( globalTime , video . start , video . end ) ) {
2370+ if ( ! video || ! isInClipWindow ( globalTime , video . clipWindow . start , video . clipWindow . end ) ) {
23682371 this . activeVideoIds . delete ( videoId ) ;
23692372 }
23702373 }
@@ -2424,8 +2427,9 @@ export class FrameLookupTable {
24242427export function createFrameLookupTable (
24252428 videos : VideoElement [ ] ,
24262429 extracted : ExtractedFrames [ ] ,
2430+ fps ?: number ,
24272431) : FrameLookupTable {
2428- const table = new FrameLookupTable ( ) ;
2432+ const table = new FrameLookupTable ( fps ) ;
24292433 const extractedMap = new Map < string , ExtractedFrames > ( ) ;
24302434 for ( const ext of extracted ) extractedMap . set ( ext . videoId , ext ) ;
24312435
0 commit comments