@revideo/2d 0.4.2 → 0.4.3-alpha.1002
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 +11 -12
- 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 +264 -0
- package/package.json +6 -5
- package/src/lib/components/Video.ts +62 -83
- 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 +340 -0
package/lib/components/Video.js
CHANGED
|
@@ -8,57 +8,17 @@ var Video_1;
|
|
|
8
8
|
import { BBox, DependencyContext, PlaybackState, viaProxy, } from '@revideo/core';
|
|
9
9
|
import { computed, initial, nodeName, signal } from '../decorators';
|
|
10
10
|
import { drawImage } from '../utils';
|
|
11
|
+
import { ImageCommunication } from '../utils/video/ffmpeg-client';
|
|
12
|
+
import { getFrame } from '../utils/video/mp4-parser-manager';
|
|
11
13
|
import { Media } from './Media';
|
|
12
|
-
class ImageCommunication {
|
|
13
|
-
constructor() {
|
|
14
|
-
this.nextFrameHandlers = [];
|
|
15
|
-
if (!import.meta.hot) {
|
|
16
|
-
throw new Error('FfmpegVideoFrame can only be used with HMR.');
|
|
17
|
-
}
|
|
18
|
-
import.meta.hot.on('revideo:ffmpeg-video-frame-res', this.handler.bind(this));
|
|
19
|
-
}
|
|
20
|
-
handler(event) {
|
|
21
|
-
const handlers = this.nextFrameHandlers;
|
|
22
|
-
this.nextFrameHandlers = [];
|
|
23
|
-
for (const handler of handlers) {
|
|
24
|
-
handler(event);
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
async getFrame(id, src, time, duration, fps, png) {
|
|
28
|
-
return new Promise((resolve, reject) => {
|
|
29
|
-
if (!import.meta.hot) {
|
|
30
|
-
reject('FfmpegVideoFrame can only be used with HMR.');
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
function handler(event) {
|
|
34
|
-
const image = new Image();
|
|
35
|
-
const uint8Array = new Uint8Array(event.data.frame.data);
|
|
36
|
-
const type = png ? 'image/png' : 'image/jpeg';
|
|
37
|
-
const blob = new Blob([uint8Array], { type });
|
|
38
|
-
const url = URL.createObjectURL(blob);
|
|
39
|
-
image.src = url;
|
|
40
|
-
image.onload = () => {
|
|
41
|
-
resolve(image);
|
|
42
|
-
};
|
|
43
|
-
}
|
|
44
|
-
this.nextFrameHandlers.push(handler);
|
|
45
|
-
import.meta.hot.send('revideo:ffmpeg-video-frame', {
|
|
46
|
-
data: {
|
|
47
|
-
id: id,
|
|
48
|
-
filePath: src,
|
|
49
|
-
startTime: time,
|
|
50
|
-
duration,
|
|
51
|
-
fps,
|
|
52
|
-
png,
|
|
53
|
-
},
|
|
54
|
-
});
|
|
55
|
-
});
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
14
|
let Video = Video_1 = class Video extends Media {
|
|
59
15
|
constructor(props) {
|
|
60
16
|
super(props);
|
|
61
17
|
this.lastFrame = null;
|
|
18
|
+
// If the file is not mp4, warn.
|
|
19
|
+
if (!this.fullSource().endsWith('.mp4')) {
|
|
20
|
+
console.warn(`WARNING: Video source is not an MP4 file. This may significantly slow down rendering: ${this.fullSource()}`);
|
|
21
|
+
}
|
|
62
22
|
}
|
|
63
23
|
desiredSize() {
|
|
64
24
|
const custom = super.desiredSize();
|
|
@@ -145,7 +105,17 @@ let Video = Video_1 = class Video extends Media {
|
|
|
145
105
|
}
|
|
146
106
|
return video;
|
|
147
107
|
}
|
|
148
|
-
async
|
|
108
|
+
async webcodecSeekedVideo() {
|
|
109
|
+
const video = this.video();
|
|
110
|
+
const time = this.clampTime(this.time());
|
|
111
|
+
video.playbackRate = this.playbackRate();
|
|
112
|
+
if (this.lastFrame && this.lastTime === time) {
|
|
113
|
+
return this.lastFrame;
|
|
114
|
+
}
|
|
115
|
+
const fps = this.view().fps() / this.playbackRate();
|
|
116
|
+
return getFrame(this.key, video.src, time, fps);
|
|
117
|
+
}
|
|
118
|
+
async ffmpegSeekedVideo() {
|
|
149
119
|
const video = this.video();
|
|
150
120
|
const time = this.clampTime(this.time());
|
|
151
121
|
const duration = this.getDuration();
|
|
@@ -157,19 +127,37 @@ let Video = Video_1 = class Video extends Media {
|
|
|
157
127
|
if (!Video_1.imageCommunication) {
|
|
158
128
|
throw new Error('ServerSeekedVideo can only be used with HMR.');
|
|
159
129
|
}
|
|
160
|
-
const frame = await Video_1.imageCommunication.getFrame(this.key, video.src, time, duration, fps
|
|
130
|
+
const frame = await Video_1.imageCommunication.getFrame(this.key, video.src, time, duration, fps);
|
|
161
131
|
this.lastFrame = frame;
|
|
162
132
|
this.lastTime = time;
|
|
163
133
|
return frame;
|
|
164
134
|
}
|
|
165
135
|
async seekFunction() {
|
|
166
136
|
const playbackState = this.view().playbackState();
|
|
137
|
+
// During playback
|
|
167
138
|
if (playbackState === PlaybackState.Playing ||
|
|
168
139
|
playbackState === PlaybackState.Presenting) {
|
|
169
140
|
return this.fastSeekedVideo();
|
|
170
141
|
}
|
|
171
|
-
if (playbackState === PlaybackState.
|
|
172
|
-
return this.
|
|
142
|
+
if (playbackState === PlaybackState.Paused) {
|
|
143
|
+
return this.seekedVideo();
|
|
144
|
+
}
|
|
145
|
+
// During rendering, if set explicitly
|
|
146
|
+
if (this.decoder() === 'slow') {
|
|
147
|
+
return this.seekedVideo();
|
|
148
|
+
}
|
|
149
|
+
if (this.decoder() === 'ffmpeg') {
|
|
150
|
+
return this.ffmpegSeekedVideo();
|
|
151
|
+
}
|
|
152
|
+
if (this.decoder() === 'web') {
|
|
153
|
+
return this.webcodecSeekedVideo();
|
|
154
|
+
}
|
|
155
|
+
// If not set explicitly, use file extension to determine decoder
|
|
156
|
+
if (this.src().endsWith('.mp4')) {
|
|
157
|
+
return this.webcodecSeekedVideo();
|
|
158
|
+
}
|
|
159
|
+
if (this.src().endsWith('.webm')) {
|
|
160
|
+
return this.ffmpegSeekedVideo();
|
|
173
161
|
}
|
|
174
162
|
return this.seekedVideo();
|
|
175
163
|
}
|
|
@@ -212,9 +200,9 @@ __decorate([
|
|
|
212
200
|
signal()
|
|
213
201
|
], Video.prototype, "smoothing", void 0);
|
|
214
202
|
__decorate([
|
|
215
|
-
initial(
|
|
203
|
+
initial(null),
|
|
216
204
|
signal()
|
|
217
|
-
], Video.prototype, "
|
|
205
|
+
], Video.prototype, "decoder", void 0);
|
|
218
206
|
__decorate([
|
|
219
207
|
computed()
|
|
220
208
|
], Video.prototype, "video", null);
|
|
@@ -228,4 +216,4 @@ Video = Video_1 = __decorate([
|
|
|
228
216
|
nodeName('Video')
|
|
229
217
|
], Video);
|
|
230
218
|
export { Video };
|
|
231
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
219
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Video.js","sourceRoot":"","sources":["../../src/lib/components/Video.ts"],"names":[],"mappings":"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"}
|