@revideo/2d 0.4.7-alpha.1027 → 0.4.7-five.1022

package/lib/utils/video/mp4-parser-manager.js

@@ -1,31 +1,14 @@
-import { Mp4Parser } from './parser';
+import { FrameExtractor } from './mp4-parser';
 // List of VideoFrameExtractors
 const videoFrameExtractors = new Map();
-export async function dropExtractor(id, filePath) {
-    const extractorId = filePath + '-' + id;
-    const extractor = videoFrameExtractors.get(extractorId);
-    if (extractor) {
-        extractor.close();
-        videoFrameExtractors.delete(extractorId);
-    }
-}
 export async function getFrame(id, filePath, time, fps) {
     // Check if we already have a VideoFrameExtractor for this video
     const extractorId = filePath + '-' + id;
     let extractor = videoFrameExtractors.get(extractorId);
     const frameDuration = 1 / fps;
-    /**
-     * Sometimes, HTMLVideoElement.duration is not accurate, which can lead to the
-     * requested time being greater than the duration.
-     * To prevent this, we clamp the time to the duration reported by the extractor.
-     */
-    const duration = extractor?.getDuration();
-    if (duration && time > duration) {
-        time = duration;
-    }
     const isOldFrame = extractor && Math.abs(time - extractor.getLastTime()) < frameDuration / 2;
     // If time has not changed, return the last frame
-    if (extractor && isOldFrame) {
+    if (isOldFrame) {
         const lastFrame = extractor.getLastFrame();
         if (!lastFrame) {
             throw new Error('No last frame');
@@ -45,11 +28,11 @@ export async function getFrame(id, filePath, time, fps) {
         extractor = undefined;
     }
     if (!extractor) {
-        extractor = new Mp4Parser(filePath, fps, time);
+        extractor = new FrameExtractor(filePath, fps, time);
         await extractor.start();
         videoFrameExtractors.set(extractorId, extractor);
     }
     // Go to the frame that is closest to the requested time
     return extractor.getNextFrame();
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXA0LXBhcnNlci1tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi91dGlscy92aWRlby9tcDQtcGFyc2VyLW1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLFNBQVMsRUFBQyxNQUFNLFVBQVUsQ0FBQztBQUVuQywrQkFBK0I7QUFDL0IsTUFBTSxvQkFBb0IsR0FBRyxJQUFJLEdBQUcsRUFBcUIsQ0FBQztBQUUxRCxNQUFNLENBQUMsS0FBSyxVQUFVLGFBQWEsQ0FBQyxFQUFVLEVBQUUsUUFBZ0I7SUFDOUQsTUFBTSxXQUFXLEdBQUcsUUFBUSxHQUFHLEdBQUcsR0FBRyxFQUFFLENBQUM7SUFDeEMsTUFBTSxTQUFTLEdBQUcsb0JBQW9CLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3hELElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDbEIsb0JBQW9CLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQzNDLENBQUM7QUFDSCxDQUFDO0FBRUQsTUFBTSxDQUFDLEtBQUssVUFBVSxRQUFRLENBQzVCLEVBQVUsRUFDVixRQUFnQixFQUNoQixJQUFZLEVBQ1osR0FBVztJQUVYLGdFQUFnRTtJQUNoRSxNQUFNLFdBQVcsR0FBRyxRQUFRLEdBQUcsR0FBRyxHQUFHLEVBQUUsQ0FBQztJQUN4QyxJQUFJLFNBQVMsR0FBRyxvQkFBb0IsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUM7SUFFdEQsTUFBTSxhQUFhLEdBQUcsQ0FBQyxHQUFHLEdBQUcsQ0FBQztJQUU5Qjs7OztPQUlHO0lBQ0gsTUFBTSxRQUFRLEdBQUcsU0FBUyxFQUFFLFdBQVcsRUFBRSxDQUFDO0lBQzFDLElBQUksUUFBUSxJQUFJLElBQUksR0FBRyxRQUFRLEVBQUUsQ0FBQztRQUNoQyxJQUFJLEdBQUcsUUFBUSxDQUFDO0lBQ2xCLENBQUM7SUFFRCxNQUFNLFVBQVUsR0FDZCxTQUFTLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEdBQUcsU0FBUyxDQUFDLFdBQVcsRUFBRSxDQUFDLEdBQUcsYUFBYSxHQUFHLENBQUMsQ0FBQztJQUU1RSxpREFBaUQ7SUFDakQsSUFBSSxTQUFTLElBQUksVUFBVSxFQUFFLENBQUM7UUFDNUIsTUFBTSxTQUFTLEdBQUcsU0FBUyxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQzNDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNmLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDbkMsQ0FBQztRQUVELE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFRCxrRUFBa0U7SUFDbEUsSUFBSSxTQUFTLElBQUksSUFBSSxHQUFHLGFBQWEsR0FBRyxTQUFTLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQztRQUM1RCxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDbEIsb0JBQW9CLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3pDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDeEIsQ0FBQztJQUVELHFFQUFxRTtJQUNyRSxJQUFJLFNBQVMsSUFBSSxJQUFJLEdBQUcsU0FBUyxDQUFDLE9BQU8sRUFBRSxHQUFHLGFBQWEsRUFBRSxDQUFDO1FBQzVELFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNsQixvQkFBb0IsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDekMsU0FBUyxHQUFHLFNBQVMsQ0FBQztJQUN4QixDQUFDO0lBRUQsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1FBQ2YsU0FBUyxHQUFHLElBQUksU0FBUyxDQUFDLFFBQVEsRUFBRSxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDL0MsTUFBTSxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDeEIsb0JBQW9CLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQsd0RBQXdEO0lBQ3hELE9BQU8sU0FBUyxDQUFDLFlBQVksRUFBRSxDQUFDO0FBQ2xDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXA0LXBhcnNlci1tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi91dGlscy92aWRlby9tcDQtcGFyc2VyLW1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLGNBQWMsRUFBQyxNQUFNLGNBQWMsQ0FBQztBQUU1QywrQkFBK0I7QUFDL0IsTUFBTSxvQkFBb0IsR0FBRyxJQUFJLEdBQUcsRUFBMEIsQ0FBQztBQUUvRCxNQUFNLENBQUMsS0FBSyxVQUFVLFFBQVEsQ0FDNUIsRUFBVSxFQUNWLFFBQWdCLEVBQ2hCLElBQVksRUFDWixHQUFXO0lBRVgsZ0VBQWdFO0lBQ2hFLE1BQU0sV0FBVyxHQUFHLFFBQVEsR0FBRyxHQUFHLEdBQUcsRUFBRSxDQUFDO0lBQ3hDLElBQUksU0FBUyxHQUFHLG9CQUFvQixDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUV0RCxNQUFNLGFBQWEsR0FBRyxDQUFDLEdBQUcsR0FBRyxDQUFDO0lBRTlCLE1BQU0sVUFBVSxHQUNkLFNBQVMsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksR0FBRyxTQUFTLENBQUMsV0FBVyxFQUFFLENBQUMsR0FBRyxhQUFhLEdBQUcsQ0FBQyxDQUFDO0lBRTVFLGlEQUFpRDtJQUNqRCxJQUFJLFVBQVUsRUFBRSxDQUFDO1FBQ2YsTUFBTSxTQUFTLEdBQUcsU0FBVSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQzVDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNmLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDbkMsQ0FBQztRQUVELE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFRCxrRUFBa0U7SUFDbEUsSUFBSSxTQUFTLElBQUksSUFBSSxHQUFHLGFBQWEsR0FBRyxTQUFTLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQztRQUM1RCxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDbEIsb0JBQW9CLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3pDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDeEIsQ0FBQztJQUVELHFFQUFxRTtJQUNyRSxJQUFJLFNBQVMsSUFBSSxJQUFJLEdBQUcsU0FBUyxDQUFDLE9BQU8sRUFBRSxHQUFHLGFBQWEsRUFBRSxDQUFDO1FBQzVELFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNsQixvQkFBb0IsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDekMsU0FBUyxHQUFHLFNBQVMsQ0FBQztJQUN4QixDQUFDO0lBRUQsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1FBQ2YsU0FBUyxHQUFHLElBQUksY0FBYyxDQUFDLFFBQVEsRUFBRSxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDcEQsTUFBTSxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDeEIsb0JBQW9CLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQsd0RBQXdEO0lBQ3hELE9BQU8sU0FBUyxDQUFDLFlBQVksRUFBRSxDQUFDO0FBQ2xDLENBQUMifQ==

package/lib/utils/video/mp4-parser.d.ts

@@ -0,0 +1,63 @@
+export declare class FrameExtractor {
+    private frameBuffer;
+    private closed;
+    private uri;
+    private targetFps;
+    private sourceFps;
+    private startTime;
+    private framesRequested;
+    private framesDue;
+    private lastFrame;
+    private decoder;
+    private file;
+    private readMoreFromResponse;
+    private responseFinished;
+    constructor(uri: string, targetFps: number, startTime: number);
+    /**
+     * Starts streaming the video at the given URI from the given offset.
+     * @param file - MP4Box file. Needs to be created and configured before calling this function.
+     * @param uri - URI of the video file.
+     * @param offset - Offset to start streaming from.
+     * @returns - A function to read more data from the response.
+     */
+    private startStreamingAtOffset;
+    /**
+     * Loads the file at the given URI until it finds the moov box.
+     * Once found, it calls `setConfig` with the video configuration.
+     * @param uri - The URI of the video file.
+     * @param setConfig - Callback to set the video configuration.
+     * @returns
+     */
+    private getFileInfo;
+    /**
+     * Starts the extraction process.
+     */
+    start(): Promise<void>;
+    /**
+     * Called when we are done with the extractor.
+     */
+    close(): void;
+    /**
+     * @returns - Time in seconds of the current frame (using the target FPS)
+     */
+    getTime(): number;
+    /**
+     * @returns - Time in seconds of the last frame (using the target FPS)
+     */
+    getLastTime(): number;
+    getLastFrame(): VideoFrame | null;
+    /**
+     * Called when samples are available on the MP4 file.
+     * Sends chunks to the decoder.
+     */
+    private onSamples;
+    /**
+     * Called when the decoder has a frame ready.
+     * Pushes the frame to the buffer so it can be consumed.
+     */
+    private onFrame;
+    private sum;
+    private populateBuffer;
+    getNextFrame(): Promise<VideoFrame>;
+}
+//# sourceMappingURL=mp4-parser.d.ts.map

package/lib/utils/video/mp4-parser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mp4-parser.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/video/mp4-parser.ts"],"names":[],"mappings":"AA6CA,qBAAa,cAAc;IACzB,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,MAAM,CAAS;IAGvB,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,eAAe,CAAK;IAE5B,OAAO,CAAC,SAAS,CAAK;IAEtB,OAAO,CAAC,SAAS,CAA2B;IAE5C,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,IAAI,CAAM;IAElB,OAAO,CAAC,oBAAoB,CAAuC;IACnE,OAAO,CAAC,gBAAgB,CAAS;gBAEd,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAgBpE;;;;;;OAMG;YACW,sBAAsB;IA8BpC;;;;;;OAMG;YACW,WAAW;IA0DzB;;OAEG;IACU,KAAK;IAiBlB;;OAEG;IACI,KAAK;IAOZ;;OAEG;IACI,OAAO;IAId;;OAEG;IACI,WAAW;IAIX,YAAY;IAInB;;;OAGG;IACH,OAAO,CAAC,SAAS;IAajB;;;OAGG;IACH,OAAO,CAAC,OAAO;IAiBf,OAAO,CAAC,GAAG,CAAK;YAEF,cAAc;IAuBf,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC;CAwCjD"}

package/lib/utils/video/mp4-parser.js

@@ -0,0 +1,264 @@
+import { createFile, DataStream } from 'mp4box';
+// Wraps an MP4Box File as a WritableStream underlying sink.
+class MP4FileSink {
+    constructor(file, setStatus, offset = 0) {
+        this.file = file;
+        this.setStatus = setStatus;
+        this.offset = offset;
+    }
+    write(chunk) {
+        const buffer = new ArrayBuffer(chunk.byteLength);
+        new Uint8Array(buffer).set(chunk);
+        // Inform MP4Box where in the file this chunk is from.
+        buffer.fileStart = this.offset;
+        this.offset += buffer.byteLength;
+        this.setStatus('fetch', (this.offset / 1024 ** 2).toFixed(1) + ' MiB');
+        this.file.appendBuffer(buffer);
+    }
+    close() {
+        this.setStatus('fetch', 'Done');
+        this.file.flush();
+    }
+}
+function description(file, track) {
+    const trak = file.getTrackById(track.id);
+    for (const entry of trak.mdia.minf.stbl.stsd.entries) {
+        const box = entry.avcC || entry.hvcC || entry.vpcC || entry.av1C;
+        if (box) {
+            const stream = new DataStream(undefined, 0, DataStream.BIG_ENDIAN);
+            box.write(stream);
+            return new Uint8Array(stream.buffer, 8); // Remove the box header.
+        }
+    }
+    throw new Error('avcC, hvcC, vpcC, or av1C box not found');
+}
+export class FrameExtractor {
+    constructor(uri, targetFps, startTime) {
+        this.frameBuffer = [];
+        this.closed = false;
+        // Number of frames that have been requested and returned.
+        this.framesRequested = 0;
+        // Number of samples that have been passed to the decoder but have not been output yet.
+        this.framesDue = 0;
+        // Last frame that has been output.
+        this.lastFrame = null;
+        this.readMoreFromResponse = async () => { };
+        this.responseFinished = false;
+        this.sum = 0;
+        this.uri = uri;
+        this.startTime = startTime;
+        // Initialized after the file is loaded.
+        this.sourceFps = 0;
+        this.targetFps = targetFps;
+        this.decoder = new VideoDecoder({
+            output: this.onFrame.bind(this),
+            error(e) {
+                console.error(e);
+            },
+        });
+    }
+    /**
+     * Starts streaming the video at the given URI from the given offset.
+     * @param file - MP4Box file. Needs to be created and configured before calling this function.
+     * @param uri - URI of the video file.
+     * @param offset - Offset to start streaming from.
+     * @returns - A function to read more data from the response.
+     */
+    async startStreamingAtOffset(file, uri, offset) {
+        return fetch(uri, {
+            headers: {
+                /* eslint-disable-next-line @typescript-eslint/naming-convention */
+                Range: `bytes=${offset}-`,
+            },
+        }).then(async (response) => {
+            if (!response.body) {
+                throw new Error('Response body is null');
+            }
+            const reader = response.body.getReader();
+            const sink = new MP4FileSink(file, () => { }, offset);
+            return async () => {
+                return reader.read().then(({ done, value }) => {
+                    // Request is done.
+                    if (done) {
+                        this.responseFinished = true;
+                        this.decoder.flush();
+                        sink.close();
+                        return;
+                    }
+                    sink.write(value);
+                });
+            };
+        });
+    }
+    /**
+     * Loads the file at the given URI until it finds the moov box.
+     * Once found, it calls `setConfig` with the video configuration.
+     * @param uri - The URI of the video file.
+     * @param setConfig - Callback to set the video configuration.
+     * @returns
+     */
+    async getFileInfo(uri, setConfig) {
+        return new Promise((res, rej) => {
+            const file = createFile();
+            let found = false;
+            file.onReady = (info) => {
+                found = true;
+                const track = info.videoTracks[0];
+                const config = {
+                    // Browser doesn't support parsing full vp8 codec (eg: `vp08.00.41.08`),
+                    // they only support `vp8`.
+                    codec: track.codec.startsWith('vp08') ? 'vp8' : track.codec,
+                    codedHeight: track.video.height,
+                    codedWidth: track.video.width,
+                    description: description(file, track),
+                };
+                // Calculate FPS
+                if (track.nb_samples && track.timescale && info.duration) {
+                    this.sourceFps = track.nb_samples / (info.duration / info.timescale);
+                }
+                setConfig(config);
+                file.setExtractionOptions(track.id);
+                file.start();
+                res(file);
+            };
+            return fetch(uri).then(async (response) => {
+                if (!response.body) {
+                    throw new Error('Response body is null');
+                }
+                const reader = response.body.getReader();
+                const sink = new MP4FileSink(file, () => { });
+                while (!found) {
+                    await reader.read().then(({ done, value }) => {
+                        if (done) {
+                            file.flush();
+                            rej('Could not find moov');
+                            return;
+                        }
+                        sink.write(value);
+                    });
+                }
+            });
+        });
+    }
+    /**
+     * Starts the extraction process.
+     */
+    async start() {
+        this.file = await this.getFileInfo(this.uri, this.decoder.configure.bind(this.decoder));
+        this.file.onSamples = this.onSamples.bind(this);
+        const videoTrack = this.file.getInfo().videoTracks[0];
+        const trak = this.file.getTrackById(videoTrack.id);
+        const seekInfo = this.file.seekTrack(this.startTime, true, trak);
+        this.readMoreFromResponse = await this.startStreamingAtOffset(this.file, this.uri, seekInfo.offset);
+    }
+    /**
+     * Called when we are done with the extractor.
+     */
+    close() {
+        this.closed = true;
+        this.file.flush();
+        this.frameBuffer.forEach(frame => frame.close());
+        this.lastFrame?.close();
+    }
+    /**
+     * @returns - Time in seconds of the current frame (using the target FPS)
+     */
+    getTime() {
+        return this.startTime + this.framesRequested / this.targetFps;
+    }
+    /**
+     * @returns - Time in seconds of the last frame (using the target FPS)
+     */
+    getLastTime() {
+        return this.startTime + (this.framesRequested - 1) / this.targetFps;
+    }
+    getLastFrame() {
+        return this.lastFrame;
+    }
+    /**
+     * Called when samples are available on the MP4 file.
+     * Sends chunks to the decoder.
+     */
+    onSamples(_unused1, _unused2, samples) {
+        for (const sample of samples) {
+            const chunk = new EncodedVideoChunk({
+                type: sample.is_sync ? 'key' : 'delta',
+                timestamp: (1e6 * sample.cts) / sample.timescale,
+                duration: (1e6 * sample.duration) / sample.timescale,
+                data: sample.data,
+            });
+            this.framesDue++;
+            this.decoder.decode(chunk);
+        }
+    }
+    /**
+     * Called when the decoder has a frame ready.
+     * Pushes the frame to the buffer so it can be consumed.
+     */
+    onFrame(frame) {
+        this.framesDue--;
+        const timestampInSeconds = frame.timestamp / 1e6;
+        if (timestampInSeconds < this.startTime) {
+            frame.close();
+            return;
+        }
+        // If the extractor is already closed, close the frame.
+        if (this.closed) {
+            frame.close();
+            return;
+        }
+        this.frameBuffer.push(frame);
+    }
+    async populateBuffer() {
+        // Fetch more frames if we don't have any.
+        while (this.frameBuffer.length === 0 && !this.responseFinished) {
+            await this.readMoreFromResponse();
+            await new Promise(res => setTimeout(res, 0));
+        }
+        // Wait for decoder if there are frames due.
+        if (this.frameBuffer.length === 0 && this.framesDue) {
+            let maxIterations = 1000;
+            while (this.frameBuffer.length === 0) {
+                await new Promise(res => setTimeout(res, 10));
+                maxIterations--;
+                if (maxIterations === 0) {
+                    throw new Error('Timed out while waiting for VideoDecoder to produce a frame.');
+                }
+            }
+        }
+    }
+    async getNextFrame() {
+        const samplingRate = this.sourceFps / this.targetFps;
+        this.sum += samplingRate;
+        if (this.sum < 1 && this.lastFrame) {
+            this.framesRequested++;
+            return this.lastFrame;
+        }
+        await this.populateBuffer();
+        // We're at the end of the video and there are no more frames to extract.
+        if (this.frameBuffer.length === 0) {
+            return this.lastFrame;
+        }
+        while (this.sum >= 2) {
+            // Burn frame
+            const frame = this.frameBuffer.shift();
+            frame.close();
+            this.sum -= 1;
+            await this.populateBuffer();
+            if (this.frameBuffer.length === 0) {
+                return this.lastFrame;
+            }
+        }
+        if (this.sum >= 1 || !this.lastFrame) {
+            this.sum -= 1;
+            const frame = this.frameBuffer.shift();
+            this.lastFrame?.close();
+            this.lastFrame = frame;
+            this.framesRequested++;
+            return frame;
+        }
+        // One of the three if statements above is always true.
+        throw new Error('Unreachable code');
+    }
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mp4-parser.js","sourceRoot":"","sources":["../../../src/lib/utils/video/mp4-parser.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revideo/2d",
-  "version": "0.4.7-alpha.1027+35eb93a6",
+  "version": "0.4.7-five.1022+b95d023f",
   "description": "A 2D renderer for revideo",
   "author": "revideo",
   "homepage": "https://re.video/",
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@preact/signals": "^1.2.1",
     "@revideo/internal": "^0.0.0",
-    "@revideo/ui": "^0.4.7-alpha.1027+35eb93a6",
+    "@revideo/ui": "^0.4.7-five.1022+b95d023f",
     "clsx": "^2.0.0",
     "jsdom": "^22.1.0",
     "preact": "^10.19.2",
@@ -40,12 +40,12 @@
     "@codemirror/language": "^6.10.1",
     "@lezer/common": "^1.2.1",
     "@lezer/highlight": "^1.2.0",
-    "@revideo/core": "^0.4.7-alpha.1027+35eb93a6",
+    "@revideo/core": "^0.4.7-five.1022+b95d023f",
     "code-fns": "^0.8.2",
     "hls.js": "^1.5.11",
     "mathjax-full": "^3.2.2",
     "mp4box": "^0.5.2",
     "parse-svg-path": "^0.1.2"
   },
-  "gitHead": "35eb93a6ec1c228cff8be3a97db8cd334a5c088a"
+  "gitHead": "b95d023f8f5f46fb36479f65eae98e04c889d107"
 }

package/src/lib/components/Video.ts

@@ -12,7 +12,7 @@ import {computed, initial, nodeName, signal} from '../decorators';
 import {DesiredLength} from '../partials';
 import {drawImage} from '../utils';
 import {ImageCommunication} from '../utils/video/ffmpeg-client';
-import {dropExtractor, getFrame} from '../utils/video/mp4-parser-manager';
+import {getFrame} from '../utils/video/mp4-parser-manager';
 import {Media, MediaProps} from './Media';
 
 export interface VideoProps extends MediaProps {
@@ -326,12 +326,6 @@ export class Video extends Media {
     ).toString();
   }
 
-  public override remove() {
-    super.remove();
-    dropExtractor(this.key, this.video().src);
-    return this;
-  }
-
   private async detectFileType(): Promise<
     'mp4' | 'webm' | 'hls' | 'mov' | 'unknown'
   > {

package/src/lib/utils/video/mp4-parser-manager.ts

@@ -1,16 +1,7 @@
-import {Mp4Parser} from './parser';
+import {FrameExtractor} from './mp4-parser';
 
 // List of VideoFrameExtractors
-const videoFrameExtractors = new Map<string, Mp4Parser>();
-
-export async function dropExtractor(id: string, filePath: string) {
-  const extractorId = filePath + '-' + id;
-  const extractor = videoFrameExtractors.get(extractorId);
-  if (extractor) {
-    extractor.close();
-    videoFrameExtractors.delete(extractorId);
-  }
-}
+const videoFrameExtractors = new Map<string, FrameExtractor>();
 
 export async function getFrame(
   id: string,
@@ -24,22 +15,12 @@ export async function getFrame(
 
   const frameDuration = 1 / fps;
 
-  /**
-   * Sometimes, HTMLVideoElement.duration is not accurate, which can lead to the
-   * requested time being greater than the duration.
-   * To prevent this, we clamp the time to the duration reported by the extractor.
-   */
-  const duration = extractor?.getDuration();
-  if (duration && time > duration) {
-    time = duration;
-  }
-
   const isOldFrame =
     extractor && Math.abs(time - extractor.getLastTime()) < frameDuration / 2;
 
   // If time has not changed, return the last frame
-  if (extractor && isOldFrame) {
-    const lastFrame = extractor.getLastFrame();
+  if (isOldFrame) {
+    const lastFrame = extractor!.getLastFrame();
     if (!lastFrame) {
       throw new Error('No last frame');
     }
@@ -62,7 +43,7 @@ export async function getFrame(
   }
 
   if (!extractor) {
-    extractor = new Mp4Parser(filePath, fps, time);
+    extractor = new FrameExtractor(filePath, fps, time);
     await extractor.start();
     videoFrameExtractors.set(extractorId, extractor);
   }