@revideo/2d 0.4.8-alpha.1031 → 0.4.8

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.
@@ -1 +1 @@
1
- {"version":3,"file":"segment.d.ts","sourceRoot":"","sources":["../../../../src/lib/utils/video/parser/segment.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,SAAS,CAAC;AAE7B,qBAAa,OAAO;IAClB,OAAO,CAAC,IAAI,CAAkB;IAC9B,OAAO,CAAC,eAAe,CAAyB;IAChD,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,IAAI,CAAM;IAClB,OAAO,CAAC,IAAI,CAAO;IAEnB,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,OAAO,CAAe;IAE9B,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,WAAW,CAAoB;IAEvC,OAAO,CAAC,QAAQ,CAAuC;gBAGrD,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,GAAG,EACT,KAAK,EAAE,IAAI,EAAE,EACb,cAAc,EAAE,MAAM,EACtB,SAAS,GAAE,MAAU;IAsBV,KAAK,CAAC,aAAa,EAAE,kBAAkB;IAkBpD;;;;;;OAMG;YACW,sBAAsB;IAgCpC;;;OAGG;IACH,OAAO,CAAC,SAAS;IAiBjB;;;OAGG;IACH,OAAO,CAAC,OAAO;YA4BD,cAAc;IA2Bf,YAAY;IASzB;;OAEG;IACI,KAAK;IAML,kBAAkB;IAIlB,YAAY;CAGpB"}
1
+ {"version":3,"file":"segment.d.ts","sourceRoot":"","sources":["../../../../src/lib/utils/video/parser/segment.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,SAAS,CAAC;AAE7B,qBAAa,OAAO;IAClB,OAAO,CAAC,IAAI,CAAkB;IAC9B,OAAO,CAAC,eAAe,CAAyB;IAChD,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,IAAI,CAAM;IAClB,OAAO,CAAC,IAAI,CAAO;IAEnB,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,OAAO,CAAe;IAE9B,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,WAAW,CAAoB;IAEvC,OAAO,CAAC,QAAQ,CAAuC;gBAGrD,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,GAAG,EACT,KAAK,EAAE,IAAI,EAAE,EACb,cAAc,EAAE,MAAM,EACtB,SAAS,GAAE,MAAU;IAsBV,KAAK,CAAC,aAAa,EAAE,kBAAkB;IAoDpD;;;;;;OAMG;YACW,sBAAsB;IAgCpC;;;OAGG;IACH,OAAO,CAAC,SAAS;IAiBjB;;;OAGG;YACW,OAAO;YA4BP,cAAc;IA2Bf,YAAY;IASzB;;OAEG;IACU,KAAK;IAaX,kBAAkB;IAIlB,YAAY;CAGpB"}
@@ -24,6 +24,32 @@ export class Segment {
24
24
  });
25
25
  }
26
26
  async start(decoderConfig) {
27
+ // If this is an empty edit, we just need to fill the buffer with empty frames.
28
+ if (this.edit.mediaTime === -1) {
29
+ this.done = true;
30
+ this.responseFinished = true;
31
+ this.decoder.close();
32
+ const segmentDurationInSeconds = this.edit.segmentDuration /
33
+ this.file.getInfo().videoTracks[0].movie_timescale;
34
+ const framesToFill = segmentDurationInSeconds * this.edit.fps;
35
+ const height = this.file.getInfo().videoTracks[0].track_height;
36
+ const width = this.file.getInfo().videoTracks[0].track_width;
37
+ const bufferSize = height * width * 4;
38
+ const buffer = new ArrayBuffer(bufferSize);
39
+ const uint8Array = new Uint8Array(buffer);
40
+ // Make the frame black
41
+ uint8Array.fill(0);
42
+ this.frameBuffer = Array.from({ length: framesToFill }, () => {
43
+ return new VideoFrame(uint8Array, {
44
+ timestamp: 0,
45
+ duration: 1 / this.edit.fps,
46
+ codedHeight: height,
47
+ codedWidth: width,
48
+ format: 'BGRA',
49
+ });
50
+ });
51
+ return;
52
+ }
27
53
  this.decoder.configure(decoderConfig);
28
54
  const videoTrack = this.file.getInfo().videoTracks[0];
29
55
  const trak = this.file.getTrackById(videoTrack.id);
@@ -60,8 +86,8 @@ export class Segment {
60
86
  if (done) {
61
87
  this.responseFinished = true;
62
88
  this.abortController.abort();
63
- this.decoder.flush();
64
89
  sink.close();
90
+ this.decoder.flush();
65
91
  return;
66
92
  }
67
93
  sink.write(value);
@@ -92,7 +118,7 @@ export class Segment {
92
118
  * Called when the decoder has a frame ready.
93
119
  * Pushes the frame to the buffer so it can be consumed.
94
120
  */
95
- onFrame(frame) {
121
+ async onFrame(frame) {
96
122
  this.framesDue--;
97
123
  // If the frame comes before the seek time, close it.
98
124
  const mediaTimeInSec = this.edit.mediaTime / this.file.getInfo().videoTracks[0].timescale;
@@ -109,7 +135,7 @@ export class Segment {
109
135
  if (frameTimeInSec > segmentEndTime) {
110
136
  frame.close();
111
137
  this.done = true;
112
- this.decoder.flush();
138
+ await this.decoder.flush();
113
139
  return;
114
140
  }
115
141
  this.frameBuffer.push(frame);
@@ -146,10 +172,18 @@ export class Segment {
146
172
  /**
147
173
  * Called when we are done with the extractor.
148
174
  */
149
- close() {
175
+ async close() {
150
176
  this.abortController.abort();
151
177
  this.frameBuffer.forEach(frame => frame.close());
152
- this.decoder.close();
178
+ try {
179
+ if (this.decoder.state === 'configured') {
180
+ await this.decoder.flush();
181
+ this.decoder.close();
182
+ }
183
+ }
184
+ catch (e) {
185
+ // Ignore
186
+ }
153
187
  }
154
188
  getFramesProcessed() {
155
189
  return this.framesProcessed;
@@ -158,4 +192,4 @@ export class Segment {
158
192
  return this.startTime;
159
193
  }
160
194
  }
161
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VnbWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9saWIvdXRpbHMvdmlkZW8vcGFyc2VyL3NlZ21lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLFdBQVcsRUFBQyxNQUFNLFFBQVEsQ0FBQztBQUduQyxNQUFNLE9BQU8sT0FBTztJQWtCbEIsWUFDRSxHQUFXLEVBQ1gsSUFBUyxFQUNULEtBQWEsRUFDYixjQUFzQixFQUN0QixZQUFvQixDQUFDO1FBdEJmLFNBQUksR0FBWSxLQUFLLENBQUM7UUFDdEIsb0JBQWUsR0FBRyxJQUFJLGVBQWUsRUFBRSxDQUFDO1FBTXhDLHFCQUFnQixHQUFZLEtBQUssQ0FBQztRQUdsQyxvQkFBZSxHQUFHLENBQUMsQ0FBQztRQUVwQixjQUFTLEdBQUcsQ0FBQyxDQUFDO1FBQ2QsZ0JBQVcsR0FBaUIsRUFBRSxDQUFDO1FBRS9CLGFBQVEsR0FBd0IsS0FBSyxJQUFJLEVBQUUsR0FBRSxDQUFDLENBQUM7UUFTckQsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFFZixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNoRCxJQUFJLENBQUMsSUFBSSxHQUFHLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUVsQyxJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztRQUUzQixrR0FBa0c7UUFDbEcsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDakUsSUFBSSxDQUFDLGVBQWUsSUFBSSxhQUFhLENBQUM7UUFFdEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLFlBQVks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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.4.8-alpha.1031+85b415cb",
3
+ "version": "0.4.8",
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.4.8-alpha.1031+85b415cb",
32
+ "@revideo/internal": "0.0.0",
33
+ "@revideo/ui": "0.4.8",
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.8-alpha.1031+85b415cb",
43
+ "@revideo/core": "0.4.8",
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": "85b415cbbe23026274f4e3f00100a72f829ee915"
50
+ "gitHead": "a00c4e08ea9560e4f4e3a3c9e76c8997f4d5a78d"
51
51
  }
@@ -0,0 +1,51 @@
1
+ import {SimpleSignal, useAssetBase} from '@revideo/core';
2
+ import {nodeName, signal} from '../decorators';
3
+ import {Rect} from './Rect';
4
+
5
+ /**
6
+ * A component that has a source. Used as a base class for `Media` and `Img` components.
7
+ */
8
+ @nodeName('Asset')
9
+ export abstract class Asset extends Rect {
10
+ /**
11
+ * The source of this asset.
12
+ *
13
+ * @example
14
+ * Using a local path, with the resource inside the /public folder:
15
+ * ```tsx
16
+ * view.add(<Img src={'/image.png} />)
17
+ * ```
18
+ * Loading a resource from the internet:
19
+ * ```tsx
20
+ * view.add(<Img src="https://example.com/image.png" />)
21
+ * ```
22
+ */
23
+ @signal()
24
+ public declare readonly src: SimpleSignal<string, this>;
25
+
26
+ public assetRoot?: `${string}/`;
27
+
28
+ public fullSource(): string {
29
+ console.log(`Calling fullSource for ${this.src()}`);
30
+
31
+ if (!this.assetRoot) {
32
+ console.log('Setting assetRoot', useAssetBase());
33
+ this.assetRoot = useAssetBase();
34
+ }
35
+
36
+ let src = this.src();
37
+ const isUrl = src.startsWith('http://') || src.startsWith('https://');
38
+
39
+ if (isUrl) {
40
+ return src;
41
+ }
42
+
43
+ // We remove the trailing slash from the assetRoot
44
+ // and make sure there is a leading slash in the src
45
+ if (src[0] !== '/') {
46
+ src = '/' + src;
47
+ }
48
+
49
+ return this.assetRoot.slice(0, -1) + src;
50
+ }
51
+ }
@@ -14,7 +14,8 @@ import {
14
14
  import {computed, initial, nodeName, signal} from '../decorators';
15
15
  import {DesiredLength} from '../partials';
16
16
  import {drawImage} from '../utils';
17
- import {Rect, RectProps} from './Rect';
17
+ import {Asset} from './Asset';
18
+ import {RectProps} from './Rect';
18
19
  import imageWithoutSource from './__logs__/image-without-source.md';
19
20
 
20
21
  export interface ImgProps extends RectProps {
@@ -66,7 +67,7 @@ export interface ImgProps extends RectProps {
66
67
  * ```
67
68
  */
68
69
  @nodeName('Img')
69
- export class Img extends Rect {
70
+ export class Img extends Asset {
70
71
  private static pool: Record<string, HTMLImageElement> = {};
71
72
 
72
73
  static {
@@ -81,24 +82,6 @@ export class Img extends Rect {
81
82
  }
82
83
  }
83
84
 
84
- /**
85
- * The source of this image.
86
- *
87
- * @example
88
- * Using a local image:
89
- * ```tsx
90
- * import image from './example.png';
91
- * // ...
92
- * view.add(<Img src={image} />)
93
- * ```
94
- * Loading an image from the internet:
95
- * ```tsx
96
- * view.add(<Img src="https://example.com/image.png" />)
97
- * ```
98
- */
99
- @signal()
100
- public declare readonly src: SimpleSignal<string, this>;
101
-
102
85
  /**
103
86
  * The alpha value of this image.
104
87
  *
@@ -149,7 +132,7 @@ export class Img extends Rect {
149
132
 
150
133
  @computed()
151
134
  protected image(): HTMLImageElement {
152
- const rawSrc = this.src();
135
+ const rawSrc = this.fullSource();
153
136
  let src = '';
154
137
  let key = '';
155
138
  if (rawSrc) {
@@ -5,11 +5,11 @@ import {
5
5
  clamp,
6
6
  isReactive,
7
7
  useLogger,
8
- useScene,
9
8
  useThread,
10
9
  } from '@revideo/core';
11
10
  import {computed, initial, nodeName, signal} from '../decorators';
12
- import {Rect, RectProps} from './Rect';
11
+ import {Asset} from './Asset';
12
+ import {RectProps} from './Rect';
13
13
  import reactivePlaybackRate from './__logs__/reactive-playback-rate.md';
14
14
 
15
15
  export interface MediaProps extends RectProps {
@@ -22,10 +22,7 @@ export interface MediaProps extends RectProps {
22
22
  }
23
23
 
24
24
  @nodeName('Media')
25
- export abstract class Media extends Rect {
26
- @signal()
27
- public declare readonly src: SimpleSignal<string, this>;
28
-
25
+ export abstract class Media extends Asset {
29
26
  @initial(false)
30
27
  @signal()
31
28
  public declare readonly loop: SimpleSignal<boolean, this>;
@@ -55,29 +52,6 @@ export abstract class Media extends Rect {
55
52
  }
56
53
  }
57
54
 
58
- public assetRoot?: `${string}/`;
59
-
60
- public fullSource(): string {
61
- if (!this.assetRoot) {
62
- this.assetRoot = useScene().assetRoot;
63
- }
64
-
65
- let src = this.src();
66
- const isUrl = src.startsWith('http://') || src.startsWith('https://');
67
-
68
- if (isUrl) {
69
- return src;
70
- }
71
-
72
- // We remove the trailing slash from the assetRoot
73
- // and make sure there is a leading slash in the src
74
- if (src[0] !== '/') {
75
- src = '/' + src;
76
- }
77
-
78
- return this.assetRoot.slice(0, -1) + src;
79
- }
80
-
81
55
  public isPlaying(): boolean {
82
56
  return this.playing();
83
57
  }
@@ -342,8 +342,8 @@ export class Video extends Media {
342
342
  if (this.fullSource().split('?')[0].endsWith('.mov')) return 'mov';
343
343
 
344
344
  if (
345
- this.fullSource().startsWith('http:') ||
346
- this.fullSource().startsWith('https:')
345
+ this.fullSource().startsWith('http://') ||
346
+ this.fullSource().startsWith('https://')
347
347
  ) {
348
348
  try {
349
349
  const response = await fetch(this.fullSource(), {method: 'HEAD'});
@@ -21,7 +21,7 @@ export class View2D extends Rect {
21
21
  frame.style.pointerEvents = 'none';
22
22
  frame.style.top = '0';
23
23
  frame.style.left = '0';
24
- frame.style.fontFeatureSettings = 'normal';
24
+ frame.style.fontFeatureSettings = 'normal'; // TODO: find solution that fully isolates CSS
25
25
  frame.style.opacity = '0';
26
26
  frame.style.overflow = 'hidden';
27
27
  document.body.prepend(frame);
@@ -194,7 +194,7 @@ export class Mp4Parser {
194
194
  frame = this.sampler.getLastFrame();
195
195
 
196
196
  // We can close the segment
197
- this.sampler.getSegment().close();
197
+ await this.sampler.getSegment().close();
198
198
 
199
199
  // If we still don't have a frame, throw an error
200
200
  if (!frame) {
@@ -47,6 +47,40 @@ export class Segment {
47
47
  }
48
48
 
49
49
  public async start(decoderConfig: VideoDecoderConfig) {
50
+ // If this is an empty edit, we just need to fill the buffer with empty frames.
51
+ if (this.edit.mediaTime === -1) {
52
+ this.done = true;
53
+ this.responseFinished = true;
54
+ this.decoder.close();
55
+
56
+ const segmentDurationInSeconds =
57
+ this.edit.segmentDuration /
58
+ this.file.getInfo().videoTracks[0].movie_timescale;
59
+ const framesToFill = segmentDurationInSeconds * this.edit.fps;
60
+
61
+ const height = this.file.getInfo().videoTracks[0].track_height;
62
+ const width = this.file.getInfo().videoTracks[0].track_width;
63
+
64
+ const bufferSize = height * width * 4;
65
+ const buffer = new ArrayBuffer(bufferSize);
66
+ const uint8Array = new Uint8Array(buffer);
67
+
68
+ // Make the frame black
69
+ uint8Array.fill(0);
70
+
71
+ this.frameBuffer = Array.from({length: framesToFill}, () => {
72
+ return new VideoFrame(uint8Array, {
73
+ timestamp: 0,
74
+ duration: 1 / this.edit.fps,
75
+ codedHeight: height,
76
+ codedWidth: width,
77
+ format: 'BGRA',
78
+ });
79
+ });
80
+
81
+ return;
82
+ }
83
+
50
84
  this.decoder.configure(decoderConfig);
51
85
  const videoTrack = this.file.getInfo().videoTracks[0];
52
86
  const trak = this.file.getTrackById(videoTrack.id);
@@ -92,8 +126,8 @@ export class Segment {
92
126
  if (done) {
93
127
  this.responseFinished = true;
94
128
  this.abortController.abort();
95
- this.decoder.flush();
96
129
  sink.close();
130
+ this.decoder.flush();
97
131
  return;
98
132
  }
99
133
 
@@ -128,7 +162,7 @@ export class Segment {
128
162
  * Called when the decoder has a frame ready.
129
163
  * Pushes the frame to the buffer so it can be consumed.
130
164
  */
131
- private onFrame(frame: VideoFrame) {
165
+ private async onFrame(frame: VideoFrame) {
132
166
  this.framesDue--;
133
167
 
134
168
  // If the frame comes before the seek time, close it.
@@ -149,7 +183,7 @@ export class Segment {
149
183
  if (frameTimeInSec > segmentEndTime) {
150
184
  frame.close();
151
185
  this.done = true;
152
- this.decoder.flush();
186
+ await this.decoder.flush();
153
187
  return;
154
188
  }
155
189
 
@@ -195,10 +229,17 @@ export class Segment {
195
229
  /**
196
230
  * Called when we are done with the extractor.
197
231
  */
198
- public close() {
232
+ public async close() {
199
233
  this.abortController.abort();
200
234
  this.frameBuffer.forEach(frame => frame.close());
201
- this.decoder.close();
235
+ try {
236
+ if (this.decoder.state === 'configured') {
237
+ await this.decoder.flush();
238
+ this.decoder.close();
239
+ }
240
+ } catch (e) {
241
+ // Ignore
242
+ }
202
243
  }
203
244
 
204
245
  public getFramesProcessed() {