@revideo/2d 0.5.4-alpha.1064 → 0.5.5-alpha.1062
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/Asset.d.ts.map +1 -1
- package/lib/components/Asset.js +4 -2
- package/lib/components/Media.d.ts +1 -1
- package/lib/components/Media.d.ts.map +1 -1
- package/lib/components/Media.js +9 -8
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/utils/video/mp4-parser-manager.js +2 -2
- package/lib/utils/video/parser/segment.d.ts +0 -3
- package/lib/utils/video/parser/segment.d.ts.map +1 -1
- package/lib/utils/video/parser/segment.js +5 -29
- package/package.json +4 -4
- package/src/lib/components/Asset.ts +4 -1
- package/src/lib/components/Media.ts +10 -6
- package/src/lib/utils/video/mp4-parser-manager.ts +1 -1
- package/src/lib/utils/video/parser/segment.ts +4 -32
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
import { MP4FileSink } from './sink';
|
|
2
|
-
const MAX_DECODE_QUEUE_SIZE = 30;
|
|
3
2
|
export class Segment {
|
|
4
3
|
constructor(uri, file, edits, currentSegment, startTime = 0) {
|
|
5
4
|
this.done = false;
|
|
6
|
-
this.decodingDone = false;
|
|
7
5
|
this.abortController = new AbortController();
|
|
8
6
|
this.responseFinished = false;
|
|
9
7
|
this.framesProcessed = 0;
|
|
10
8
|
this.framesDue = 0;
|
|
11
9
|
this.frameBuffer = [];
|
|
12
|
-
this.encodedChunkQueue = [];
|
|
13
10
|
this.readMore = async () => { };
|
|
14
11
|
this.uri = uri;
|
|
15
12
|
this.file = file;
|
|
@@ -90,6 +87,7 @@ export class Segment {
|
|
|
90
87
|
this.responseFinished = true;
|
|
91
88
|
this.abortController.abort();
|
|
92
89
|
sink.close();
|
|
90
|
+
this.decoder.flush();
|
|
93
91
|
return;
|
|
94
92
|
}
|
|
95
93
|
sink.write(value);
|
|
@@ -110,31 +108,12 @@ export class Segment {
|
|
|
110
108
|
data: sample.data,
|
|
111
109
|
});
|
|
112
110
|
this.framesDue++;
|
|
113
|
-
this.
|
|
111
|
+
this.decoder.decode(chunk);
|
|
114
112
|
const videoTrack = this.file.getInfo().videoTracks[0];
|
|
115
113
|
const trak = this.file.getTrackById(videoTrack.id);
|
|
116
114
|
this.file.releaseSample(trak, sample.number);
|
|
117
115
|
}
|
|
118
116
|
}
|
|
119
|
-
async decodeChunks() {
|
|
120
|
-
while (this.encodedChunkQueue.length > 0 &&
|
|
121
|
-
this.decoder.decodeQueueSize < MAX_DECODE_QUEUE_SIZE) {
|
|
122
|
-
const chunk = this.encodedChunkQueue.shift();
|
|
123
|
-
if (chunk) {
|
|
124
|
-
this.decoder.decode(chunk);
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
// when edit is empty, we cannot call decoder.flush() because decoder was already closed
|
|
128
|
-
if (this.done) {
|
|
129
|
-
this.decodingDone = true;
|
|
130
|
-
return;
|
|
131
|
-
}
|
|
132
|
-
if (this.responseFinished && this.encodedChunkQueue.length === 0) {
|
|
133
|
-
await this.decoder.flush();
|
|
134
|
-
this.decodingDone = true;
|
|
135
|
-
return;
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
117
|
/**
|
|
139
118
|
* Called when the decoder has a frame ready.
|
|
140
119
|
* Pushes the frame to the buffer so it can be consumed.
|
|
@@ -163,11 +142,8 @@ export class Segment {
|
|
|
163
142
|
}
|
|
164
143
|
async populateBuffer() {
|
|
165
144
|
// Fetch more frames if we don't have any.
|
|
166
|
-
while (this.frameBuffer.length === 0 && !this.
|
|
167
|
-
|
|
168
|
-
await this.readMore();
|
|
169
|
-
}
|
|
170
|
-
await this.decodeChunks();
|
|
145
|
+
while (this.frameBuffer.length === 0 && !this.responseFinished) {
|
|
146
|
+
await this.readMore();
|
|
171
147
|
await new Promise(res => setTimeout(res, 0));
|
|
172
148
|
}
|
|
173
149
|
// Wait for decoder if there are frames due.
|
|
@@ -216,4 +192,4 @@ export class Segment {
|
|
|
216
192
|
return this.startTime;
|
|
217
193
|
}
|
|
218
194
|
}
|
|
219
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segment.js","sourceRoot":"","sources":["../../../../src/lib/utils/video/parser/segment.ts"],"names":[],"mappings":"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"}
|
|
195
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segment.js","sourceRoot":"","sources":["../../../../src/lib/utils/video/parser/segment.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.5.
|
|
3
|
+
"version": "0.5.5-alpha.1062+bd743d61",
|
|
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.5.
|
|
33
|
+
"@revideo/ui": "^0.5.5-alpha.1062+bd743d61",
|
|
34
34
|
"clsx": "^2.0.0",
|
|
35
35
|
"jsdom": "^22.1.0",
|
|
36
36
|
"preact": "^10.19.2",
|
|
@@ -40,7 +40,7 @@
|
|
|
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.5.
|
|
43
|
+
"@revideo/core": "^0.5.5-alpha.1062+bd743d61",
|
|
44
44
|
"@rive-app/canvas-advanced": "2.7.3",
|
|
45
45
|
"code-fns": "^0.8.2",
|
|
46
46
|
"hls.js": "^1.5.11",
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"mp4box": "^0.5.2",
|
|
49
49
|
"parse-svg-path": "^0.1.2"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "bd743d618bd501b4d414bebbdce78a7c765e3c15"
|
|
52
52
|
}
|
|
@@ -31,7 +31,10 @@ export abstract class Asset extends Rect {
|
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
let src = this.src();
|
|
34
|
-
const isUrl =
|
|
34
|
+
const isUrl =
|
|
35
|
+
src.startsWith('http://') ||
|
|
36
|
+
src.startsWith('https://') ||
|
|
37
|
+
src.startsWith('data:');
|
|
35
38
|
|
|
36
39
|
if (isUrl) {
|
|
37
40
|
return src;
|
|
@@ -39,9 +39,7 @@ export abstract class Media extends Asset {
|
|
|
39
39
|
@signal()
|
|
40
40
|
protected declare readonly playing: SimpleSignal<boolean, this>;
|
|
41
41
|
|
|
42
|
-
|
|
43
|
-
@signal()
|
|
44
|
-
protected declare readonly volume: SimpleSignal<number, this>;
|
|
42
|
+
protected readonly volume: number = 1;
|
|
45
43
|
|
|
46
44
|
protected lastTime = -1;
|
|
47
45
|
|
|
@@ -50,6 +48,7 @@ export abstract class Media extends Asset {
|
|
|
50
48
|
if (props.play) {
|
|
51
49
|
this.play();
|
|
52
50
|
}
|
|
51
|
+
this.volume = props.volume ?? 1;
|
|
53
52
|
}
|
|
54
53
|
|
|
55
54
|
public isPlaying(): boolean {
|
|
@@ -65,7 +64,7 @@ export abstract class Media extends Asset {
|
|
|
65
64
|
}
|
|
66
65
|
|
|
67
66
|
public getVolume(): number {
|
|
68
|
-
return this.
|
|
67
|
+
return this.volume;
|
|
69
68
|
}
|
|
70
69
|
|
|
71
70
|
public override dispose() {
|
|
@@ -109,9 +108,14 @@ export abstract class Media extends Asset {
|
|
|
109
108
|
}
|
|
110
109
|
|
|
111
110
|
protected setVolume(volume: number) {
|
|
112
|
-
if (volume < 0
|
|
111
|
+
if (volume < 0) {
|
|
112
|
+
console.warn(
|
|
113
|
+
`volumes cannot be negative - the value will be clamped to 0.`,
|
|
114
|
+
);
|
|
115
|
+
}
|
|
116
|
+
if (volume > 1) {
|
|
113
117
|
console.warn(
|
|
114
|
-
|
|
118
|
+
`the browser does not natively support volumes higher than 1 - your preview will have a volume of 1, but your exported video will have a volume of ${volume}`,
|
|
115
119
|
);
|
|
116
120
|
}
|
|
117
121
|
this.mediaElement().volume = Math.min(Math.max(volume, 0), 1);
|
|
@@ -55,7 +55,7 @@ export async function getFrame(
|
|
|
55
55
|
}
|
|
56
56
|
|
|
57
57
|
// If the video has skipped forward we need to create a new extractor
|
|
58
|
-
if (extractor && time > extractor.getTime() + frameDuration
|
|
58
|
+
if (extractor && time > extractor.getTime() + frameDuration) {
|
|
59
59
|
extractor.close();
|
|
60
60
|
videoFrameExtractors.delete(extractorId);
|
|
61
61
|
extractor = undefined;
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import {MP4FileSink} from './sink';
|
|
2
2
|
import {Edit} from './utils';
|
|
3
3
|
|
|
4
|
-
const MAX_DECODE_QUEUE_SIZE = 30;
|
|
5
|
-
|
|
6
4
|
export class Segment {
|
|
7
5
|
private done: boolean = false;
|
|
8
|
-
private decodingDone: boolean = false;
|
|
9
6
|
private abortController = new AbortController();
|
|
10
7
|
private uri: string;
|
|
11
8
|
|
|
@@ -19,7 +16,6 @@ export class Segment {
|
|
|
19
16
|
private startTime: number;
|
|
20
17
|
private framesDue = 0;
|
|
21
18
|
private frameBuffer: VideoFrame[] = [];
|
|
22
|
-
private encodedChunkQueue: EncodedVideoChunk[] = [];
|
|
23
19
|
|
|
24
20
|
private readMore: () => Promise<void> = async () => {};
|
|
25
21
|
|
|
@@ -131,6 +127,7 @@ export class Segment {
|
|
|
131
127
|
this.responseFinished = true;
|
|
132
128
|
this.abortController.abort();
|
|
133
129
|
sink.close();
|
|
130
|
+
this.decoder.flush();
|
|
134
131
|
return;
|
|
135
132
|
}
|
|
136
133
|
|
|
@@ -153,7 +150,7 @@ export class Segment {
|
|
|
153
150
|
data: sample.data,
|
|
154
151
|
});
|
|
155
152
|
this.framesDue++;
|
|
156
|
-
this.
|
|
153
|
+
this.decoder.decode(chunk);
|
|
157
154
|
|
|
158
155
|
const videoTrack = this.file.getInfo().videoTracks[0];
|
|
159
156
|
const trak = this.file.getTrackById(videoTrack.id);
|
|
@@ -161,28 +158,6 @@ export class Segment {
|
|
|
161
158
|
}
|
|
162
159
|
}
|
|
163
160
|
|
|
164
|
-
private async decodeChunks() {
|
|
165
|
-
while (
|
|
166
|
-
this.encodedChunkQueue.length > 0 &&
|
|
167
|
-
this.decoder.decodeQueueSize < MAX_DECODE_QUEUE_SIZE
|
|
168
|
-
) {
|
|
169
|
-
const chunk = this.encodedChunkQueue.shift();
|
|
170
|
-
if (chunk) {
|
|
171
|
-
this.decoder.decode(chunk);
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
// when edit is empty, we cannot call decoder.flush() because decoder was already closed
|
|
175
|
-
if (this.done) {
|
|
176
|
-
this.decodingDone = true;
|
|
177
|
-
return;
|
|
178
|
-
}
|
|
179
|
-
if (this.responseFinished && this.encodedChunkQueue.length === 0) {
|
|
180
|
-
await this.decoder.flush();
|
|
181
|
-
this.decodingDone = true;
|
|
182
|
-
return;
|
|
183
|
-
}
|
|
184
|
-
}
|
|
185
|
-
|
|
186
161
|
/**
|
|
187
162
|
* Called when the decoder has a frame ready.
|
|
188
163
|
* Pushes the frame to the buffer so it can be consumed.
|
|
@@ -217,11 +192,8 @@ export class Segment {
|
|
|
217
192
|
|
|
218
193
|
private async populateBuffer() {
|
|
219
194
|
// Fetch more frames if we don't have any.
|
|
220
|
-
while (this.frameBuffer.length === 0 && !this.
|
|
221
|
-
|
|
222
|
-
await this.readMore();
|
|
223
|
-
}
|
|
224
|
-
await this.decodeChunks();
|
|
195
|
+
while (this.frameBuffer.length === 0 && !this.responseFinished) {
|
|
196
|
+
await this.readMore();
|
|
225
197
|
await new Promise(res => setTimeout(res, 0));
|
|
226
198
|
}
|
|
227
199
|
|