@revideo/2d 0.5.3 → 0.5.4-alpha.1061
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/Layout.d.ts.map +1 -1
- package/lib/components/Layout.js +15 -9
- package/lib/partials/types.d.ts +1 -1
- package/lib/partials/types.d.ts.map +1 -1
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/utils/video/parser/segment.d.ts +3 -0
- package/lib/utils/video/parser/segment.d.ts.map +1 -1
- package/lib/utils/video/parser/segment.js +25 -7
- package/package.json +5 -5
- package/src/lib/components/Layout.ts +19 -7
- package/src/lib/partials/types.ts +1 -1
- package/src/lib/utils/video/parser/segment.ts +28 -6
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import { MP4FileSink } from './sink';
|
|
2
|
+
const MAX_DECODE_QUEUE_SIZE = 30;
|
|
2
3
|
export class Segment {
|
|
3
4
|
constructor(uri, file, edits, currentSegment, startTime = 0) {
|
|
4
5
|
this.done = false;
|
|
6
|
+
this.decodingDone = false;
|
|
5
7
|
this.abortController = new AbortController();
|
|
6
8
|
this.responseFinished = false;
|
|
7
9
|
this.framesProcessed = 0;
|
|
8
10
|
this.framesDue = 0;
|
|
9
11
|
this.frameBuffer = [];
|
|
12
|
+
this.encodedChunkQueue = [];
|
|
10
13
|
this.readMore = async () => { };
|
|
11
14
|
this.uri = uri;
|
|
12
15
|
this.file = file;
|
|
@@ -31,7 +34,7 @@ export class Segment {
|
|
|
31
34
|
this.decoder.close();
|
|
32
35
|
const segmentDurationInSeconds = this.edit.segmentDuration /
|
|
33
36
|
this.file.getInfo().videoTracks[0].movie_timescale;
|
|
34
|
-
const framesToFill = segmentDurationInSeconds * this.edit.fps;
|
|
37
|
+
const framesToFill = Math.ceil(segmentDurationInSeconds * this.edit.fps);
|
|
35
38
|
const height = this.file.getInfo().videoTracks[0].track_height;
|
|
36
39
|
const width = this.file.getInfo().videoTracks[0].track_width;
|
|
37
40
|
const bufferSize = height * width * 4;
|
|
@@ -87,7 +90,6 @@ export class Segment {
|
|
|
87
90
|
this.responseFinished = true;
|
|
88
91
|
this.abortController.abort();
|
|
89
92
|
sink.close();
|
|
90
|
-
this.decoder.flush();
|
|
91
93
|
return;
|
|
92
94
|
}
|
|
93
95
|
sink.write(value);
|
|
@@ -107,13 +109,26 @@ export class Segment {
|
|
|
107
109
|
duration: (1e6 * sample.duration) / sample.timescale,
|
|
108
110
|
data: sample.data,
|
|
109
111
|
});
|
|
110
|
-
this.
|
|
111
|
-
this.decoder.decode(chunk);
|
|
112
|
+
this.encodedChunkQueue.push(chunk);
|
|
112
113
|
const videoTrack = this.file.getInfo().videoTracks[0];
|
|
113
114
|
const trak = this.file.getTrackById(videoTrack.id);
|
|
114
115
|
this.file.releaseSample(trak, sample.number);
|
|
115
116
|
}
|
|
116
117
|
}
|
|
118
|
+
async decodeChunks() {
|
|
119
|
+
while (this.encodedChunkQueue.length > 0 &&
|
|
120
|
+
this.decoder.decodeQueueSize < MAX_DECODE_QUEUE_SIZE) {
|
|
121
|
+
const chunk = this.encodedChunkQueue.shift();
|
|
122
|
+
if (chunk) {
|
|
123
|
+
this.framesDue++;
|
|
124
|
+
this.decoder.decode(chunk);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
if (this.responseFinished && this.encodedChunkQueue.length === 0) {
|
|
128
|
+
await this.decoder.flush();
|
|
129
|
+
this.decodingDone = true;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
117
132
|
/**
|
|
118
133
|
* Called when the decoder has a frame ready.
|
|
119
134
|
* Pushes the frame to the buffer so it can be consumed.
|
|
@@ -142,8 +157,11 @@ export class Segment {
|
|
|
142
157
|
}
|
|
143
158
|
async populateBuffer() {
|
|
144
159
|
// Fetch more frames if we don't have any.
|
|
145
|
-
while (this.frameBuffer.length === 0 && !this.
|
|
146
|
-
|
|
160
|
+
while (this.frameBuffer.length === 0 && !this.decodingDone) {
|
|
161
|
+
if (!this.responseFinished) {
|
|
162
|
+
await this.readMore();
|
|
163
|
+
}
|
|
164
|
+
await this.decodeChunks();
|
|
147
165
|
await new Promise(res => setTimeout(res, 0));
|
|
148
166
|
}
|
|
149
167
|
// Wait for decoder if there are frames due.
|
|
@@ -192,4 +210,4 @@ export class Segment {
|
|
|
192
210
|
return this.startTime;
|
|
193
211
|
}
|
|
194
212
|
}
|
|
195
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
213
|
+
//# 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.4-alpha.1061+6b2cb335",
|
|
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": "0.0.0",
|
|
33
|
-
"@revideo/ui": "0.5.
|
|
32
|
+
"@revideo/internal": "^0.0.0",
|
|
33
|
+
"@revideo/ui": "^0.5.4-alpha.1061+6b2cb335",
|
|
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.4-alpha.1061+6b2cb335",
|
|
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": "6b2cb3357194ff3e48e8d34edc51eea2ae440bf0"
|
|
52
52
|
}
|
|
@@ -992,13 +992,25 @@ export class Layout extends Node {
|
|
|
992
992
|
|
|
993
993
|
if (this.textWrap.isInitial()) {
|
|
994
994
|
this.element.style.whiteSpace = '';
|
|
995
|
-
|
|
996
|
-
|
|
997
|
-
|
|
998
|
-
|
|
999
|
-
|
|
1000
|
-
|
|
1001
|
-
|
|
995
|
+
return;
|
|
996
|
+
}
|
|
997
|
+
|
|
998
|
+
const wrap = this.textWrap();
|
|
999
|
+
|
|
1000
|
+
if (typeof wrap === 'boolean') {
|
|
1001
|
+
this.element.style.whiteSpace = wrap ? 'normal' : 'nowrap';
|
|
1002
|
+
return;
|
|
1003
|
+
}
|
|
1004
|
+
|
|
1005
|
+
if (wrap === 'pre') {
|
|
1006
|
+
this.element.style.whiteSpace = wrap;
|
|
1007
|
+
return;
|
|
1008
|
+
}
|
|
1009
|
+
|
|
1010
|
+
if (wrap === 'balance') {
|
|
1011
|
+
this.element.style.whiteSpace = 'normal';
|
|
1012
|
+
this.element.style.textWrap = wrap;
|
|
1013
|
+
return;
|
|
1002
1014
|
}
|
|
1003
1015
|
}
|
|
1004
1016
|
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import {MP4FileSink} from './sink';
|
|
2
2
|
import {Edit} from './utils';
|
|
3
3
|
|
|
4
|
+
const MAX_DECODE_QUEUE_SIZE = 30;
|
|
5
|
+
|
|
4
6
|
export class Segment {
|
|
5
7
|
private done: boolean = false;
|
|
8
|
+
private decodingDone: boolean = false;
|
|
6
9
|
private abortController = new AbortController();
|
|
7
10
|
private uri: string;
|
|
8
11
|
|
|
@@ -16,6 +19,7 @@ export class Segment {
|
|
|
16
19
|
private startTime: number;
|
|
17
20
|
private framesDue = 0;
|
|
18
21
|
private frameBuffer: VideoFrame[] = [];
|
|
22
|
+
private encodedChunkQueue: EncodedVideoChunk[] = [];
|
|
19
23
|
|
|
20
24
|
private readMore: () => Promise<void> = async () => {};
|
|
21
25
|
|
|
@@ -56,7 +60,7 @@ export class Segment {
|
|
|
56
60
|
const segmentDurationInSeconds =
|
|
57
61
|
this.edit.segmentDuration /
|
|
58
62
|
this.file.getInfo().videoTracks[0].movie_timescale;
|
|
59
|
-
const framesToFill = segmentDurationInSeconds * this.edit.fps;
|
|
63
|
+
const framesToFill = Math.ceil(segmentDurationInSeconds * this.edit.fps);
|
|
60
64
|
|
|
61
65
|
const height = this.file.getInfo().videoTracks[0].track_height;
|
|
62
66
|
const width = this.file.getInfo().videoTracks[0].track_width;
|
|
@@ -127,7 +131,6 @@ export class Segment {
|
|
|
127
131
|
this.responseFinished = true;
|
|
128
132
|
this.abortController.abort();
|
|
129
133
|
sink.close();
|
|
130
|
-
this.decoder.flush();
|
|
131
134
|
return;
|
|
132
135
|
}
|
|
133
136
|
|
|
@@ -149,8 +152,7 @@ export class Segment {
|
|
|
149
152
|
duration: (1e6 * sample.duration) / sample.timescale,
|
|
150
153
|
data: sample.data,
|
|
151
154
|
});
|
|
152
|
-
this.
|
|
153
|
-
this.decoder.decode(chunk);
|
|
155
|
+
this.encodedChunkQueue.push(chunk);
|
|
154
156
|
|
|
155
157
|
const videoTrack = this.file.getInfo().videoTracks[0];
|
|
156
158
|
const trak = this.file.getTrackById(videoTrack.id);
|
|
@@ -158,6 +160,23 @@ export class Segment {
|
|
|
158
160
|
}
|
|
159
161
|
}
|
|
160
162
|
|
|
163
|
+
private async decodeChunks() {
|
|
164
|
+
while (
|
|
165
|
+
this.encodedChunkQueue.length > 0 &&
|
|
166
|
+
this.decoder.decodeQueueSize < MAX_DECODE_QUEUE_SIZE
|
|
167
|
+
) {
|
|
168
|
+
const chunk = this.encodedChunkQueue.shift();
|
|
169
|
+
if (chunk) {
|
|
170
|
+
this.framesDue++;
|
|
171
|
+
this.decoder.decode(chunk);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
if (this.responseFinished && this.encodedChunkQueue.length === 0) {
|
|
175
|
+
await this.decoder.flush();
|
|
176
|
+
this.decodingDone = true;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
|
|
161
180
|
/**
|
|
162
181
|
* Called when the decoder has a frame ready.
|
|
163
182
|
* Pushes the frame to the buffer so it can be consumed.
|
|
@@ -192,8 +211,11 @@ export class Segment {
|
|
|
192
211
|
|
|
193
212
|
private async populateBuffer() {
|
|
194
213
|
// Fetch more frames if we don't have any.
|
|
195
|
-
while (this.frameBuffer.length === 0 && !this.
|
|
196
|
-
|
|
214
|
+
while (this.frameBuffer.length === 0 && !this.decodingDone) {
|
|
215
|
+
if (!this.responseFinished) {
|
|
216
|
+
await this.readMore();
|
|
217
|
+
}
|
|
218
|
+
await this.decodeChunks();
|
|
197
219
|
await new Promise(res => setTimeout(res, 0));
|
|
198
220
|
}
|
|
199
221
|
|