@revideo/2d 0.4.2-turtle.993 → 0.4.3-alpha.1001
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/editor/editor/tsconfig.build.tsbuildinfo +1 -1
- package/lib/components/Video.d.ts +9 -10
- package/lib/components/Video.d.ts.map +1 -1
- package/lib/components/Video.js +41 -53
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/utils/video/ffmpeg-client.d.ts +7 -0
- package/lib/utils/video/ffmpeg-client.d.ts.map +1 -0
- package/lib/utils/video/ffmpeg-client.js +45 -0
- package/lib/utils/video/mp4-parser-manager.d.ts +2 -0
- package/lib/utils/video/mp4-parser-manager.d.ts.map +1 -0
- package/lib/utils/video/mp4-parser-manager.js +38 -0
- package/lib/utils/video/mp4-parser.d.ts +63 -0
- package/lib/utils/video/mp4-parser.d.ts.map +1 -0
- package/lib/utils/video/mp4-parser.js +262 -0
- package/package.json +5 -4
- package/src/lib/components/Video.ts +60 -81
- package/src/lib/utils/video/declarations.d.ts +1 -0
- package/src/lib/utils/video/ffmpeg-client.ts +64 -0
- package/src/lib/utils/video/mp4-parser-manager.ts +53 -0
- package/src/lib/utils/video/mp4-parser.ts +338 -0
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { FrameExtractor } from './mp4-parser';
|
|
2
|
+
// List of VideoFrameExtractors
|
|
3
|
+
const videoFrameExtractors = new Map();
|
|
4
|
+
export async function getFrame(id, filePath, time, fps) {
|
|
5
|
+
// Check if we already have a VideoFrameExtractor for this video
|
|
6
|
+
const extractorId = filePath + '-' + id;
|
|
7
|
+
let extractor = videoFrameExtractors.get(extractorId);
|
|
8
|
+
const frameDuration = 1 / fps;
|
|
9
|
+
const isOldFrame = extractor && Math.abs(time - extractor.getLastTime()) < frameDuration / 2;
|
|
10
|
+
// If time has not changed, return the last frame
|
|
11
|
+
if (isOldFrame) {
|
|
12
|
+
const lastFrame = extractor.getLastFrame();
|
|
13
|
+
if (!lastFrame) {
|
|
14
|
+
throw new Error('No last frame');
|
|
15
|
+
}
|
|
16
|
+
return lastFrame;
|
|
17
|
+
}
|
|
18
|
+
// If the video has skipped back we need to create a new extractor
|
|
19
|
+
if (extractor && time + frameDuration < extractor.getTime()) {
|
|
20
|
+
extractor.close();
|
|
21
|
+
videoFrameExtractors.delete(extractorId);
|
|
22
|
+
extractor = undefined;
|
|
23
|
+
}
|
|
24
|
+
// If the video has skipped forward we need to create a new extractor
|
|
25
|
+
if (extractor && time > extractor.getTime() + frameDuration) {
|
|
26
|
+
extractor.close();
|
|
27
|
+
videoFrameExtractors.delete(extractorId);
|
|
28
|
+
extractor = undefined;
|
|
29
|
+
}
|
|
30
|
+
if (!extractor) {
|
|
31
|
+
extractor = new FrameExtractor(filePath, fps, time);
|
|
32
|
+
await extractor.start();
|
|
33
|
+
videoFrameExtractors.set(extractorId, extractor);
|
|
34
|
+
}
|
|
35
|
+
// Go to the frame that is closest to the requested time
|
|
36
|
+
return extractor.getNextFrame();
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXA0LXBhcnNlci1tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi91dGlscy92aWRlby9tcDQtcGFyc2VyLW1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLGNBQWMsRUFBQyxNQUFNLGNBQWMsQ0FBQztBQUU1QywrQkFBK0I7QUFDL0IsTUFBTSxvQkFBb0IsR0FBRyxJQUFJLEdBQUcsRUFBMEIsQ0FBQztBQUUvRCxNQUFNLENBQUMsS0FBSyxVQUFVLFFBQVEsQ0FDNUIsRUFBVSxFQUNWLFFBQWdCLEVBQ2hCLElBQVksRUFDWixHQUFXO0lBRVgsZ0VBQWdFO0lBQ2hFLE1BQU0sV0FBVyxHQUFHLFFBQVEsR0FBRyxHQUFHLEdBQUcsRUFBRSxDQUFDO0lBQ3hDLElBQUksU0FBUyxHQUFHLG9CQUFvQixDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUV0RCxNQUFNLGFBQWEsR0FBRyxDQUFDLEdBQUcsR0FBRyxDQUFDO0lBRTlCLE1BQU0sVUFBVSxHQUNkLFNBQVMsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksR0FBRyxTQUFTLENBQUMsV0FBVyxFQUFFLENBQUMsR0FBRyxhQUFhLEdBQUcsQ0FBQyxDQUFDO0lBRTVFLGlEQUFpRDtJQUNqRCxJQUFJLFVBQVUsRUFBRSxDQUFDO1FBQ2YsTUFBTSxTQUFTLEdBQUcsU0FBVSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQzVDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNmLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDbkMsQ0FBQztRQUVELE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFRCxrRUFBa0U7SUFDbEUsSUFBSSxTQUFTLElBQUksSUFBSSxHQUFHLGFBQWEsR0FBRyxTQUFTLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQztRQUM1RCxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDbEIsb0JBQW9CLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3pDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDeEIsQ0FBQztJQUVELHFFQUFxRTtJQUNyRSxJQUFJLFNBQVMsSUFBSSxJQUFJLEdBQUcsU0FBUyxDQUFDLE9BQU8sRUFBRSxHQUFHLGFBQWEsRUFBRSxDQUFDO1FBQzVELFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNsQixvQkFBb0IsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDekMsU0FBUyxHQUFHLFNBQVMsQ0FBQztJQUN4QixDQUFDO0lBRUQsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1FBQ2YsU0FBUyxHQUFHLElBQUksY0FBYyxDQUFDLFFBQVEsRUFBRSxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDcEQsTUFBTSxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDeEIsb0JBQW9CLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQsd0RBQXdEO0lBQ3hELE9BQU8sU0FBUyxDQUFDLFlBQVksRUFBRSxDQUFDO0FBQ2xDLENBQUMifQ==
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
export declare class FrameExtractor {
|
|
2
|
+
private frameBuffer;
|
|
3
|
+
private closed;
|
|
4
|
+
private uri;
|
|
5
|
+
private targetFps;
|
|
6
|
+
private sourceFps;
|
|
7
|
+
private startTime;
|
|
8
|
+
private framesRequested;
|
|
9
|
+
private framesDue;
|
|
10
|
+
private lastFrame;
|
|
11
|
+
private decoder;
|
|
12
|
+
private file;
|
|
13
|
+
private readMoreFromResponse;
|
|
14
|
+
private responseFinished;
|
|
15
|
+
constructor(uri: string, targetFps: number, startTime: number);
|
|
16
|
+
/**
|
|
17
|
+
* Starts streaming the video at the given URI from the given offset.
|
|
18
|
+
* @param file - MP4Box file. Needs to be created and configured before calling this function.
|
|
19
|
+
* @param uri - URI of the video file.
|
|
20
|
+
* @param offset - Offset to start streaming from.
|
|
21
|
+
* @returns - A function to read more data from the response.
|
|
22
|
+
*/
|
|
23
|
+
private startStreamingAtOffset;
|
|
24
|
+
/**
|
|
25
|
+
* Loads the file at the given URI until it finds the moov box.
|
|
26
|
+
* Once found, it calls `setConfig` with the video configuration.
|
|
27
|
+
* @param uri - The URI of the video file.
|
|
28
|
+
* @param setConfig - Callback to set the video configuration.
|
|
29
|
+
* @returns
|
|
30
|
+
*/
|
|
31
|
+
private getFileInfo;
|
|
32
|
+
/**
|
|
33
|
+
* Starts the extraction process.
|
|
34
|
+
*/
|
|
35
|
+
start(): Promise<void>;
|
|
36
|
+
/**
|
|
37
|
+
* Called when we are done with the extractor.
|
|
38
|
+
*/
|
|
39
|
+
close(): void;
|
|
40
|
+
/**
|
|
41
|
+
* @returns - Time in seconds of the current frame (using the target FPS)
|
|
42
|
+
*/
|
|
43
|
+
getTime(): number;
|
|
44
|
+
/**
|
|
45
|
+
* @returns - Time in seconds of the last frame (using the target FPS)
|
|
46
|
+
*/
|
|
47
|
+
getLastTime(): number;
|
|
48
|
+
getLastFrame(): VideoFrame | null;
|
|
49
|
+
/**
|
|
50
|
+
* Called when samples are available on the MP4 file.
|
|
51
|
+
* Sends chunks to the decoder.
|
|
52
|
+
*/
|
|
53
|
+
private onSamples;
|
|
54
|
+
/**
|
|
55
|
+
* Called when the decoder has a frame ready.
|
|
56
|
+
* Pushes the frame to the buffer so it can be consumed.
|
|
57
|
+
*/
|
|
58
|
+
private onFrame;
|
|
59
|
+
private sum;
|
|
60
|
+
private populateBuffer;
|
|
61
|
+
getNextFrame(): Promise<VideoFrame>;
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=mp4-parser.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
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;IAelB;;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"}
|
|
@@ -0,0 +1,262 @@
|
|
|
1
|
+
import { createFile, DataStream } from 'mp4box';
|
|
2
|
+
// Wraps an MP4Box File as a WritableStream underlying sink.
|
|
3
|
+
class MP4FileSink {
|
|
4
|
+
constructor(file, setStatus, offset = 0) {
|
|
5
|
+
this.file = file;
|
|
6
|
+
this.setStatus = setStatus;
|
|
7
|
+
this.offset = offset;
|
|
8
|
+
}
|
|
9
|
+
write(chunk) {
|
|
10
|
+
const buffer = new ArrayBuffer(chunk.byteLength);
|
|
11
|
+
new Uint8Array(buffer).set(chunk);
|
|
12
|
+
// Inform MP4Box where in the file this chunk is from.
|
|
13
|
+
buffer.fileStart = this.offset;
|
|
14
|
+
this.offset += buffer.byteLength;
|
|
15
|
+
this.setStatus('fetch', (this.offset / 1024 ** 2).toFixed(1) + ' MiB');
|
|
16
|
+
this.file.appendBuffer(buffer);
|
|
17
|
+
}
|
|
18
|
+
close() {
|
|
19
|
+
this.setStatus('fetch', 'Done');
|
|
20
|
+
this.file.flush();
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
function description(file, track) {
|
|
24
|
+
const trak = file.getTrackById(track.id);
|
|
25
|
+
for (const entry of trak.mdia.minf.stbl.stsd.entries) {
|
|
26
|
+
const box = entry.avcC || entry.hvcC || entry.vpcC || entry.av1C;
|
|
27
|
+
if (box) {
|
|
28
|
+
const stream = new DataStream(undefined, 0, DataStream.BIG_ENDIAN);
|
|
29
|
+
box.write(stream);
|
|
30
|
+
return new Uint8Array(stream.buffer, 8); // Remove the box header.
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
throw new Error('avcC, hvcC, vpcC, or av1C box not found');
|
|
34
|
+
}
|
|
35
|
+
export class FrameExtractor {
|
|
36
|
+
constructor(uri, targetFps, startTime) {
|
|
37
|
+
this.frameBuffer = [];
|
|
38
|
+
this.closed = false;
|
|
39
|
+
// Number of frames that have been requested and returned.
|
|
40
|
+
this.framesRequested = 0;
|
|
41
|
+
// Number of samples that have been passed to the decoder but have not been output yet.
|
|
42
|
+
this.framesDue = 0;
|
|
43
|
+
// Last frame that has been output.
|
|
44
|
+
this.lastFrame = null;
|
|
45
|
+
this.readMoreFromResponse = async () => { };
|
|
46
|
+
this.responseFinished = false;
|
|
47
|
+
this.sum = 0;
|
|
48
|
+
this.uri = uri;
|
|
49
|
+
this.startTime = startTime;
|
|
50
|
+
// Initialized after the file is loaded.
|
|
51
|
+
this.sourceFps = 0;
|
|
52
|
+
this.targetFps = targetFps;
|
|
53
|
+
this.decoder = new VideoDecoder({
|
|
54
|
+
output: this.onFrame.bind(this),
|
|
55
|
+
error(e) {
|
|
56
|
+
console.error(e);
|
|
57
|
+
},
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Starts streaming the video at the given URI from the given offset.
|
|
62
|
+
* @param file - MP4Box file. Needs to be created and configured before calling this function.
|
|
63
|
+
* @param uri - URI of the video file.
|
|
64
|
+
* @param offset - Offset to start streaming from.
|
|
65
|
+
* @returns - A function to read more data from the response.
|
|
66
|
+
*/
|
|
67
|
+
async startStreamingAtOffset(file, uri, offset) {
|
|
68
|
+
return fetch(uri, {
|
|
69
|
+
headers: {
|
|
70
|
+
/* eslint-disable-next-line @typescript-eslint/naming-convention */
|
|
71
|
+
Range: `bytes=${offset}-`,
|
|
72
|
+
},
|
|
73
|
+
}).then(async (response) => {
|
|
74
|
+
if (!response.body) {
|
|
75
|
+
throw new Error('Response body is null');
|
|
76
|
+
}
|
|
77
|
+
const reader = response.body.getReader();
|
|
78
|
+
const sink = new MP4FileSink(file, () => { }, offset);
|
|
79
|
+
return async () => {
|
|
80
|
+
return reader.read().then(({ done, value }) => {
|
|
81
|
+
// Request is done.
|
|
82
|
+
if (done) {
|
|
83
|
+
this.responseFinished = true;
|
|
84
|
+
this.decoder.flush();
|
|
85
|
+
sink.close();
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
sink.write(value);
|
|
89
|
+
});
|
|
90
|
+
};
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Loads the file at the given URI until it finds the moov box.
|
|
95
|
+
* Once found, it calls `setConfig` with the video configuration.
|
|
96
|
+
* @param uri - The URI of the video file.
|
|
97
|
+
* @param setConfig - Callback to set the video configuration.
|
|
98
|
+
* @returns
|
|
99
|
+
*/
|
|
100
|
+
async getFileInfo(uri, setConfig) {
|
|
101
|
+
return new Promise((res, rej) => {
|
|
102
|
+
const file = createFile();
|
|
103
|
+
let found = false;
|
|
104
|
+
file.onReady = (info) => {
|
|
105
|
+
found = true;
|
|
106
|
+
const track = info.videoTracks[0];
|
|
107
|
+
const config = {
|
|
108
|
+
// Browser doesn't support parsing full vp8 codec (eg: `vp08.00.41.08`),
|
|
109
|
+
// they only support `vp8`.
|
|
110
|
+
codec: track.codec.startsWith('vp08') ? 'vp8' : track.codec,
|
|
111
|
+
codedHeight: track.video.height,
|
|
112
|
+
codedWidth: track.video.width,
|
|
113
|
+
description: description(file, track),
|
|
114
|
+
};
|
|
115
|
+
// Calculate FPS
|
|
116
|
+
if (track.nb_samples && track.timescale && info.duration) {
|
|
117
|
+
this.sourceFps = track.nb_samples / (info.duration / info.timescale);
|
|
118
|
+
}
|
|
119
|
+
setConfig(config);
|
|
120
|
+
file.setExtractionOptions(track.id);
|
|
121
|
+
file.start();
|
|
122
|
+
res(file);
|
|
123
|
+
};
|
|
124
|
+
return fetch(uri).then(async (response) => {
|
|
125
|
+
if (!response.body) {
|
|
126
|
+
throw new Error('Response body is null');
|
|
127
|
+
}
|
|
128
|
+
const reader = response.body.getReader();
|
|
129
|
+
const sink = new MP4FileSink(file, () => { });
|
|
130
|
+
while (!found) {
|
|
131
|
+
await reader.read().then(({ done, value }) => {
|
|
132
|
+
if (done) {
|
|
133
|
+
file.flush();
|
|
134
|
+
rej('Could not find moov');
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
sink.write(value);
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
});
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
/**
|
|
144
|
+
* Starts the extraction process.
|
|
145
|
+
*/
|
|
146
|
+
async start() {
|
|
147
|
+
this.file = await this.getFileInfo(this.uri, this.decoder.configure.bind(this.decoder));
|
|
148
|
+
this.file.onSamples = this.onSamples.bind(this);
|
|
149
|
+
const seekInfo = this.file.seek(this.startTime, true);
|
|
150
|
+
this.readMoreFromResponse = await this.startStreamingAtOffset(this.file, this.uri, seekInfo.offset);
|
|
151
|
+
}
|
|
152
|
+
/**
|
|
153
|
+
* Called when we are done with the extractor.
|
|
154
|
+
*/
|
|
155
|
+
close() {
|
|
156
|
+
this.closed = true;
|
|
157
|
+
this.file.flush();
|
|
158
|
+
this.frameBuffer.forEach(frame => frame.close());
|
|
159
|
+
this.lastFrame?.close();
|
|
160
|
+
}
|
|
161
|
+
/**
|
|
162
|
+
* @returns - Time in seconds of the current frame (using the target FPS)
|
|
163
|
+
*/
|
|
164
|
+
getTime() {
|
|
165
|
+
return this.startTime + this.framesRequested / this.targetFps;
|
|
166
|
+
}
|
|
167
|
+
/**
|
|
168
|
+
* @returns - Time in seconds of the last frame (using the target FPS)
|
|
169
|
+
*/
|
|
170
|
+
getLastTime() {
|
|
171
|
+
return this.startTime + (this.framesRequested - 1) / this.targetFps;
|
|
172
|
+
}
|
|
173
|
+
getLastFrame() {
|
|
174
|
+
return this.lastFrame;
|
|
175
|
+
}
|
|
176
|
+
/**
|
|
177
|
+
* Called when samples are available on the MP4 file.
|
|
178
|
+
* Sends chunks to the decoder.
|
|
179
|
+
*/
|
|
180
|
+
onSamples(_unused1, _unused2, samples) {
|
|
181
|
+
for (const sample of samples) {
|
|
182
|
+
const chunk = new EncodedVideoChunk({
|
|
183
|
+
type: sample.is_sync ? 'key' : 'delta',
|
|
184
|
+
timestamp: (1e6 * sample.cts) / sample.timescale,
|
|
185
|
+
duration: (1e6 * sample.duration) / sample.timescale,
|
|
186
|
+
data: sample.data,
|
|
187
|
+
});
|
|
188
|
+
this.framesDue++;
|
|
189
|
+
this.decoder.decode(chunk);
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
/**
|
|
193
|
+
* Called when the decoder has a frame ready.
|
|
194
|
+
* Pushes the frame to the buffer so it can be consumed.
|
|
195
|
+
*/
|
|
196
|
+
onFrame(frame) {
|
|
197
|
+
this.framesDue--;
|
|
198
|
+
const timestampInSeconds = frame.timestamp / 1e6;
|
|
199
|
+
if (timestampInSeconds < this.startTime) {
|
|
200
|
+
frame.close();
|
|
201
|
+
return;
|
|
202
|
+
}
|
|
203
|
+
// If the extractor is already closed, close the frame.
|
|
204
|
+
if (this.closed) {
|
|
205
|
+
frame.close();
|
|
206
|
+
return;
|
|
207
|
+
}
|
|
208
|
+
this.frameBuffer.push(frame);
|
|
209
|
+
}
|
|
210
|
+
async populateBuffer() {
|
|
211
|
+
// Fetch more frames if we don't have any.
|
|
212
|
+
while (this.frameBuffer.length === 0 && !this.responseFinished) {
|
|
213
|
+
await this.readMoreFromResponse();
|
|
214
|
+
await new Promise(res => setTimeout(res, 0));
|
|
215
|
+
}
|
|
216
|
+
// Wait for decoder if there are frames due.
|
|
217
|
+
if (this.frameBuffer.length === 0 && this.framesDue) {
|
|
218
|
+
let maxIterations = 1000;
|
|
219
|
+
while (this.frameBuffer.length === 0) {
|
|
220
|
+
await new Promise(res => setTimeout(res, 10));
|
|
221
|
+
maxIterations--;
|
|
222
|
+
if (maxIterations === 0) {
|
|
223
|
+
throw new Error('Timed out while waiting for VideoDecoder to produce a frame.');
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
async getNextFrame() {
|
|
229
|
+
const samplingRate = this.sourceFps / this.targetFps;
|
|
230
|
+
this.sum += samplingRate;
|
|
231
|
+
if (this.sum <= 1 && this.lastFrame) {
|
|
232
|
+
this.framesRequested++;
|
|
233
|
+
return this.lastFrame;
|
|
234
|
+
}
|
|
235
|
+
await this.populateBuffer();
|
|
236
|
+
// We're at the end of the video and there are no more frames to extract.
|
|
237
|
+
if (this.frameBuffer.length === 0) {
|
|
238
|
+
return this.lastFrame;
|
|
239
|
+
}
|
|
240
|
+
while (this.sum >= 2) {
|
|
241
|
+
// Burn frame
|
|
242
|
+
const frame = this.frameBuffer.shift();
|
|
243
|
+
frame.close();
|
|
244
|
+
this.sum -= 1;
|
|
245
|
+
await this.populateBuffer();
|
|
246
|
+
if (this.frameBuffer.length === 0) {
|
|
247
|
+
return this.lastFrame;
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
if (this.sum >= 1 || !this.lastFrame) {
|
|
251
|
+
this.sum -= 1;
|
|
252
|
+
const frame = this.frameBuffer.shift();
|
|
253
|
+
this.lastFrame?.close();
|
|
254
|
+
this.lastFrame = frame;
|
|
255
|
+
this.framesRequested++;
|
|
256
|
+
return frame;
|
|
257
|
+
}
|
|
258
|
+
// One of the three if statements above is always true.
|
|
259
|
+
throw new Error('Unreachable code');
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
//# 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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@revideo/2d",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.3-alpha.1001+7bb63d94",
|
|
4
4
|
"description": "A 2D renderer for revideo",
|
|
5
5
|
"author": "revideo",
|
|
6
6
|
"homepage": "https://re.video/",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"@preact/signals": "^1.2.1",
|
|
32
32
|
"@revideo/internal": "^0.0.0",
|
|
33
|
-
"@revideo/ui": "^0.4.
|
|
33
|
+
"@revideo/ui": "^0.4.3-alpha.1001+7bb63d94",
|
|
34
34
|
"clsx": "^2.0.0",
|
|
35
35
|
"jsdom": "^22.1.0",
|
|
36
36
|
"preact": "^10.19.2",
|
|
@@ -40,10 +40,11 @@
|
|
|
40
40
|
"@codemirror/language": "^6.10.1",
|
|
41
41
|
"@lezer/common": "^1.2.1",
|
|
42
42
|
"@lezer/highlight": "^1.2.0",
|
|
43
|
-
"@revideo/core": "^0.4.
|
|
43
|
+
"@revideo/core": "^0.4.3-alpha.1001+7bb63d94",
|
|
44
44
|
"code-fns": "^0.8.2",
|
|
45
45
|
"mathjax-full": "^3.2.2",
|
|
46
|
+
"mp4box": "^0.5.2",
|
|
46
47
|
"parse-svg-path": "^0.1.2"
|
|
47
48
|
},
|
|
48
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "7bb63d94086f91d734e0a895489fad1d5c4b2478"
|
|
49
50
|
}
|
|
@@ -10,6 +10,8 @@ import {
|
|
|
10
10
|
import {computed, initial, nodeName, signal} from '../decorators';
|
|
11
11
|
import {DesiredLength} from '../partials';
|
|
12
12
|
import {drawImage} from '../utils';
|
|
13
|
+
import {ImageCommunication} from '../utils/video/ffmpeg-client';
|
|
14
|
+
import {getFrame} from '../utils/video/mp4-parser-manager';
|
|
13
15
|
import {Media, MediaProps} from './Media';
|
|
14
16
|
|
|
15
17
|
export interface VideoProps extends MediaProps {
|
|
@@ -27,74 +29,6 @@ export interface VideoProps extends MediaProps {
|
|
|
27
29
|
png?: SignalValue<boolean>;
|
|
28
30
|
}
|
|
29
31
|
|
|
30
|
-
class ImageCommunication {
|
|
31
|
-
public constructor() {
|
|
32
|
-
if (!import.meta.hot) {
|
|
33
|
-
throw new Error('FfmpegVideoFrame can only be used with HMR.');
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
import.meta.hot.on(
|
|
37
|
-
'revideo:ffmpeg-video-frame-res',
|
|
38
|
-
this.handler.bind(this),
|
|
39
|
-
);
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
private nextFrameHandlers: ((event: MessageEvent) => void)[] = [];
|
|
43
|
-
|
|
44
|
-
private handler(event: MessageEvent) {
|
|
45
|
-
const handlers = this.nextFrameHandlers;
|
|
46
|
-
this.nextFrameHandlers = [];
|
|
47
|
-
|
|
48
|
-
for (const handler of handlers) {
|
|
49
|
-
handler(event);
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
public async getFrame(
|
|
54
|
-
id: string,
|
|
55
|
-
src: string,
|
|
56
|
-
time: number,
|
|
57
|
-
duration: number,
|
|
58
|
-
fps: number,
|
|
59
|
-
png: boolean,
|
|
60
|
-
) {
|
|
61
|
-
return new Promise<HTMLImageElement>((resolve, reject) => {
|
|
62
|
-
if (!import.meta.hot) {
|
|
63
|
-
reject('FfmpegVideoFrame can only be used with HMR.');
|
|
64
|
-
return;
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
function handler(event: MessageEvent) {
|
|
68
|
-
const image = new Image();
|
|
69
|
-
|
|
70
|
-
const uint8Array = new Uint8Array(event.data.frame.data);
|
|
71
|
-
const type = png ? 'image/png' : 'image/jpeg';
|
|
72
|
-
const blob = new Blob([uint8Array], {type});
|
|
73
|
-
const url = URL.createObjectURL(blob);
|
|
74
|
-
|
|
75
|
-
image.src = url;
|
|
76
|
-
|
|
77
|
-
image.onload = () => {
|
|
78
|
-
resolve(image);
|
|
79
|
-
};
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
this.nextFrameHandlers.push(handler);
|
|
83
|
-
|
|
84
|
-
import.meta.hot.send('revideo:ffmpeg-video-frame', {
|
|
85
|
-
data: {
|
|
86
|
-
id: id,
|
|
87
|
-
filePath: src,
|
|
88
|
-
startTime: time,
|
|
89
|
-
duration,
|
|
90
|
-
fps,
|
|
91
|
-
png,
|
|
92
|
-
},
|
|
93
|
-
});
|
|
94
|
-
});
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
|
|
98
32
|
@nodeName('Video')
|
|
99
33
|
export class Video extends Media {
|
|
100
34
|
/**
|
|
@@ -122,18 +56,19 @@ export class Video extends Media {
|
|
|
122
56
|
public declare readonly smoothing: SimpleSignal<boolean, this>;
|
|
123
57
|
|
|
124
58
|
/**
|
|
125
|
-
*
|
|
126
|
-
*
|
|
127
|
-
*
|
|
128
|
-
*
|
|
129
|
-
* PNGs have better image quality and support transparency, but they make
|
|
130
|
-
* rendering slower.
|
|
59
|
+
* Which decoder to use during rendering. The `web` decoder is the fastest
|
|
60
|
+
* but only supports MP4 files. The `ffmpeg` decoder is slower and more resource
|
|
61
|
+
* intensive but supports more formats. The `slow` decoder is the slowest but
|
|
62
|
+
* supports all formats.
|
|
131
63
|
*
|
|
132
|
-
* @defaultValue
|
|
64
|
+
* @defaultValue null
|
|
133
65
|
*/
|
|
134
|
-
@initial(
|
|
66
|
+
@initial(null)
|
|
135
67
|
@signal()
|
|
136
|
-
public declare readonly
|
|
68
|
+
public declare readonly decoder: SimpleSignal<
|
|
69
|
+
'web' | 'ffmpeg' | 'slow' | null,
|
|
70
|
+
this
|
|
71
|
+
>;
|
|
137
72
|
|
|
138
73
|
private static readonly pool: Record<string, HTMLVideoElement> = {};
|
|
139
74
|
|
|
@@ -143,6 +78,13 @@ export class Video extends Media {
|
|
|
143
78
|
|
|
144
79
|
public constructor(props: VideoProps) {
|
|
145
80
|
super(props);
|
|
81
|
+
|
|
82
|
+
// If the file is not mp4, warn.
|
|
83
|
+
if (!this.fullSource().endsWith('.mp4')) {
|
|
84
|
+
console.warn(
|
|
85
|
+
`WARNING: Video source is not an MP4 file. This may significantly slow down rendering: ${this.fullSource()}`,
|
|
86
|
+
);
|
|
87
|
+
}
|
|
146
88
|
}
|
|
147
89
|
|
|
148
90
|
protected override desiredSize(): SerializedVector2<DesiredLength> {
|
|
@@ -258,7 +200,21 @@ export class Video extends Media {
|
|
|
258
200
|
|
|
259
201
|
protected lastFrame: HTMLImageElement | null = null;
|
|
260
202
|
|
|
261
|
-
protected async
|
|
203
|
+
protected async webcodecSeekedVideo(): Promise<CanvasImageSource> {
|
|
204
|
+
const video = this.video();
|
|
205
|
+
const time = this.clampTime(this.time());
|
|
206
|
+
|
|
207
|
+
video.playbackRate = this.playbackRate();
|
|
208
|
+
|
|
209
|
+
if (this.lastFrame && this.lastTime === time) {
|
|
210
|
+
return this.lastFrame;
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
const fps = this.view().fps() / this.playbackRate();
|
|
214
|
+
return getFrame(this.key, video.src, time, fps);
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
protected async ffmpegSeekedVideo(): Promise<HTMLImageElement> {
|
|
262
218
|
const video = this.video();
|
|
263
219
|
const time = this.clampTime(this.time());
|
|
264
220
|
const duration = this.getDuration();
|
|
@@ -281,7 +237,6 @@ export class Video extends Media {
|
|
|
281
237
|
time,
|
|
282
238
|
duration,
|
|
283
239
|
fps,
|
|
284
|
-
this.png(),
|
|
285
240
|
);
|
|
286
241
|
this.lastFrame = frame;
|
|
287
242
|
this.lastTime = time;
|
|
@@ -291,6 +246,8 @@ export class Video extends Media {
|
|
|
291
246
|
|
|
292
247
|
protected async seekFunction() {
|
|
293
248
|
const playbackState = this.view().playbackState();
|
|
249
|
+
|
|
250
|
+
// During playback
|
|
294
251
|
if (
|
|
295
252
|
playbackState === PlaybackState.Playing ||
|
|
296
253
|
playbackState === PlaybackState.Presenting
|
|
@@ -298,8 +255,30 @@ export class Video extends Media {
|
|
|
298
255
|
return this.fastSeekedVideo();
|
|
299
256
|
}
|
|
300
257
|
|
|
301
|
-
if (playbackState === PlaybackState.
|
|
302
|
-
return this.
|
|
258
|
+
if (playbackState === PlaybackState.Paused) {
|
|
259
|
+
return this.seekedVideo();
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
// During rendering, if set explicitly
|
|
263
|
+
if (this.decoder() === 'slow') {
|
|
264
|
+
return this.seekedVideo();
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
if (this.decoder() === 'ffmpeg') {
|
|
268
|
+
return this.ffmpegSeekedVideo();
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
if (this.decoder() === 'web') {
|
|
272
|
+
return this.webcodecSeekedVideo();
|
|
273
|
+
}
|
|
274
|
+
|
|
275
|
+
// If not set explicitly, use file extension to determine decoder
|
|
276
|
+
if (this.src().endsWith('.mp4')) {
|
|
277
|
+
return this.webcodecSeekedVideo();
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
if (this.src().endsWith('.webm')) {
|
|
281
|
+
return this.ffmpegSeekedVideo();
|
|
303
282
|
}
|
|
304
283
|
|
|
305
284
|
return this.seekedVideo();
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
declare module 'mp4box';
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
export class ImageCommunication {
|
|
2
|
+
public constructor() {
|
|
3
|
+
if (!import.meta.hot) {
|
|
4
|
+
throw new Error('FfmpegVideoFrame can only be used with HMR.');
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
import.meta.hot.on(
|
|
8
|
+
'revideo:ffmpeg-video-frame-res',
|
|
9
|
+
this.handler.bind(this),
|
|
10
|
+
);
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
private nextFrameHandlers: ((event: MessageEvent) => void)[] = [];
|
|
14
|
+
|
|
15
|
+
private handler(event: MessageEvent) {
|
|
16
|
+
const handlers = this.nextFrameHandlers;
|
|
17
|
+
this.nextFrameHandlers = [];
|
|
18
|
+
|
|
19
|
+
for (const handler of handlers) {
|
|
20
|
+
handler(event);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
public async getFrame(
|
|
25
|
+
id: string,
|
|
26
|
+
src: string,
|
|
27
|
+
time: number,
|
|
28
|
+
duration: number,
|
|
29
|
+
fps: number,
|
|
30
|
+
) {
|
|
31
|
+
return new Promise<HTMLImageElement>((resolve, reject) => {
|
|
32
|
+
if (!import.meta.hot) {
|
|
33
|
+
reject('FfmpegVideoFrame can only be used with HMR.');
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function handler(event: MessageEvent) {
|
|
38
|
+
const image = new Image();
|
|
39
|
+
|
|
40
|
+
const uint8Array = new Uint8Array(event.data.frame.data);
|
|
41
|
+
const blob = new Blob([uint8Array], {type: 'image/png'});
|
|
42
|
+
const url = URL.createObjectURL(blob);
|
|
43
|
+
|
|
44
|
+
image.src = url;
|
|
45
|
+
|
|
46
|
+
image.onload = () => {
|
|
47
|
+
resolve(image);
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
this.nextFrameHandlers.push(handler);
|
|
52
|
+
|
|
53
|
+
import.meta.hot.send('revideo:ffmpeg-video-frame', {
|
|
54
|
+
data: {
|
|
55
|
+
id: id,
|
|
56
|
+
filePath: src,
|
|
57
|
+
startTime: time,
|
|
58
|
+
duration,
|
|
59
|
+
fps,
|
|
60
|
+
},
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
}
|