@revideo/2d 0.4.5-alpha.1013 → 0.4.5-alpha.1015
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 +1 -0
- package/lib/components/Video.d.ts.map +1 -1
- package/lib/components/Video.js +7 -2
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/utils/video/mp4-parser-manager.d.ts +1 -0
- package/lib/utils/video/mp4-parser-manager.d.ts.map +1 -1
- package/lib/utils/video/mp4-parser-manager.js +9 -1
- package/lib/utils/video/parser/parser.d.ts.map +1 -1
- package/lib/utils/video/parser/parser.js +8 -4
- package/lib/utils/video/parser/sampler.d.ts +0 -1
- package/lib/utils/video/parser/sampler.d.ts.map +1 -1
- package/lib/utils/video/parser/sampler.js +1 -5
- package/package.json +4 -4
- package/src/lib/components/Video.ts +7 -1
- package/src/lib/utils/video/mp4-parser-manager.ts +9 -0
- package/src/lib/utils/video/parser/parser.ts +8 -3
- package/src/lib/utils/video/parser/sampler.ts +0 -5
|
@@ -108,7 +108,8 @@ export class Mp4Parser {
|
|
|
108
108
|
let frame = await this.sampler.getNextFrame();
|
|
109
109
|
// If there are no more frames in the current segment, start the next segment
|
|
110
110
|
while (!frame && this.nextSegment < this.edits.length) {
|
|
111
|
-
this.sampler.close();
|
|
111
|
+
this.sampler.getSegment().close();
|
|
112
|
+
this.sampler.getLastFrame()?.close();
|
|
112
113
|
const segment = new Segment(this.uri, this.file, this.edits, this.nextSegment, 0);
|
|
113
114
|
await segment.start(this.decoderConfig);
|
|
114
115
|
this.sampler = new FrameSampler(segment, this.edits[this.nextSegment].fps, this.targetFps, this.sampler.getSum());
|
|
@@ -118,6 +119,8 @@ export class Mp4Parser {
|
|
|
118
119
|
// If there are no more frames, return the last frame
|
|
119
120
|
if (!frame) {
|
|
120
121
|
frame = this.sampler.getLastFrame();
|
|
122
|
+
// We can close the segment
|
|
123
|
+
this.sampler.getSegment().close();
|
|
121
124
|
// If we still don't have a frame, throw an error
|
|
122
125
|
if (!frame) {
|
|
123
126
|
throw new Error('There are no frames in the video.');
|
|
@@ -156,8 +159,9 @@ export class Mp4Parser {
|
|
|
156
159
|
return this.sampler?.getLastFrame();
|
|
157
160
|
}
|
|
158
161
|
close() {
|
|
159
|
-
this.sampler?.close();
|
|
160
|
-
this.
|
|
162
|
+
this.sampler?.getSegment().close();
|
|
163
|
+
this.sampler?.getLastFrame()?.close();
|
|
164
|
+
this.file.flush();
|
|
161
165
|
}
|
|
162
166
|
}
|
|
163
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
167
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../../src/lib/utils/video/parser/parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ export declare class FrameSampler {
|
|
|
8
8
|
constructor(segment: Segment, sourceFps: number, targetFps: number, sum?: number);
|
|
9
9
|
getNextFrame(): Promise<VideoFrame | undefined>;
|
|
10
10
|
getLastFrame(): VideoFrame | undefined;
|
|
11
|
-
close(): Promise<void>;
|
|
12
11
|
getSum(): number;
|
|
13
12
|
getSegment(): Segment;
|
|
14
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sampler.d.ts","sourceRoot":"","sources":["../../../../src/lib/utils/video/parser/sampler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAElC,qBAAa,YAAY;IAIrB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IANb,OAAO,CAAC,SAAS,CAAC,CAAa;gBAGrB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,GAAG,GAAE,MAAU;IAGZ,YAAY;IA0ClB,YAAY;
|
|
1
|
+
{"version":3,"file":"sampler.d.ts","sourceRoot":"","sources":["../../../../src/lib/utils/video/parser/sampler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAElC,qBAAa,YAAY;IAIrB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IANb,OAAO,CAAC,SAAS,CAAC,CAAa;gBAGrB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,GAAG,GAAE,MAAU;IAGZ,YAAY;IA0ClB,YAAY;IAIZ,MAAM;IAIN,UAAU;CAGlB"}
|
|
@@ -41,10 +41,6 @@ export class FrameSampler {
|
|
|
41
41
|
getLastFrame() {
|
|
42
42
|
return this.lastFrame;
|
|
43
43
|
}
|
|
44
|
-
async close() {
|
|
45
|
-
this.lastFrame?.close();
|
|
46
|
-
this.segment.close();
|
|
47
|
-
}
|
|
48
44
|
getSum() {
|
|
49
45
|
return this.sum;
|
|
50
46
|
}
|
|
@@ -52,4 +48,4 @@ export class FrameSampler {
|
|
|
52
48
|
return this.segment;
|
|
53
49
|
}
|
|
54
50
|
}
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2FtcGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9saWIvdXRpbHMvdmlkZW8vcGFyc2VyL3NhbXBsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsTUFBTSxPQUFPLFlBQVk7SUFHdkIsWUFDVSxPQUFnQixFQUNoQixTQUFpQixFQUNqQixTQUFpQixFQUNqQixNQUFjLENBQUM7UUFIZixZQUFPLEdBQVAsT0FBTyxDQUFTO1FBQ2hCLGNBQVMsR0FBVCxTQUFTLENBQVE7UUFDakIsY0FBUyxHQUFULFNBQVMsQ0FBUTtRQUNqQixRQUFHLEdBQUgsR0FBRyxDQUFZO0lBQ3RCLENBQUM7SUFFRyxLQUFLLENBQUMsWUFBWTtRQUN2QixNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUM7UUFDckQsSUFBSSxDQUFDLEdBQUcsSUFBSSxZQUFZLENBQUM7UUFFekIsd0VBQXdFO1FBQ3hFLElBQUksSUFBSSxDQUFDLEdBQUcsR0FBRyxDQUFDLElBQUksSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ25DLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQztRQUN4QixDQUFDO1FBRUQsbUNBQW1DO1FBQ25DLE9BQU8sSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUNyQixhQUFhO1lBQ2IsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxDQUFDO1lBRWhELHNDQUFzQztZQUN0QyxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ1gsT0FBTztZQUNULENBQUM7WUFFRCxLQUFLLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDZCxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQztRQUNoQixDQUFDO1FBRUQsbUJBQW1CO1FBQ25CLElBQUksSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDckMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7WUFDZCxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLENBQUM7WUFFaEQsc0NBQXNDO1lBQ3RDLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztnQkFDWCxPQUFPO1lBQ1QsQ0FBQztZQUVELElBQUksQ0FBQyxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUM7WUFDeEIsSUFBSSxDQUFDLFNBQVMsR0FBRyxLQUFLLENBQUM7WUFDdkIsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDO1FBRUQsdURBQXVEO1FBQ3ZELE1BQU0sSUFBSSxLQUFLLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUN0QyxDQUFDO0lBRU0sWUFBWTtRQUNqQixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDeEIsQ0FBQztJQUVNLE1BQU07UUFDWCxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUM7SUFDbEIsQ0FBQztJQUVNLFVBQVU7UUFDZixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDdEIsQ0FBQztDQUNGIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@revideo/2d",
|
|
3
|
-
"version": "0.4.5-alpha.
|
|
3
|
+
"version": "0.4.5-alpha.1015+ce1db681",
|
|
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.5-alpha.
|
|
33
|
+
"@revideo/ui": "^0.4.5-alpha.1015+ce1db681",
|
|
34
34
|
"clsx": "^2.0.0",
|
|
35
35
|
"jsdom": "^22.1.0",
|
|
36
36
|
"preact": "^10.19.2",
|
|
@@ -40,12 +40,12 @@
|
|
|
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.5-alpha.
|
|
43
|
+
"@revideo/core": "^0.4.5-alpha.1015+ce1db681",
|
|
44
44
|
"code-fns": "^0.8.2",
|
|
45
45
|
"hls.js": "^1.5.11",
|
|
46
46
|
"mathjax-full": "^3.2.2",
|
|
47
47
|
"mp4box": "^0.5.2",
|
|
48
48
|
"parse-svg-path": "^0.1.2"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "ce1db68176f9678f8b9fde6a2ba52ace3c4d9bbc"
|
|
51
51
|
}
|
|
@@ -12,7 +12,7 @@ import {computed, initial, nodeName, signal} from '../decorators';
|
|
|
12
12
|
import {DesiredLength} from '../partials';
|
|
13
13
|
import {drawImage} from '../utils';
|
|
14
14
|
import {ImageCommunication} from '../utils/video/ffmpeg-client';
|
|
15
|
-
import {getFrame} from '../utils/video/mp4-parser-manager';
|
|
15
|
+
import {dropExtractor, getFrame} from '../utils/video/mp4-parser-manager';
|
|
16
16
|
import {Media, MediaProps} from './Media';
|
|
17
17
|
|
|
18
18
|
export interface VideoProps extends MediaProps {
|
|
@@ -326,4 +326,10 @@ export class Video extends Media {
|
|
|
326
326
|
this.ratio() ?? video.videoWidth / video.videoHeight
|
|
327
327
|
).toString();
|
|
328
328
|
}
|
|
329
|
+
|
|
330
|
+
public override remove() {
|
|
331
|
+
super.remove();
|
|
332
|
+
dropExtractor(this.key, this.video().src);
|
|
333
|
+
return this;
|
|
334
|
+
}
|
|
329
335
|
}
|
|
@@ -3,6 +3,15 @@ import {Mp4Parser} from './parser';
|
|
|
3
3
|
// List of VideoFrameExtractors
|
|
4
4
|
const videoFrameExtractors = new Map<string, Mp4Parser>();
|
|
5
5
|
|
|
6
|
+
export async function dropExtractor(id: string, filePath: string) {
|
|
7
|
+
const extractorId = filePath + '-' + id;
|
|
8
|
+
const extractor = videoFrameExtractors.get(extractorId);
|
|
9
|
+
if (extractor) {
|
|
10
|
+
extractor.close();
|
|
11
|
+
videoFrameExtractors.delete(extractorId);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
|
|
6
15
|
export async function getFrame(
|
|
7
16
|
id: string,
|
|
8
17
|
filePath: string,
|
|
@@ -163,7 +163,8 @@ export class Mp4Parser {
|
|
|
163
163
|
|
|
164
164
|
// If there are no more frames in the current segment, start the next segment
|
|
165
165
|
while (!frame && this.nextSegment < this.edits.length) {
|
|
166
|
-
this.sampler.close();
|
|
166
|
+
this.sampler.getSegment().close();
|
|
167
|
+
this.sampler.getLastFrame()?.close();
|
|
167
168
|
const segment = new Segment(
|
|
168
169
|
this.uri,
|
|
169
170
|
this.file,
|
|
@@ -188,6 +189,9 @@ export class Mp4Parser {
|
|
|
188
189
|
if (!frame) {
|
|
189
190
|
frame = this.sampler.getLastFrame();
|
|
190
191
|
|
|
192
|
+
// We can close the segment
|
|
193
|
+
this.sampler.getSegment().close();
|
|
194
|
+
|
|
191
195
|
// If we still don't have a frame, throw an error
|
|
192
196
|
if (!frame) {
|
|
193
197
|
throw new Error('There are no frames in the video.');
|
|
@@ -241,7 +245,8 @@ export class Mp4Parser {
|
|
|
241
245
|
}
|
|
242
246
|
|
|
243
247
|
public close() {
|
|
244
|
-
this.sampler?.close();
|
|
245
|
-
this.
|
|
248
|
+
this.sampler?.getSegment().close();
|
|
249
|
+
this.sampler?.getLastFrame()?.close();
|
|
250
|
+
this.file.flush();
|
|
246
251
|
}
|
|
247
252
|
}
|