@revideo/2d 0.5.6-alpha.1065 → 0.5.6
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/Audio.d.ts.map +1 -1
- package/lib/components/Audio.js +7 -14
- package/lib/components/Media.d.ts +16 -1
- package/lib/components/Media.d.ts.map +1 -1
- package/lib/components/Media.js +52 -3
- package/lib/components/Video.d.ts.map +1 -1
- package/lib/components/Video.js +7 -14
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/utils/video/parser/segment.d.ts.map +1 -1
- package/lib/utils/video/parser/segment.js +2 -3
- package/package.json +5 -5
- package/src/lib/components/Asset.ts +4 -1
- package/src/lib/components/Audio.ts +10 -17
- package/src/lib/components/Media.ts +63 -1
- package/src/lib/components/Video.ts +9 -17
- package/src/lib/utils/video/parser/segment.ts +1 -2
|
@@ -137,7 +137,7 @@ export class Segment {
|
|
|
137
137
|
}
|
|
138
138
|
async flushDecoderWithRetry(maxRetries = 3, timeoutMs = 2000) {
|
|
139
139
|
for (let attempt = 0; attempt < maxRetries; attempt++) {
|
|
140
|
-
//
|
|
140
|
+
// Sometimes decoder.flush does not resolve even though the queue size is zero
|
|
141
141
|
if (this.decoder.decodeQueueSize === 0) {
|
|
142
142
|
return;
|
|
143
143
|
}
|
|
@@ -146,7 +146,6 @@ export class Segment {
|
|
|
146
146
|
this.decoder.flush(),
|
|
147
147
|
new Promise((_, reject) => setTimeout(() => reject(new Error('Flush timeout')), timeoutMs)),
|
|
148
148
|
]);
|
|
149
|
-
return;
|
|
150
149
|
}
|
|
151
150
|
catch (error) {
|
|
152
151
|
if (attempt === maxRetries) {
|
|
@@ -237,4 +236,4 @@ export class Segment {
|
|
|
237
236
|
return this.startTime;
|
|
238
237
|
}
|
|
239
238
|
}
|
|
240
|
-
//# 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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"}
|
|
239
|
+
//# 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.6
|
|
3
|
+
"version": "0.5.6",
|
|
4
4
|
"description": "A 2D renderer for revideo",
|
|
5
5
|
"author": "revideo",
|
|
6
6
|
"homepage": "https://re.video/",
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
],
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"@preact/signals": "^1.2.1",
|
|
32
|
-
"@revideo/internal": "
|
|
33
|
-
"@revideo/ui": "
|
|
32
|
+
"@revideo/internal": "0.0.0",
|
|
33
|
+
"@revideo/ui": "0.5.6",
|
|
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": "
|
|
43
|
+
"@revideo/core": "0.5.6",
|
|
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": "6e350fa16d493d3bd20a4e06fa36a02bbecd0a0b"
|
|
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;
|
|
@@ -33,25 +33,18 @@ export class Audio extends Media {
|
|
|
33
33
|
audio.src = src;
|
|
34
34
|
Audio.pool[key] = audio;
|
|
35
35
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
resolve();
|
|
41
|
-
audio.removeEventListener('canplay', onCanPlay);
|
|
42
|
-
};
|
|
43
|
-
|
|
44
|
-
const onError = () => {
|
|
45
|
-
const reason = this.getErrorReason(audio.error?.code);
|
|
46
|
-
console.log(`ERROR: Error loading audio: ${src}, ${reason}`);
|
|
47
|
-
};
|
|
48
|
-
|
|
49
|
-
audio.addEventListener('canplay', onCanPlay);
|
|
50
|
-
audio.addEventListener('error', onError);
|
|
51
|
-
}),
|
|
52
|
-
);
|
|
36
|
+
|
|
37
|
+
const weNeedToWait = this.waitForCanPlayNecessary(audio);
|
|
38
|
+
if (!weNeedToWait) {
|
|
39
|
+
return audio;
|
|
53
40
|
}
|
|
54
41
|
|
|
42
|
+
DependencyContext.collectPromise(
|
|
43
|
+
new Promise<void>(resolve => {
|
|
44
|
+
this.waitForCanPlay(audio, resolve);
|
|
45
|
+
}),
|
|
46
|
+
);
|
|
47
|
+
|
|
55
48
|
return audio;
|
|
56
49
|
}
|
|
57
50
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
DependencyContext,
|
|
3
|
+
PlaybackState,
|
|
3
4
|
SignalValue,
|
|
4
5
|
SimpleSignal,
|
|
5
6
|
clamp,
|
|
@@ -19,6 +20,7 @@ export interface MediaProps extends RectProps {
|
|
|
19
20
|
volume?: number;
|
|
20
21
|
time?: SignalValue<number>;
|
|
21
22
|
play?: boolean;
|
|
23
|
+
awaitCanPlay?: SignalValue<boolean>;
|
|
22
24
|
}
|
|
23
25
|
|
|
24
26
|
@nodeName('Media')
|
|
@@ -39,16 +41,25 @@ export abstract class Media extends Asset {
|
|
|
39
41
|
@signal()
|
|
40
42
|
protected declare readonly playing: SimpleSignal<boolean, this>;
|
|
41
43
|
|
|
42
|
-
|
|
44
|
+
@initial(true)
|
|
45
|
+
@signal()
|
|
46
|
+
protected declare readonly awaitCanPlay: SimpleSignal<boolean, this>;
|
|
47
|
+
|
|
48
|
+
protected declare volume: number;
|
|
43
49
|
|
|
44
50
|
protected lastTime = -1;
|
|
45
51
|
|
|
46
52
|
public constructor(props: MediaProps) {
|
|
47
53
|
super(props);
|
|
54
|
+
if (!this.awaitCanPlay()) {
|
|
55
|
+
this.scheduleSeek(this.time());
|
|
56
|
+
}
|
|
57
|
+
|
|
48
58
|
if (props.play) {
|
|
49
59
|
this.play();
|
|
50
60
|
}
|
|
51
61
|
this.volume = props.volume ?? 1;
|
|
62
|
+
this.setVolume(this.volume);
|
|
52
63
|
}
|
|
53
64
|
|
|
54
65
|
public isPlaying(): boolean {
|
|
@@ -148,6 +159,57 @@ export abstract class Media extends Asset {
|
|
|
148
159
|
}
|
|
149
160
|
}
|
|
150
161
|
|
|
162
|
+
protected scheduleSeek(time: number) {
|
|
163
|
+
this.waitForCanPlay(this.mediaElement(), () => {
|
|
164
|
+
const media = this.mediaElement();
|
|
165
|
+
// Wait until the media is ready to seek again as
|
|
166
|
+
// setting the time before the video doesn't work reliably.
|
|
167
|
+
media.currentTime = time;
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
/**
|
|
172
|
+
* Waits for the canplay event to be fired before calling onCanPlay.
|
|
173
|
+
*
|
|
174
|
+
* If the media is already ready to play, onCanPlay is called immediately.
|
|
175
|
+
* @param onCanPlay - The function to call when the media is ready to play.
|
|
176
|
+
* @returns
|
|
177
|
+
*/
|
|
178
|
+
protected waitForCanPlay(media: HTMLMediaElement, onCanPlay: () => void) {
|
|
179
|
+
if (media.readyState >= 2) {
|
|
180
|
+
onCanPlay();
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
const onCanPlayWrapper = () => {
|
|
185
|
+
onCanPlay();
|
|
186
|
+
media.removeEventListener('canplay', onCanPlayWrapper);
|
|
187
|
+
};
|
|
188
|
+
|
|
189
|
+
const onError = () => {
|
|
190
|
+
const reason = this.getErrorReason(media.error?.code);
|
|
191
|
+
console.log(`ERROR: Error loading video: ${this.src()}, ${reason}`);
|
|
192
|
+
media.removeEventListener('error', onError);
|
|
193
|
+
};
|
|
194
|
+
|
|
195
|
+
media.addEventListener('canplay', onCanPlayWrapper);
|
|
196
|
+
media.addEventListener('error', onError);
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
/**
|
|
200
|
+
* Returns true if we should wait for the media to be ready to play.
|
|
201
|
+
*/
|
|
202
|
+
protected waitForCanPlayNecessary(media: HTMLMediaElement): boolean {
|
|
203
|
+
if (media.readyState >= 2) {
|
|
204
|
+
return false;
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
return (
|
|
208
|
+
this.awaitCanPlay() ||
|
|
209
|
+
this.view().playbackState() === PlaybackState.Rendering
|
|
210
|
+
);
|
|
211
|
+
}
|
|
212
|
+
|
|
151
213
|
public play() {
|
|
152
214
|
const time = useThread().time;
|
|
153
215
|
const start = time();
|
|
@@ -130,25 +130,17 @@ export class Video extends Media {
|
|
|
130
130
|
Video.pool[key] = video;
|
|
131
131
|
}
|
|
132
132
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
const onCanPlay = () => {
|
|
137
|
-
resolve();
|
|
138
|
-
video.removeEventListener('canplay', onCanPlay);
|
|
139
|
-
};
|
|
140
|
-
|
|
141
|
-
const onError = () => {
|
|
142
|
-
const reason = this.getErrorReason(video.error?.code);
|
|
143
|
-
console.log(`ERROR: Error loading video: ${src}, ${reason}`);
|
|
144
|
-
};
|
|
145
|
-
|
|
146
|
-
video.addEventListener('canplay', onCanPlay);
|
|
147
|
-
video.addEventListener('error', onError);
|
|
148
|
-
}),
|
|
149
|
-
);
|
|
133
|
+
const weNeedToWait = this.waitForCanPlayNecessary(video);
|
|
134
|
+
if (!weNeedToWait) {
|
|
135
|
+
return video;
|
|
150
136
|
}
|
|
151
137
|
|
|
138
|
+
DependencyContext.collectPromise(
|
|
139
|
+
new Promise<void>(resolve => {
|
|
140
|
+
this.waitForCanPlay(video, resolve);
|
|
141
|
+
}),
|
|
142
|
+
);
|
|
143
|
+
|
|
152
144
|
return video;
|
|
153
145
|
}
|
|
154
146
|
|
|
@@ -185,7 +185,7 @@ export class Segment {
|
|
|
185
185
|
|
|
186
186
|
private async flushDecoderWithRetry(maxRetries = 3, timeoutMs = 2000) {
|
|
187
187
|
for (let attempt = 0; attempt < maxRetries; attempt++) {
|
|
188
|
-
//
|
|
188
|
+
// Sometimes decoder.flush does not resolve even though the queue size is zero
|
|
189
189
|
if (this.decoder.decodeQueueSize === 0) {
|
|
190
190
|
return;
|
|
191
191
|
}
|
|
@@ -196,7 +196,6 @@ export class Segment {
|
|
|
196
196
|
setTimeout(() => reject(new Error('Flush timeout')), timeoutMs),
|
|
197
197
|
),
|
|
198
198
|
]);
|
|
199
|
-
return;
|
|
200
199
|
} catch (error: any) {
|
|
201
200
|
if (attempt === maxRetries) {
|
|
202
201
|
throw error;
|