@omnimedia/omnitool 1.1.0-42 → 1.1.0-44
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/package.json +17 -18
- package/s/demo/demo.bundle.ts +20 -40
- package/s/demo/routines/export-test.ts +8 -0
- package/s/demo/routines/playback-test.ts +21 -0
- package/s/demo/routines/timeline-setup.ts +24 -0
- package/s/demo/routines/transcode-test.ts +2 -0
- package/s/driver/driver-worker.ts +9 -0
- package/s/driver/driver.test.ts +1 -1
- package/s/driver/driver.ts +8 -22
- package/s/driver/fns/schematic.ts +6 -2
- package/s/driver/fns/work.ts +2 -133
- package/s/driver/parts/compositor.ts +178 -0
- package/s/driver/parts/machina.ts +19 -20
- package/s/index.ts +1 -0
- package/s/timeline/index.ts +1 -1
- package/s/timeline/parts/media.ts +11 -2
- package/s/timeline/parts/{compositor → renderers}/parts/html-tree.ts +2 -2
- package/s/timeline/parts/{compositor → renderers}/parts/tree-builder.ts +4 -2
- package/s/timeline/parts/{compositor → renderers}/playback.ts +4 -13
- package/s/timeline/parts/{compositor → renderers}/samplers/html.ts +19 -5
- package/s/timeline/parts/{compositor → renderers}/samplers/webcodecs.ts +1 -1
- package/s/timeline/parts/resource-pool.ts +8 -4
- package/s/timeline/parts/resource.ts +1 -0
- package/s/timeline/sugar/o.ts +10 -2
- package/s/timeline/sugar/omni-test.ts +14 -14
- package/s/timeline/sugar/omni.ts +2 -2
- package/s/timeline/utils/datafile.ts +14 -4
- package/s/timeline/utils/dummy-data.ts +3 -3
- package/x/demo/WebGLRenderer-Q3OV2JVE.js +2 -0
- package/x/demo/WebGLRenderer-Q3OV2JVE.js.map +7 -0
- package/x/demo/WebGPURenderer-FUFF62QA.js +2 -0
- package/x/demo/WebGPURenderer-FUFF62QA.js.map +7 -0
- package/x/demo/browserAll-PGQYU756.js +2 -0
- package/x/demo/browserAll-PGQYU756.js.map +7 -0
- package/x/demo/chunk-2RBLPWNG.js +393 -0
- package/x/demo/chunk-2RBLPWNG.js.map +7 -0
- package/x/demo/chunk-6DBMQOFE.js +42 -0
- package/x/demo/chunk-6DBMQOFE.js.map +7 -0
- package/x/demo/chunk-LAJHJD2S.js +2 -0
- package/x/demo/chunk-LAJHJD2S.js.map +7 -0
- package/x/demo/chunk-LQU5JKKZ.js +269 -0
- package/x/demo/chunk-LQU5JKKZ.js.map +7 -0
- package/x/demo/chunk-RFNLITDQ.js +327 -0
- package/x/demo/chunk-RFNLITDQ.js.map +7 -0
- package/x/demo/chunk-TBWCKYN2.js +2 -0
- package/x/demo/chunk-TBWCKYN2.js.map +7 -0
- package/x/demo/chunk-TLDBHU4V.js +15 -0
- package/x/demo/chunk-TLDBHU4V.js.map +7 -0
- package/x/demo/chunk-X2GHKWPJ.js +157 -0
- package/x/demo/chunk-X2GHKWPJ.js.map +7 -0
- package/x/demo/demo.bundle.js +18 -27
- package/x/demo/demo.bundle.js.map +1 -1
- package/x/demo/demo.bundle.min.js +2378 -534
- package/x/demo/demo.bundle.min.js.map +4 -4
- package/x/demo/routines/export-test.d.ts +2 -0
- package/x/demo/routines/export-test.js +7 -0
- package/x/demo/routines/export-test.js.map +1 -0
- package/x/demo/routines/playback-test.d.ts +3 -0
- package/x/demo/routines/playback-test.js +17 -0
- package/x/demo/routines/playback-test.js.map +1 -0
- package/x/demo/routines/timeline-setup.d.ts +6 -0
- package/x/demo/routines/timeline-setup.js +13 -0
- package/x/demo/routines/timeline-setup.js.map +1 -0
- package/x/demo/routines/transcode-test.js +2 -0
- package/x/demo/routines/transcode-test.js.map +1 -1
- package/x/demo/webworkerAll-3YNCLHCR.js +2 -0
- package/x/demo/webworkerAll-3YNCLHCR.js.map +7 -0
- package/x/driver/WebGLRenderer-OMRWYQIV.js +2 -0
- package/x/driver/WebGLRenderer-OMRWYQIV.js.map +7 -0
- package/x/driver/WebGPURenderer-KQJB2OJJ.js +2 -0
- package/x/driver/WebGPURenderer-KQJB2OJJ.js.map +7 -0
- package/x/driver/browserAll-YBZEJCN3.js +2 -0
- package/x/driver/browserAll-YBZEJCN3.js.map +7 -0
- package/x/driver/chunk-3L3MB5NY.js +393 -0
- package/x/driver/chunk-3L3MB5NY.js.map +7 -0
- package/x/driver/chunk-42BQ4XKE.js +269 -0
- package/x/driver/chunk-42BQ4XKE.js.map +7 -0
- package/x/driver/chunk-4HAYG3N5.js +327 -0
- package/x/driver/chunk-4HAYG3N5.js.map +7 -0
- package/x/driver/chunk-BFBY7VYB.js +42 -0
- package/x/driver/chunk-BFBY7VYB.js.map +7 -0
- package/x/driver/chunk-KM6O72WE.js +157 -0
- package/x/driver/chunk-KM6O72WE.js.map +7 -0
- package/x/driver/chunk-N6HD4WYJ.js +2 -0
- package/x/driver/chunk-N6HD4WYJ.js.map +7 -0
- package/x/driver/chunk-WCZ2O3UN.js +15 -0
- package/x/driver/chunk-WCZ2O3UN.js.map +7 -0
- package/x/driver/chunk-XWNSF3WJ.js +2 -0
- package/x/driver/chunk-XWNSF3WJ.js.map +7 -0
- package/x/driver/driver-worker.d.ts +1 -0
- package/x/driver/driver-worker.js +6 -0
- package/x/driver/driver-worker.js.map +1 -0
- package/x/driver/driver.d.ts +5 -4
- package/x/driver/driver.js +10 -20
- package/x/driver/driver.js.map +1 -1
- package/x/driver/driver.test.js +1 -1
- package/x/driver/driver.test.js.map +1 -1
- package/x/driver/driver.worker.bundle.min.js +119 -3504
- package/x/driver/driver.worker.bundle.min.js.map +4 -4
- package/x/driver/fns/host.d.ts +1 -2
- package/x/driver/fns/schematic.d.ts +6 -1
- package/x/driver/fns/work.d.ts +2 -4
- package/x/driver/fns/work.js +1 -100
- package/x/driver/fns/work.js.map +1 -1
- package/x/driver/parts/compositor.d.ts +15 -0
- package/x/driver/parts/compositor.js +152 -0
- package/x/driver/parts/compositor.js.map +1 -0
- package/x/driver/parts/machina.d.ts +0 -20
- package/x/driver/parts/machina.js +6 -10
- package/x/driver/parts/machina.js.map +1 -1
- package/x/driver/webworkerAll-BKJQW6P7.js +2 -0
- package/x/driver/webworkerAll-BKJQW6P7.js.map +7 -0
- package/x/features/speech/transcribe/parts/prep-audio.d.ts +1 -1
- package/x/features/speech/transcribe/worker.bundle.min.js +899 -899
- package/x/features/speech/transcribe/worker.bundle.min.js.map +4 -4
- package/x/index.d.ts +1 -0
- package/x/index.html +2 -2
- package/x/index.js +1 -0
- package/x/index.js.map +1 -1
- package/x/timeline/index.d.ts +1 -1
- package/x/timeline/index.js +1 -1
- package/x/timeline/index.js.map +1 -1
- package/x/timeline/parts/filmstrip.d.ts +1 -1
- package/x/timeline/parts/media.d.ts +2 -0
- package/x/timeline/parts/media.js +10 -2
- package/x/timeline/parts/media.js.map +1 -1
- package/x/timeline/parts/renderers/export.js.map +1 -0
- package/x/timeline/parts/{compositor → renderers}/parts/html-tree.js +2 -2
- package/x/timeline/parts/renderers/parts/html-tree.js.map +1 -0
- package/x/timeline/parts/renderers/parts/schedulers.js.map +1 -0
- package/x/timeline/parts/{compositor → renderers}/parts/tree-builder.js +4 -2
- package/x/timeline/parts/renderers/parts/tree-builder.js.map +1 -0
- package/x/timeline/parts/renderers/parts/webcodecs-tree.js.map +1 -0
- package/x/timeline/parts/{compositor → renderers}/playback.d.ts +2 -4
- package/x/timeline/parts/{compositor → renderers}/playback.js +5 -14
- package/x/timeline/parts/renderers/playback.js.map +1 -0
- package/x/timeline/parts/{compositor → renderers}/samplers/html.js +14 -5
- package/x/timeline/parts/renderers/samplers/html.js.map +1 -0
- package/x/timeline/parts/{compositor → renderers}/samplers/webcodecs.js +1 -1
- package/x/timeline/parts/renderers/samplers/webcodecs.js.map +1 -0
- package/x/timeline/parts/resource-pool.d.ts +2 -0
- package/x/timeline/parts/resource-pool.js +7 -4
- package/x/timeline/parts/resource-pool.js.map +1 -1
- package/x/timeline/parts/resource.d.ts +1 -0
- package/x/timeline/sugar/o.d.ts +4 -1
- package/x/timeline/sugar/o.js +4 -2
- package/x/timeline/sugar/o.js.map +1 -1
- package/x/timeline/sugar/omni-test.js +14 -7
- package/x/timeline/sugar/omni-test.js.map +1 -1
- package/x/timeline/sugar/omni.d.ts +1 -2
- package/x/timeline/sugar/omni.js +2 -2
- package/x/timeline/sugar/omni.js.map +1 -1
- package/x/timeline/utils/datafile.d.ts +4 -3
- package/x/timeline/utils/datafile.js +16 -5
- package/x/timeline/utils/datafile.js.map +1 -1
- package/x/timeline/utils/dummy-data.d.ts +1 -2
- package/x/timeline/utils/dummy-data.js +4 -2
- package/x/timeline/utils/dummy-data.js.map +1 -1
- package/x/timeline/parts/compositor/export.js.map +0 -1
- package/x/timeline/parts/compositor/parts/html-tree.js.map +0 -1
- package/x/timeline/parts/compositor/parts/schedulers.js.map +0 -1
- package/x/timeline/parts/compositor/parts/tree-builder.js.map +0 -1
- package/x/timeline/parts/compositor/parts/webcodecs-tree.js.map +0 -1
- package/x/timeline/parts/compositor/playback.js.map +0 -1
- package/x/timeline/parts/compositor/samplers/html.js.map +0 -1
- package/x/timeline/parts/compositor/samplers/webcodecs.js.map +0 -1
- /package/s/timeline/parts/{compositor → renderers}/export.ts +0 -0
- /package/s/timeline/parts/{compositor → renderers}/parts/schedulers.ts +0 -0
- /package/s/timeline/parts/{compositor → renderers}/parts/webcodecs-tree.ts +0 -0
- /package/x/timeline/parts/{compositor → renderers}/export.d.ts +0 -0
- /package/x/timeline/parts/{compositor → renderers}/export.js +0 -0
- /package/x/timeline/parts/{compositor → renderers}/parts/html-tree.d.ts +0 -0
- /package/x/timeline/parts/{compositor → renderers}/parts/schedulers.d.ts +0 -0
- /package/x/timeline/parts/{compositor → renderers}/parts/schedulers.js +0 -0
- /package/x/timeline/parts/{compositor → renderers}/parts/tree-builder.d.ts +0 -0
- /package/x/timeline/parts/{compositor → renderers}/parts/webcodecs-tree.d.ts +0 -0
- /package/x/timeline/parts/{compositor → renderers}/parts/webcodecs-tree.js +0 -0
- /package/x/timeline/parts/{compositor → renderers}/samplers/html.d.ts +0 -0
- /package/x/timeline/parts/{compositor → renderers}/samplers/webcodecs.d.ts +0 -0
package/x/index.d.ts
CHANGED
package/x/index.html
CHANGED
|
@@ -65,7 +65,7 @@ canvas {
|
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
</style>
|
|
68
|
-
<script type=module src="demo/demo.bundle.min.js?v=
|
|
68
|
+
<script type=module src="demo/demo.bundle.min.js?v=b5d6337ca45d"></script>
|
|
69
69
|
|
|
70
70
|
|
|
71
71
|
<meta name="theme-color" content="#3cff9c">
|
|
@@ -85,7 +85,7 @@ canvas {
|
|
|
85
85
|
<body>
|
|
86
86
|
|
|
87
87
|
<section>
|
|
88
|
-
<h1>Omnitool <small>v1.1.0-
|
|
88
|
+
<h1>Omnitool <small>v1.1.0-44</small></h1>
|
|
89
89
|
<button class=export>export</button>
|
|
90
90
|
<button class=fetch>fetch</button>
|
|
91
91
|
<input type="file" class="file-input">
|
package/x/index.js
CHANGED
package/x/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../s/index.ts"],"names":[],"mappings":"AACA,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../s/index.ts"],"names":[],"mappings":"AACA,cAAc,oBAAoB,CAAA;AAClC,cAAc,2BAA2B,CAAA;AACzC,cAAc,qBAAqB,CAAA"}
|
package/x/timeline/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export * from "./parts/resource-pool.js";
|
|
|
5
5
|
export * from "./parts/resource.js";
|
|
6
6
|
export * from "./parts/filmstrip.js";
|
|
7
7
|
export * from "./parts/waveform.js";
|
|
8
|
-
export * from "./parts/
|
|
8
|
+
export * from "./parts/renderers/playback.js";
|
|
9
9
|
export * from "./sugar/o.js";
|
|
10
10
|
export * from "./sugar/omni.js";
|
|
11
11
|
export * from "./utils/checksum.js";
|
package/x/timeline/index.js
CHANGED
|
@@ -5,7 +5,7 @@ export * from "./parts/resource-pool.js";
|
|
|
5
5
|
export * from "./parts/resource.js";
|
|
6
6
|
export * from "./parts/filmstrip.js";
|
|
7
7
|
export * from "./parts/waveform.js";
|
|
8
|
-
export * from "./parts/
|
|
8
|
+
export * from "./parts/renderers/playback.js";
|
|
9
9
|
export * from "./sugar/o.js";
|
|
10
10
|
export * from "./sugar/omni.js";
|
|
11
11
|
export * from "./utils/checksum.js";
|
package/x/timeline/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../s/timeline/index.ts"],"names":[],"mappings":"AACA,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../s/timeline/index.ts"],"names":[],"mappings":"AACA,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,+BAA+B,CAAA;AAE7C,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAE/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA"}
|
|
@@ -25,7 +25,7 @@ export declare class Filmstrip {
|
|
|
25
25
|
* Returns the cached thumbnail (if any) for a given timestamp.
|
|
26
26
|
* @param time - The timestamp to retrieve the canvas for.
|
|
27
27
|
*/
|
|
28
|
-
getThumbnail(time: number):
|
|
28
|
+
getThumbnail(time: number): WrappedCanvas | undefined;
|
|
29
29
|
}
|
|
30
30
|
type TimeRange = [number, number];
|
|
31
31
|
interface FilmstripOptions {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Datafile } from "../utils/datafile.js";
|
|
2
|
+
import { DecoderSource } from "../../driver/fns/schematic.js";
|
|
2
3
|
export declare class Media {
|
|
3
4
|
#private;
|
|
4
5
|
datafile: Datafile;
|
|
@@ -7,4 +8,5 @@ export declare class Media {
|
|
|
7
8
|
hasAudio: boolean;
|
|
8
9
|
constructor(datafile: Datafile);
|
|
9
10
|
static analyze(datafile: Datafile): Promise<Media>;
|
|
11
|
+
static duration(source: DecoderSource): Promise<number>;
|
|
10
12
|
}
|
|
@@ -10,12 +10,20 @@ export class Media {
|
|
|
10
10
|
}
|
|
11
11
|
static async analyze(datafile) {
|
|
12
12
|
const media = new this(datafile);
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
const duration = await this.duration(datafile.url) * 1000;
|
|
14
|
+
media.duration = duration;
|
|
15
|
+
const { video, audio } = await this.#has(datafile.url);
|
|
15
16
|
media.hasAudio = audio;
|
|
16
17
|
media.hasVideo = video;
|
|
17
18
|
return media;
|
|
18
19
|
}
|
|
20
|
+
static async duration(source) {
|
|
21
|
+
const input = new Input({
|
|
22
|
+
formats: ALL_FORMATS,
|
|
23
|
+
source: await loadDecoderSource(source)
|
|
24
|
+
});
|
|
25
|
+
return input.computeDuration();
|
|
26
|
+
}
|
|
19
27
|
static async #has(source) {
|
|
20
28
|
const input = new Input({
|
|
21
29
|
formats: ALL_FORMATS,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../s/timeline/parts/media.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAE,KAAK,EAAC,MAAM,YAAY,CAAA;AAI7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,2CAA2C,CAAA;AAE3E,MAAM,OAAO,KAAK;IAKE;IAJnB,QAAQ,GAAG,CAAC,CAAA;IACZ,QAAQ,GAAG,KAAK,CAAA;IAChB,QAAQ,GAAG,KAAK,CAAA;IAEhB,YAAmB,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;IAAG,CAAC;IAEzC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAkB;QACtC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAA;QAChC,KAAK,CAAC,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../s/timeline/parts/media.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAE,KAAK,EAAC,MAAM,YAAY,CAAA;AAI7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,2CAA2C,CAAA;AAE3E,MAAM,OAAO,KAAK;IAKE;IAJnB,QAAQ,GAAG,CAAC,CAAA;IACZ,QAAQ,GAAG,KAAK,CAAA;IAChB,QAAQ,GAAG,KAAK,CAAA;IAEhB,YAAmB,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;IAAG,CAAC;IAEzC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAkB;QACtC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAA;QAChC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAA;QACzD,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACzB,MAAM,EAAC,KAAK,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;QACpD,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAA;QACtB,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAA;QACtB,OAAO,KAAK,CAAA;IACb,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAqB;QAC1C,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;YACvB,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,MAAM,iBAAiB,CAAC,MAAM,CAAC;SACvC,CAAC,CAAA;QACF,OAAO,KAAK,CAAC,eAAe,EAAE,CAAA;IAC/B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAqB;QACtC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;YACvB,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,MAAM,iBAAiB,CAAC,MAAM,CAAC;SACvC,CAAC,CAAA;QACF,OAAO;YACN,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,oBAAoB,EAAE,CAAC;YAC7C,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,oBAAoB,EAAE,CAAC;SAC7C,CAAA;IACF,CAAC;CACD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../../s/timeline/parts/renderers/export.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,9 +20,9 @@ class HTMLNodeBuilder extends TreeBuilder {
|
|
|
20
20
|
composeAudio_Sequence(children) {
|
|
21
21
|
return {
|
|
22
22
|
onTimeUpdate: (time) => {
|
|
23
|
-
let localTime = time;
|
|
23
|
+
let localTime = Math.round(time);
|
|
24
24
|
for (const child of children) {
|
|
25
|
-
if (localTime
|
|
25
|
+
if (localTime <= child.duration) {
|
|
26
26
|
if (child.audio)
|
|
27
27
|
child.audio.onTimeUpdate(localTime);
|
|
28
28
|
break;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"html-tree.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/renderers/parts/html-tree.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAExF,MAAM,eAAgB,SAAQ,WAAmC;IAC1C;IAAwC;IAA9D,YAAsB,KAA4B,EAAY,OAAoB;QACjF,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QADA,UAAK,GAAL,KAAK,CAAuB;QAAY,YAAO,GAAP,OAAO,CAAa;IAElF,CAAC;IAED,kBAAkB,CAAC,QAAwC;QAC1D,OAAO;YACN,YAAY,EAAE,CAAC,IAAY,EAAE,EAAE;gBAC9B,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;oBAC9B,IAAI,KAAK,CAAC,KAAK;wBAAE,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;gBAChD,CAAC;YACF,CAAC;SACD,CAAA;IACF,CAAC;IACD,qBAAqB,CAAC,QAAwC;QAC7D,OAAO;YACN,YAAY,EAAE,CAAC,IAAY,EAAE,EAAE;gBAC9B,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBAChC,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;oBAC9B,IAAI,SAAS,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;wBACjC,IAAI,KAAK,CAAC,KAAK;4BAAE,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;wBACpD,MAAK;oBACN,CAAC;oBACD,SAAS,IAAI,KAAK,CAAC,QAAQ,CAAA;gBAC5B,CAAC;YACF,CAAC;SACD,CAAA;IACF,CAAC;CACD;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAc,EAAE,KAA4B,EAAE,OAAoB;IACnG,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IACnD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AAC3B,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schedulers.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/renderers/parts/schedulers.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,MAAM,QAAQ,GAAG,CACvB,MAAkC,EAClC,QAAuC,EAClB,EAAE;IAEtB,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,KAAK,GAAkB,IAAI,CAAA;IAC/B,IAAI,GAAG,GAAG,EAAE,CAAA;IAEZ,IAAI,aAAa,GAAG,IAAI,GAAG,GAAG,CAAA;IAC9B,IAAI,WAAW,GAAG,CAAC,CAAA;IACnB,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,IAAI,WAAW,GAAG,CAAC,CAAA;IACnB,IAAI,WAAW,GAAG,CAAC,CAAA;IAEnB,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE;QAC3B,IAAI,CAAC,OAAO;YAAE,OAAM;QAEpB,MAAM,SAAS,GAAG,GAAG,GAAG,QAAQ,CAAA;QAChC,QAAQ,GAAG,GAAG,CAAA;QAEd,WAAW,IAAI,SAAS,CAAA;QACxB,WAAW,IAAI,SAAS,CAAA;QACzB,QAAQ,CAAC,WAAW,CAAC,CAAA;QAEpB,OAAO,WAAW,IAAI,aAAa,EAAE,CAAC;YACpC,MAAM,CAAC,WAAW,CAAC,CAAA;YACnB,WAAW,IAAI,aAAa,CAAA;YAC5B,WAAW,IAAI,aAAa,CAAA;QAC9B,CAAC;QAED,KAAK,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC,CAAA;IAED,OAAO;QACL,IAAI;YACF,IAAI,OAAO;gBAAE,OAAM;YACnB,OAAO,GAAG,IAAI,CAAA;YACd,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;YAC5B,KAAK,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAA;QACrC,CAAC;QACD,KAAK;YACH,IAAI,CAAC,OAAO;gBAAE,OAAM;YACpB,OAAO,GAAG,KAAK,CAAA;YACf,IAAI,KAAK,KAAK,IAAI;gBAAE,oBAAoB,CAAC,KAAK,CAAC,CAAA;YAC/C,KAAK,GAAG,IAAI,CAAA;QACd,CAAC;QACD,IAAI,CAAC,EAAE;YACL,WAAW,GAAG,EAAE,CAAA;YAChB,WAAW,GAAG,CAAC,CAAA;YACf,WAAW,GAAG,EAAE,CAAA;YAChB,QAAQ,CAAC,EAAE,CAAC,CAAA;QACd,CAAC;QACD,OAAO;YACL,IAAI,CAAC,KAAK,EAAE,CAAA;QACd,CAAC;QACD,SAAS;YACP,OAAO,OAAO,CAAA;QAChB,CAAC;QACD,MAAM,CAAC,CAAC;YACP,GAAG,GAAG,CAAC,CAAA;YACP,aAAa,GAAG,IAAI,GAAG,GAAG,CAAA;QAC3B,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAQD,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC7B,IAAsB,EACtB,OAA2D,EAC1D,EAAE;IACH,MAAM,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,CAAA;IAC1B,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;IAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;IAErD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QAChC,IAAI,IAAI,CAAC,KAAK,EAAE,OAAO;YAAE,MAAK;QAC9B,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;QAChB,MAAM,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACpB,CAAC;AACF,CAAC,CAAA"}
|
|
@@ -37,6 +37,7 @@ export class TreeBuilder {
|
|
|
37
37
|
return [];
|
|
38
38
|
else
|
|
39
39
|
return [{
|
|
40
|
+
id: root.id,
|
|
40
41
|
kind: "text",
|
|
41
42
|
content: root.content,
|
|
42
43
|
style: styleItem?.style,
|
|
@@ -76,9 +77,9 @@ export class TreeBuilder {
|
|
|
76
77
|
#composeVisuals_Sequence(children) {
|
|
77
78
|
return {
|
|
78
79
|
sampleAt: async (time) => {
|
|
79
|
-
let localTime = time;
|
|
80
|
+
let localTime = Math.round(time);
|
|
80
81
|
for (const child of children) {
|
|
81
|
-
if (localTime
|
|
82
|
+
if (localTime <= child.duration)
|
|
82
83
|
return child.visuals ? child.visuals.sampleAt(localTime) : [];
|
|
83
84
|
localTime -= child.duration;
|
|
84
85
|
}
|
|
@@ -146,6 +147,7 @@ export class TreeBuilder {
|
|
|
146
147
|
if (!from[0]?.frame || !to[0]?.frame)
|
|
147
148
|
return [];
|
|
148
149
|
return [{
|
|
150
|
+
id: transitionItem.id,
|
|
149
151
|
kind: "transition",
|
|
150
152
|
name: "circle",
|
|
151
153
|
progress,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tree-builder.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/renderers/parts/tree-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webcodecs-tree.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/renderers/parts/webcodecs-tree.ts"],"names":[],"mappings":"AACA,OAAO,EAA+C,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAE3F,MAAM,oBAAqB,SAAQ,WAAiC;IACnE,kBAAkB,CAAC,QAAsC;QACxD,OAAO;YACN,SAAS,EAAE,KAAK,SAAS,CAAC;gBACzB,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;oBAC9B,IAAI,KAAK,CAAC,KAAK;wBACd,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,CAAA;gBAChC,CAAC;YACF,CAAC;SACD,CAAA;IACF,CAAC;IACD,qBAAqB,CAAC,QAAsC;QAC3D,OAAO;YACN,SAAS,EAAE,KAAK,SAAS,CAAC;gBACzB,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;oBAC9B,IAAI,KAAK,CAAC,KAAK;wBACd,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,CAAA;gBAChC,CAAC;YACF,CAAC;SACD,CAAA;IACF,CAAC;CACD;AAED,MAAM,UAAU,sBAAsB,CAAC,IAAc,EAAE,KAA4B,EAAE,OAAyB;IAC7G,MAAM,OAAO,GAAG,IAAI,oBAAoB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IACxD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AAC3B,CAAC"}
|
|
@@ -9,11 +9,9 @@ export declare class VideoPlayer {
|
|
|
9
9
|
canvas: HTMLCanvasElement;
|
|
10
10
|
private root;
|
|
11
11
|
private sampler;
|
|
12
|
-
private resolveMedia;
|
|
13
12
|
readonly currentTime: import("@e280/strata").SignalFn<number>;
|
|
14
|
-
constructor(driver: Driver, canvas: HTMLCanvasElement, root: Node<AudioPlaybackComponent>, sampler: HTMLSampler
|
|
15
|
-
|
|
16
|
-
static create(driver: Driver, timeline: TimelineFile): Promise<VideoPlayer>;
|
|
13
|
+
constructor(driver: Driver, canvas: HTMLCanvasElement, root: Node<AudioPlaybackComponent>, sampler: HTMLSampler);
|
|
14
|
+
static create(driver: Driver, timeline: TimelineFile, resolveMedia: ResolveMedia): Promise<VideoPlayer>;
|
|
17
15
|
play(): Promise<void>;
|
|
18
16
|
pause(): void;
|
|
19
17
|
seek(ms: number): Promise<void>;
|
|
@@ -7,29 +7,22 @@ export class VideoPlayer {
|
|
|
7
7
|
canvas;
|
|
8
8
|
root;
|
|
9
9
|
sampler;
|
|
10
|
-
resolveMedia;
|
|
11
10
|
currentTime = signal(0);
|
|
12
11
|
#controller = realtime(compositeTime => this.#tick(compositeTime), currentTime => this.currentTime(currentTime));
|
|
13
|
-
constructor(driver, canvas, root, sampler
|
|
12
|
+
constructor(driver, canvas, root, sampler) {
|
|
14
13
|
this.driver = driver;
|
|
15
14
|
this.canvas = canvas;
|
|
16
15
|
this.root = root;
|
|
17
16
|
this.sampler = sampler;
|
|
18
|
-
this.resolveMedia = resolveMedia;
|
|
19
17
|
this.#controller.setFPS(30);
|
|
20
18
|
}
|
|
21
|
-
|
|
22
|
-
return this.canvas.getContext("2d");
|
|
23
|
-
}
|
|
24
|
-
static async create(driver, timeline) {
|
|
19
|
+
static async create(driver, timeline, resolveMedia) {
|
|
25
20
|
const rootItem = new Map(timeline.items.map(i => [i.id, i])).get(timeline.rootId);
|
|
26
21
|
const items = new Map(timeline.items.map(i => [i.id, i]));
|
|
27
|
-
const sampler = makeHtmlSampler(
|
|
22
|
+
const sampler = makeHtmlSampler(resolveMedia);
|
|
28
23
|
const root = await buildHTMLNodeTree(rootItem, items, sampler);
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
canvas.height = 1080;
|
|
32
|
-
return new this(driver, canvas, root, sampler);
|
|
24
|
+
const view = driver.compositor.pixi.renderer.canvas;
|
|
25
|
+
return new this(driver, view, root, sampler);
|
|
33
26
|
}
|
|
34
27
|
async #tick(ms) {
|
|
35
28
|
const duration = this.root.duration;
|
|
@@ -37,7 +30,6 @@ export class VideoPlayer {
|
|
|
37
30
|
this.root.audio?.onTimeUpdate(tt);
|
|
38
31
|
const layers = await this.root.visuals?.sampleAt(tt) ?? [];
|
|
39
32
|
const frame = await this.driver.composite(layers);
|
|
40
|
-
this.context.drawImage(frame, 0, 0);
|
|
41
33
|
frame.close();
|
|
42
34
|
if (ms >= duration)
|
|
43
35
|
this.pause();
|
|
@@ -60,7 +52,6 @@ export class VideoPlayer {
|
|
|
60
52
|
this.root.audio?.onTimeUpdate(ms);
|
|
61
53
|
const layers = await this.root.visuals?.sampleAt(ms) ?? [];
|
|
62
54
|
const frame = await this.driver.composite(layers);
|
|
63
|
-
this.context.drawImage(frame, 0, 0);
|
|
64
55
|
frame.close();
|
|
65
56
|
}
|
|
66
57
|
setFPS(value) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"playback.js","sourceRoot":"","sources":["../../../../s/timeline/parts/renderers/playback.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,16 +36,20 @@ export function makeHtmlSampler(resolveMedia) {
|
|
|
36
36
|
// if paused seek otherwise play
|
|
37
37
|
visuals: {
|
|
38
38
|
sampleAt: async (ms) => {
|
|
39
|
-
|
|
39
|
+
const mediaTime = item.start + ms;
|
|
40
|
+
const endTime = item.start + item.duration;
|
|
41
|
+
if (mediaTime < item.start || mediaTime >= endTime) {
|
|
42
|
+
video.pause();
|
|
40
43
|
return [];
|
|
44
|
+
}
|
|
41
45
|
if (video.paused && paused) {
|
|
42
|
-
await seek(video,
|
|
46
|
+
await seek(video, mediaTime / 1000);
|
|
43
47
|
}
|
|
44
48
|
if (video.paused && !paused) {
|
|
45
49
|
await video.play();
|
|
46
50
|
}
|
|
47
51
|
const frame = new VideoFrame(video);
|
|
48
|
-
return frame ? [{ kind: "image", frame, matrix }] : [];
|
|
52
|
+
return frame ? [{ kind: "image", frame, matrix, id: item.id }] : [];
|
|
49
53
|
}
|
|
50
54
|
}
|
|
51
55
|
};
|
|
@@ -56,9 +60,14 @@ export function makeHtmlSampler(resolveMedia) {
|
|
|
56
60
|
duration: item.duration,
|
|
57
61
|
audio: {
|
|
58
62
|
onTimeUpdate: async (ms) => {
|
|
59
|
-
const
|
|
63
|
+
const mediaTime = item.start + ms;
|
|
64
|
+
const endTime = item.start + item.duration;
|
|
65
|
+
if (mediaTime < item.start || mediaTime >= endTime) {
|
|
66
|
+
audio.pause();
|
|
67
|
+
return [];
|
|
68
|
+
}
|
|
60
69
|
if (audio.paused && paused) {
|
|
61
|
-
await seek(audio,
|
|
70
|
+
await seek(audio, mediaTime / 1000);
|
|
62
71
|
}
|
|
63
72
|
if (audio.paused && !paused) {
|
|
64
73
|
await audio.play();
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"html.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/renderers/samplers/html.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export function makeWebCodecsSampler(driver, resolveMedia) {
|
|
|
22
22
|
visuals: {
|
|
23
23
|
sampleAt: async (ms) => {
|
|
24
24
|
const frame = await cursor.atOrNear(baseUs + toUs(ms));
|
|
25
|
-
return frame ? [{ kind: "image", frame, matrix }] : [];
|
|
25
|
+
return frame ? [{ kind: "image", frame, matrix, id: item.id }] : [];
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webcodecs.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/renderers/samplers/webcodecs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { Media } from "./media.js";
|
|
2
|
+
import { Resource } from "./resource.js";
|
|
2
3
|
import { Datafile } from "../utils/datafile.js";
|
|
3
4
|
export declare class ResourcePool {
|
|
4
5
|
#private;
|
|
5
6
|
/** store a media file (avoids duplicates via hash) */
|
|
6
7
|
store(datafile: Datafile): Promise<Media>;
|
|
8
|
+
require(hash: string): Resource.Media;
|
|
7
9
|
}
|
|
@@ -1,19 +1,22 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { GMap } from "@e280/stz";
|
|
2
2
|
import { Media } from "./media.js";
|
|
3
3
|
export class ResourcePool {
|
|
4
|
-
#map = new
|
|
4
|
+
#map = new GMap;
|
|
5
5
|
/** store a media file (avoids duplicates via hash) */
|
|
6
6
|
async store(datafile) {
|
|
7
7
|
const media = await Media.analyze(datafile);
|
|
8
8
|
const { hash } = media.datafile.checksum;
|
|
9
|
-
const { filename, bytes } = media.datafile;
|
|
9
|
+
const { filename, bytes, url } = media.datafile;
|
|
10
10
|
if (this.#map.has(hash)) {
|
|
11
11
|
const alreadyExists = this.#map.require(hash);
|
|
12
12
|
alreadyExists.filename = filename;
|
|
13
13
|
}
|
|
14
14
|
else
|
|
15
|
-
this.#map.set(hash, { kind: "media", filename, bytes });
|
|
15
|
+
this.#map.set(hash, { kind: "media", filename, bytes, url });
|
|
16
16
|
return media;
|
|
17
17
|
}
|
|
18
|
+
require(hash) {
|
|
19
|
+
return this.#map.require(hash);
|
|
20
|
+
}
|
|
18
21
|
}
|
|
19
22
|
//# sourceMappingURL=resource-pool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-pool.js","sourceRoot":"","sources":["../../../s/timeline/parts/resource-pool.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAE9B,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAA;AAIhC,MAAM,OAAO,YAAY;IACxB,IAAI,GAAG,IAAI,IAAwB,CAAA;IAEnC,sDAAsD;IACtD,KAAK,CAAC,KAAK,CAAC,QAAkB;QAC7B,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC3C,MAAM,EAAC,IAAI,EAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAA;QACtC,MAAM,EAAC,QAAQ,EAAE,KAAK,EAAC,GAAG,KAAK,CAAC,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"resource-pool.js","sourceRoot":"","sources":["../../../s/timeline/parts/resource-pool.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAE9B,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAA;AAIhC,MAAM,OAAO,YAAY;IACxB,IAAI,GAAG,IAAI,IAAwB,CAAA;IAEnC,sDAAsD;IACtD,KAAK,CAAC,KAAK,CAAC,QAAkB;QAC7B,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC3C,MAAM,EAAC,IAAI,EAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAA;QACtC,MAAM,EAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAC,GAAG,KAAK,CAAC,QAAQ,CAAA;QAE7C,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAC7C,aAAa,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAClC,CAAC;;YAEA,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAC,CAAC,CAAA;QAE3D,OAAO,KAAK,CAAA;IACb,CAAC;IAED,OAAO,CAAC,IAAY;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/B,CAAC;CACD"}
|
package/x/timeline/sugar/o.d.ts
CHANGED
|
@@ -25,7 +25,10 @@ export declare class O {
|
|
|
25
25
|
start?: number;
|
|
26
26
|
duration?: number;
|
|
27
27
|
}) => Item.Audio;
|
|
28
|
-
text: (content: string
|
|
28
|
+
text: (content: string, options?: {
|
|
29
|
+
duration?: number;
|
|
30
|
+
styles?: TextStyleOptions;
|
|
31
|
+
}) => Item.Text;
|
|
29
32
|
gap: (duration: number) => Item.Gap;
|
|
30
33
|
transition: {
|
|
31
34
|
crossfade: (duration: number) => Item.Transition;
|
package/x/timeline/sugar/o.js
CHANGED
|
@@ -86,13 +86,15 @@ export class O {
|
|
|
86
86
|
this.register(item);
|
|
87
87
|
return item;
|
|
88
88
|
};
|
|
89
|
-
text = (content) => {
|
|
89
|
+
text = (content, options) => {
|
|
90
90
|
const item = {
|
|
91
91
|
id: this.#getId(),
|
|
92
92
|
content,
|
|
93
93
|
kind: Kind.Text,
|
|
94
|
-
duration: 2000
|
|
94
|
+
duration: options?.duration ?? 2000
|
|
95
95
|
};
|
|
96
|
+
if (options?.styles)
|
|
97
|
+
item.styleId = this.textStyle(options.styles).id;
|
|
96
98
|
this.register(item);
|
|
97
99
|
return item;
|
|
98
100
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"o.js","sourceRoot":"","sources":["../../../s/timeline/sugar/o.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"o.js","sourceRoot":"","sources":["../../../s/timeline/sugar/o.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Omni } from "./omni.js";
|
|
2
2
|
import { Driver } from "../../driver/driver.js";
|
|
3
|
-
import {
|
|
3
|
+
// import {dummyData} from "../utils/dummy-data.js"
|
|
4
4
|
const driver = await Driver.setup();
|
|
5
5
|
//
|
|
6
6
|
// create an omni context
|
|
@@ -9,16 +9,23 @@ const omni = new Omni(driver);
|
|
|
9
9
|
//
|
|
10
10
|
// load in some media resources
|
|
11
11
|
//
|
|
12
|
-
const {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
})
|
|
12
|
+
// const {mediaA, mediaB} = await omni.load({
|
|
13
|
+
// mediaA: dummyData(),
|
|
14
|
+
// mediaB: dummyData(),
|
|
15
|
+
// })
|
|
16
16
|
//
|
|
17
17
|
// create a timeline
|
|
18
18
|
//
|
|
19
|
-
const timeline = omni.timeline(o => o.sequence(
|
|
19
|
+
// const timeline = omni.timeline(o => o.sequence(
|
|
20
|
+
// o.video(mediaA),
|
|
21
|
+
// o.transition.crossfade(600),
|
|
22
|
+
// o.stack(
|
|
23
|
+
// o.video(mediaB),
|
|
24
|
+
// o.text("hello world"),
|
|
25
|
+
// ),
|
|
26
|
+
// ))
|
|
20
27
|
//
|
|
21
28
|
// log the timeline
|
|
22
29
|
//
|
|
23
|
-
console.log(JSON.stringify(timeline, undefined, " "))
|
|
30
|
+
// console.log(JSON.stringify(timeline, undefined, " "))
|
|
24
31
|
//# sourceMappingURL=omni-test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"omni-test.js","sourceRoot":"","sources":["../../../s/timeline/sugar/omni-test.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAA;AAC7C,
|
|
1
|
+
{"version":3,"file":"omni-test.js","sourceRoot":"","sources":["../../../s/timeline/sugar/omni-test.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAA;AAC7C,mDAAmD;AAEnD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;AACnC,EAAE;AACF,yBAAyB;AACzB,EAAE;AAEF,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAA;AAE7B,EAAE;AACF,+BAA+B;AAC/B,EAAE;AAEF,6CAA6C;AAC7C,wBAAwB;AACxB,wBAAwB;AACxB,KAAK;AAEL,EAAE;AACF,oBAAoB;AACpB,EAAE;AAEF,kDAAkD;AAClD,oBAAoB;AACpB,gCAAgC;AAChC,YAAY;AACZ,qBAAqB;AACrB,2BAA2B;AAC3B,MAAM;AACN,KAAK;AAEL,EAAE;AACF,mBAAmB;AACnB,EAAE;AAEF,yDAAyD"}
|
|
@@ -5,7 +5,6 @@ import { Driver } from "../../driver/driver.js";
|
|
|
5
5
|
import { Datafile } from "../utils/datafile.js";
|
|
6
6
|
import { TimelineFile } from "../parts/basics.js";
|
|
7
7
|
import { ResourcePool } from "../parts/resource-pool.js";
|
|
8
|
-
import { RenderConfig } from "../../driver/fns/schematic.js";
|
|
9
8
|
export declare class Omni {
|
|
10
9
|
#private;
|
|
11
10
|
private driver;
|
|
@@ -13,5 +12,5 @@ export declare class Omni {
|
|
|
13
12
|
constructor(driver: Driver);
|
|
14
13
|
load: <S extends Record<string, Promise<Datafile>>>(spec: S) => Promise<{ [K in keyof S]: Media; }>;
|
|
15
14
|
timeline: (fn: (o: O) => Item.Any) => TimelineFile;
|
|
16
|
-
render: (timeline: TimelineFile
|
|
15
|
+
render: (timeline: TimelineFile) => Promise<void>;
|
|
17
16
|
}
|
package/x/timeline/sugar/omni.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { O } from "./o.js";
|
|
2
|
-
import { Export } from "../parts/
|
|
2
|
+
import { Export } from "../parts/renderers/export.js";
|
|
3
3
|
import { ResourcePool } from "../parts/resource-pool.js";
|
|
4
4
|
export class Omni {
|
|
5
5
|
driver;
|
|
@@ -26,7 +26,7 @@ export class Omni {
|
|
|
26
26
|
o.state.project.rootId = root.id;
|
|
27
27
|
return o.state.project;
|
|
28
28
|
};
|
|
29
|
-
render = async (timeline
|
|
29
|
+
render = async (timeline) => {
|
|
30
30
|
await this.#export.render(timeline);
|
|
31
31
|
};
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"omni.js","sourceRoot":"","sources":["../../../s/timeline/sugar/omni.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,QAAQ,CAAA;AAMxB,OAAO,EAAC,MAAM,EAAC,MAAM
|
|
1
|
+
{"version":3,"file":"omni.js","sourceRoot":"","sources":["../../../s/timeline/sugar/omni.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,QAAQ,CAAA;AAMxB,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAA;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAA;AAGtD,MAAM,OAAO,IAAI;IAII;IAHpB,SAAS,GAAG,IAAI,YAAY,EAAE,CAAA;IAC9B,OAAO,CAAQ;IAEf,YAAoB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QACjC,IAAI,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,IAAI,GAAG,KAAK,EAA8C,IAAO,EAAE,EAAE;QACpE,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CACnE,KAAK,EAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CACrE,CAAC,CAA4B,CAAA;IAC/B,CAAC,CAAA;IAED,QAAQ,GAAG,CAAC,EAAsB,EAAgB,EAAE;QACnD,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;YACf,OAAO,EAAE;gBACR,MAAM,EAAE,UAAU;gBAClB,IAAI,EAAE,uBAAuB;gBAC7B,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,EAAE;gBACT,MAAM,EAAE,CAAC;aACT;SACD,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAA;QAChC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAA;IACvB,CAAC,CAAA;IAED,MAAM,GAAG,KAAK,EAAE,QAAsB,EAAE,EAAE;QACzC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IACpC,CAAC,CAAA;CACD"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Checksum } from "./checksum.js";
|
|
2
2
|
export declare class Datafile {
|
|
3
|
+
url: string;
|
|
3
4
|
bytes: Uint8Array;
|
|
4
5
|
filename: string;
|
|
5
6
|
checksum: Checksum;
|
|
6
|
-
constructor(bytes: Uint8Array, filename: string, checksum: Checksum);
|
|
7
|
-
static make(
|
|
8
|
-
static load(
|
|
7
|
+
constructor(url: string, bytes: Uint8Array, filename: string, checksum: Checksum);
|
|
8
|
+
static make(file: Blob, name?: string): Promise<Datafile>;
|
|
9
|
+
static load(path: string): Promise<void>;
|
|
9
10
|
}
|
|
@@ -1,20 +1,31 @@
|
|
|
1
1
|
import { Checksum } from "./checksum.js";
|
|
2
2
|
export class Datafile {
|
|
3
|
+
url;
|
|
3
4
|
bytes;
|
|
4
5
|
filename;
|
|
5
6
|
checksum;
|
|
6
|
-
constructor(bytes, filename, checksum) {
|
|
7
|
+
constructor(url, bytes, filename, checksum) {
|
|
8
|
+
this.url = url;
|
|
7
9
|
this.bytes = bytes;
|
|
8
10
|
this.filename = filename;
|
|
9
11
|
this.checksum = checksum;
|
|
10
12
|
}
|
|
11
|
-
static async make(
|
|
13
|
+
static async make(file, name) {
|
|
14
|
+
const buffer = await file.arrayBuffer();
|
|
15
|
+
const bytes = new Uint8Array(buffer);
|
|
12
16
|
const checksum = await Checksum.make(bytes);
|
|
13
17
|
const filename = name ?? checksum.nickname;
|
|
14
|
-
|
|
18
|
+
const url = URL.createObjectURL(file);
|
|
19
|
+
return new this(url, bytes, filename, checksum);
|
|
15
20
|
}
|
|
16
|
-
static async load(
|
|
17
|
-
|
|
21
|
+
static async load(path) {
|
|
22
|
+
// const file = await fetch(path)
|
|
23
|
+
// const buffer = await file.arrayBuffer()
|
|
24
|
+
// const bytes = new Uint8Array(buffer)
|
|
25
|
+
// const filename = file?.headers.get('Content-Disposition')?.split('filename=')[1] ?? "file"
|
|
26
|
+
// console.log(filename)
|
|
27
|
+
// const checksum = await Checksum.make(bytes)
|
|
28
|
+
// return new this(path, bytes, filename, checksum)
|
|
18
29
|
}
|
|
19
30
|
}
|
|
20
31
|
//# sourceMappingURL=datafile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datafile.js","sourceRoot":"","sources":["../../../s/timeline/utils/datafile.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AAEtC,MAAM,OAAO,QAAQ;IAEZ;IACA;IACA;
|
|
1
|
+
{"version":3,"file":"datafile.js","sourceRoot":"","sources":["../../../s/timeline/utils/datafile.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AAEtC,MAAM,OAAO,QAAQ;IAEZ;IACA;IACA;IACA;IAJR,YACQ,GAAW,EACX,KAAiB,EACjB,QAAgB,EAChB,QAAkB;QAHlB,QAAG,GAAH,GAAG,CAAQ;QACX,UAAK,GAAL,KAAK,CAAY;QACjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,aAAQ,GAAR,QAAQ,CAAU;IACvB,CAAC;IAEJ,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAU,EAAE,IAAa;QAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QACvC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;QACpC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC3C,MAAM,QAAQ,GAAG,IAAI,IAAI,QAAQ,CAAC,QAAQ,CAAA;QAC1C,MAAM,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QACrC,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAY;QAC7B,iCAAiC;QACjC,0CAA0C;QAC1C,uCAAuC;QACvC,8FAA8F;QAC9F,wBAAwB;QACxB,8CAA8C;QAC9C,mDAAmD;IACpD,CAAC;CACD"}
|