@editframe/elements 0.46.4 → 0.47.0

package/dist/elements/EFVideo.d.ts

@@ -2,6 +2,7 @@ import { FrameRenderable, FrameState } from "../preview/FrameController.js";
 import { EFFramegen } from "../EF_FRAMEGEN.js";
 import { EFMedia } from "./EFMedia.js";
 import { RenderToVideoOptions } from "../preview/renderTimegroupToVideo.types.js";
+import { ScrubInputCache } from "./EFMedia/videoTasks/ScrubInputCache.js";
 import * as lit3 from "lit";
 import { PropertyValueMap } from "lit";
 import { VideoSample } from "mediabunny";
@@ -167,6 +168,31 @@ declare class EFVideo extends EFVideo_base implements FrameRenderable {
    * @public
    */
   prefetchScrubSegments(timestamps: number[], onProgress?: (loaded: number, total: number, segmentTimeRange: [number, number]) => void, signal?: AbortSignal): Promise<void>;
+  /**
+   * Warm the scrub BufferedSeekingInput cache for all segments covering [fromMs, toMs].
+   *
+   * Unlike prefetchScrubSegments (which only warms the network layer), this method
+   * constructs BufferedSeekingInput instances for each segment so that subsequent
+   * scrub seeks within the range complete without a network round-trip or BSI
+   * construction overhead.
+   *
+   * Returns a Promise that resolves after the range has been computed and segment
+   * fetches have been kicked off (but before individual fetches complete).
+   * Callers may await this or discard the promise — both are valid.
+   */
+  warmScrubCacheForRange(fromMs: number, toMs: number, signal?: AbortSignal): Promise<void>;
+  /**
+   * Reset per-instance caches and rendition state. Allows tests to force
+   * the scrub fallback path on the next render without clearing the shared
+   * mediaCache (which races with in-flight fetches from other elements).
+   * @public – test-only
+   */
+  clearInstanceCaches(): void;
+  /**
+   * Returns scrub cache statistics for inspection in tests.
+   * @public – test-only
+   */
+  getScrubCacheStats(): ReturnType<ScrubInputCache["getStats"]>;
   /**
    * Clean up resources when component is disconnected
    */

package/dist/elements/EFVideo.js

@@ -14,8 +14,6 @@ import { context, trace } from "@opentelemetry/api";
 import { createRef, ref } from "lit/directives/ref.js";
 
 //#region src/elements/EFVideo.ts
-const mainVideoInputCache = new MainVideoInputCache();
-const scrubInputCache = new ScrubInputCache();
 const log = debug("ef:elements:EFVideo");
 var VideoSeekTask = class {
 	constructor() {
@@ -99,6 +97,8 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 	* Standalone upgrade controller for elements without a timegroup.
 	*/
 	#standaloneUpgradeController = null;
+	#mainVideoInputCache = new MainVideoInputCache();
+	#scrubInputCache = new ScrubInputCache();
 	/**
 	* Set to true while renderToVideo is executing to suppress background
 	* quality upgrade tasks that would race with the render pipeline.
@@ -131,6 +131,20 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 	getFrameState(_timeMs) {
 		const sourceTimeMs = this.currentSourceTimeMs;
 		const hasCache = this.#cachedVideoSample !== void 0 && this.#cachedVideoSampleTimeMs === sourceTimeMs;
+		if (this.#currentRenditionId === "scrub" && !this.rootTimegroup?.isRenderClone) {
+			const mediaEngine = this.mediaEngineTask.value;
+			if (mediaEngine) {
+				const mainTrack = mediaEngine.tracks.video;
+				if (mainTrack) {
+					const mainSegmentId = mediaEngine.index.segmentAt(sourceTimeMs, mainTrack);
+					if (mainSegmentId !== void 0 && mediaEngine.transport.isCached(mainSegmentId, mainTrack)) return {
+						needsPreparation: true,
+						isReady: false,
+						priority: PRIORITY_VIDEO
+					};
+				}
+			}
+		}
 		return {
 			needsPreparation: !hasCache,
 			isReady: hasCache,
@@ -162,10 +176,10 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 			signal.throwIfAborted();
 			try {
 				const videoSample = await this.#fetchVideoSampleForFrame(mediaEngine, sourceTimeMs, signal);
-				signal.throwIfAborted();
 				this.#cachedVideoSample = videoSample;
 				this.#cachedVideoSampleTimeMs = sourceTimeMs;
 				this.unifiedVideoSeekTask.complete(videoSample);
+				signal.throwIfAborted();
 			} catch (error) {
 				if (error instanceof DOMException && error.name === "AbortError") {
 					this.unifiedVideoSeekTask.abort();
@@ -189,13 +203,15 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 	*/
 	renderFrame(_timeMs) {
 		const sourceTimeMs = this.currentSourceTimeMs;
-		if (this.#cachedVideoSampleTimeMs === sourceTimeMs && this.#cachedVideoSample) {
+		if (this.#cachedVideoSampleTimeMs === sourceTimeMs && this.#cachedVideoSample) try {
 			const videoFrame = this.#cachedVideoSample.toVideoFrame();
 			try {
 				this.displayFrame(videoFrame, sourceTimeMs);
 			} finally {
 				videoFrame.close();
 			}
+		} catch {
+			this.#cachedVideoSample = void 0;
 		}
 		if (!this.parentTimegroup) updateAnimations(this);
 	}
@@ -240,25 +256,16 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 		if (!scrubTrack) return;
 		const segmentId = mediaEngine.index.segmentAt(desiredSeekTimeMs, scrubTrack);
 		if (segmentId === void 0) return;
-		const scrubInput = await scrubInputCache.getOrCreateInput(mediaEngine.src, segmentId, async () => {
+		const scrubInput = await this.#scrubInputCache.getOrCreateInput(mediaEngine.src, segmentId, async () => {
 			let initSegment;
 			let mediaSegment;
 			try {
-				const initP = mediaEngine.transport.fetchInitSegment(scrubTrack, signal);
-				const mediaP = mediaEngine.transport.fetchMediaSegment(segmentId, scrubTrack, signal);
-				initP.catch(() => {});
-				mediaP.catch(() => {});
-				[initSegment, mediaSegment] = await Promise.all([initP, mediaP]);
+				[initSegment, mediaSegment] = await Promise.all([mediaEngine.transport.fetchInitSegment(scrubTrack), mediaEngine.transport.fetchMediaSegment(segmentId, scrubTrack)]);
 			} catch (error) {
-				if (error instanceof DOMException && error.name === "AbortError") throw error;
 				return;
 			}
 			if (!initSegment || !mediaSegment) return;
-			signal.throwIfAborted();
-			const combinedBlob = new Blob([initSegment, mediaSegment]);
-			signal.throwIfAborted();
-			const arrayBuffer = await combinedBlob.arrayBuffer();
-			signal.throwIfAborted();
+			const arrayBuffer = await new Blob([initSegment, mediaSegment]).arrayBuffer();
 			const { BufferedSeekingInput } = await import("./EFMedia/BufferedSeekingInput.js");
 			return new BufferedSeekingInput(arrayBuffer, {
 				videoBufferSize: EFMedia.VIDEO_SAMPLE_BUFFER_SIZE,
@@ -281,26 +288,19 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 		if (!videoTrack) return;
 		const segmentId = mediaEngine.index.segmentAt(desiredSeekTimeMs, videoTrack);
 		if (segmentId === void 0) return;
-		const mainInput = await mainVideoInputCache.getOrCreateInput(mediaEngine.src, segmentId, String(videoTrack.id), async () => {
+		const mainInput = await this.#mainVideoInputCache.getOrCreateInput(mediaEngine.src, segmentId, String(videoTrack.id), async () => {
 			let initSegment;
 			let mediaSegment;
 			try {
-				const initP = mediaEngine.transport.fetchInitSegment(videoTrack, signal);
-				const mediaP = mediaEngine.transport.fetchMediaSegment(segmentId, videoTrack, signal);
-				initP.catch(() => {});
-				mediaP.catch(() => {});
+				const initP = mediaEngine.transport.fetchInitSegment(videoTrack);
+				const mediaP = mediaEngine.transport.fetchMediaSegment(segmentId, videoTrack);
 				[initSegment, mediaSegment] = await Promise.all([initP, mediaP]);
 			} catch (error) {
-				if (error instanceof DOMException && error.name === "AbortError") throw error;
 				if (error instanceof Error && (error.message.includes("401") || error.message.includes("UNAUTHORIZED") || error.message.includes("Failed to fetch") || error.message.includes("File not found") || error.message.includes("Media segment not found") || error.message.includes("Init segment not found") || error.message.includes("Track not found"))) return;
 				throw error;
 			}
 			if (!initSegment || !mediaSegment) return;
-			signal.throwIfAborted();
-			const combinedBlob = new Blob([initSegment, mediaSegment]);
-			signal.throwIfAborted();
-			const arrayBuffer = await combinedBlob.arrayBuffer();
-			signal.throwIfAborted();
+			const arrayBuffer = await new Blob([initSegment, mediaSegment]).arrayBuffer();
 			const { BufferedSeekingInput } = await import("./EFMedia/BufferedSeekingInput.js");
 			return new BufferedSeekingInput(arrayBuffer, {
 				videoBufferSize: EFMedia.VIDEO_SAMPLE_BUFFER_SIZE,
@@ -335,6 +335,10 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 	updated(changedProperties) {
 		super.updated(changedProperties);
 		if (changedProperties.has("src") || changedProperties.has("fileId")) {
+			this.#cachedVideoSample = void 0;
+			this.#cachedVideoSampleTimeMs = void 0;
+			this.#mainVideoInputCache.clear();
+			this.#scrubInputCache.clear();
 			this.#invalidateUpgradeState("src-change");
 			this.#prewarmQualityUpgrade();
 		}
@@ -361,8 +365,8 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 		if (!this.src && !this.fileId) return;
 		this.getMediaEngine().then((engine) => {
 			if (!engine) return;
-			const sourceInMs = this.sourceInMs ?? 0;
-			this.#maybeScheduleQualityUpgrade(engine, sourceInMs);
+			const targetTimeMs = this.currentSourceTimeMs ?? this.sourceInMs ?? 0;
+			this.#maybeScheduleQualityUpgrade(engine, targetTimeMs);
 		}).catch(() => {});
 	}
 	render() {
@@ -570,9 +574,9 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 				if (!videoTrack) throw new Error("No video rendition available");
 				const segmentId = mediaEngine.index.segmentAt(sourceTimeMs, videoTrack);
 				if (segmentId === void 0) throw new Error(`Cannot compute segment ID for time ${sourceTimeMs}ms`);
-				const seekingInput = await mainVideoInputCache.getOrCreateInput(mediaEngine.src, segmentId, String(videoTrack.id), async () => {
-					const initP = mediaEngine.transport.fetchInitSegment(videoTrack, signal);
-					const mediaP = mediaEngine.transport.fetchMediaSegment(segmentId, videoTrack, signal);
+				const seekingInput = await this.#mainVideoInputCache.getOrCreateInput(mediaEngine.src, segmentId, String(videoTrack.id), async () => {
+					const initP = mediaEngine.transport.fetchInitSegment(videoTrack);
+					const mediaP = mediaEngine.transport.fetchMediaSegment(segmentId, videoTrack);
 					initP.catch(() => {});
 					mediaP.catch(() => {});
 					const [initSegment, mediaSegment] = await Promise.all([initP, mediaP]);
@@ -598,9 +602,9 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 				});
 				const segmentId = mediaEngine.index.segmentAt(sourceTimeMs, scrubTrack);
 				if (segmentId === void 0) throw new Error(`Cannot compute scrub segment ID for time ${sourceTimeMs}ms`);
-				const seekingInput = await scrubInputCache.getOrCreateInput(mediaEngine.src, segmentId, async () => {
-					const initP = mediaEngine.transport.fetchInitSegment(scrubTrack, signal);
-					const mediaP = mediaEngine.transport.fetchMediaSegment(segmentId, scrubTrack, signal);
+				const seekingInput = await this.#scrubInputCache.getOrCreateInput(mediaEngine.src, segmentId, async () => {
+					const initP = mediaEngine.transport.fetchInitSegment(scrubTrack);
+					const mediaP = mediaEngine.transport.fetchMediaSegment(segmentId, scrubTrack);
 					initP.catch(() => {});
 					mediaP.catch(() => {});
 					const [initSegment, mediaSegment] = await Promise.all([initP, mediaP]);
@@ -747,11 +751,56 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 		log(`prefetchScrubSegments: complete`);
 	}
 	/**
+	* Warm the scrub BufferedSeekingInput cache for all segments covering [fromMs, toMs].
+	*
+	* Unlike prefetchScrubSegments (which only warms the network layer), this method
+	* constructs BufferedSeekingInput instances for each segment so that subsequent
+	* scrub seeks within the range complete without a network round-trip or BSI
+	* construction overhead.
+	*
+	* Returns a Promise that resolves after the range has been computed and segment
+	* fetches have been kicked off (but before individual fetches complete).
+	* Callers may await this or discard the promise — both are valid.
+	*/
+	async warmScrubCacheForRange(fromMs, toMs, signal) {
+		const mediaEngine = await this.getMediaEngine(signal);
+		if (!mediaEngine) return;
+		if (signal?.aborted) return;
+		const scrubTrack = mediaEngine.tracks.scrub;
+		if (!scrubTrack) return;
+		const segments = mediaEngine.index.segmentsInRange(fromMs, toMs, scrubTrack);
+		if (segments.length === 0) return;
+		const { src } = mediaEngine;
+		for (const { segmentId } of segments) {
+			if (signal?.aborted) return;
+			const capturedSegmentId = segmentId;
+			this.#scrubInputCache.getOrCreateInput(src, capturedSegmentId, async () => {
+				if (signal?.aborted) return void 0;
+				let initSegment;
+				let mediaSegment;
+				try {
+					[initSegment, mediaSegment] = await Promise.all([mediaEngine.transport.fetchInitSegment(scrubTrack), mediaEngine.transport.fetchMediaSegment(capturedSegmentId, scrubTrack)]);
+				} catch {
+					return;
+				}
+				if (!initSegment || !mediaSegment) return void 0;
+				const arrayBuffer = await new Blob([initSegment, mediaSegment]).arrayBuffer();
+				const { BufferedSeekingInput } = await import("./EFMedia/BufferedSeekingInput.js");
+				return new BufferedSeekingInput(arrayBuffer, {
+					videoBufferSize: EFMedia.VIDEO_SAMPLE_BUFFER_SIZE,
+					audioBufferSize: EFMedia.AUDIO_SAMPLE_BUFFER_SIZE,
+					startTimeOffsetMs: scrubTrack.startTimeOffsetMs
+				});
+			}).catch(() => {});
+		}
+	}
+	/**
 	* Maybe schedule quality upgrade tasks for this element.
 	* Called when returning a scrub sample - checks if state has changed and submits tasks.
 	*/
 	#maybeScheduleQualityUpgrade(mediaEngine, sourceTimeMs) {
 		if (this.#renderingToVideo) return;
+		if (this.rootTimegroup?.isRenderClone) return;
 		const mainTrack = mediaEngine.tracks.video;
 		if (!mainTrack) return;
 		const segmentId = mediaEngine.index.segmentAt(sourceTimeMs, mainTrack);
@@ -766,12 +815,17 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 		}
 		const segments = this.#computeLookaheadSegments(mediaEngine, sourceTimeMs, mainTrack);
 		if (segments.length === 0) return;
+		const capturedSrc = mediaEngine.src;
 		const tasks = segments.map((seg) => ({
 			key: `${this.#upgradeOwnerId}:${seg.segmentId}:${mainTrack.id}`,
 			fetch: async (signal) => {
 				await mediaEngine.transport.fetchInitSegment(mainTrack, signal);
 				await mediaEngine.transport.fetchMediaSegment(seg.segmentId, mainTrack, signal);
 			},
+			isCached: () => {
+				if (this.mediaEngineTask?.value?.src !== capturedSrc) return false;
+				return mediaEngine.transport.isCached(seg.segmentId, mainTrack);
+			},
 			deadlineMs: seg.deadlineMs,
 			owner: this.#upgradeOwnerId
 		}));
@@ -824,7 +878,8 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 					await task.fetch(signal);
 				} catch {}
 			}
-			if (!signal.aborted) this.playbackController?.runThrottledFrameTask().catch(() => {});
+			if (!signal.aborted) if (this.rootTimegroup) this.rootTimegroup.requestFrameRender();
+			else this.playbackController?.runThrottledFrameTask().catch(() => {});
 		})().catch(() => {});
 	}
 	/**
@@ -835,10 +890,33 @@ let EFVideo = class EFVideo$1 extends TWMixin(EFMedia) {
 		this.#upgradeState = null;
 	}
 	/**
+	* Reset per-instance caches and rendition state. Allows tests to force
+	* the scrub fallback path on the next render without clearing the shared
+	* mediaCache (which races with in-flight fetches from other elements).
+	* @public – test-only
+	*/
+	clearInstanceCaches() {
+		this.#cachedVideoSample = void 0;
+		this.#cachedVideoSampleTimeMs = void 0;
+		this.#currentRenditionId = void 0;
+		this.#upgradeState = null;
+		this.#mainVideoInputCache.clear();
+		this.#scrubInputCache.clear();
+	}
+	/**
+	* Returns scrub cache statistics for inspection in tests.
+	* @public – test-only
+	*/
+	getScrubCacheStats() {
+		return this.#scrubInputCache.getStats();
+	}
+	/**
 	* Clean up resources when component is disconnected
 	*/
 	disconnectedCallback() {
 		super.disconnectedCallback();
+		this.#cachedVideoSample = void 0;
+		this.#cachedVideoSampleTimeMs = void 0;
 		this.#delayedLoadingState.clearAllLoading();
 		this.#invalidateUpgradeState("disconnect");
 		this.#standaloneUpgradeController?.abort();