@omnimedia/omnitool 1.1.0-19 → 1.1.0-20
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 +1 -1
- package/s/timeline/parts/compositor/parts/schedulers.ts +8 -8
- package/s/timeline/parts/compositor/playback.ts +5 -5
- package/x/demo/demo.bundle.min.js +1 -1
- package/x/demo/demo.bundle.min.js.map +3 -3
- package/x/index.html +2 -2
- package/x/timeline/parts/compositor/parts/schedulers.js +8 -8
- package/x/timeline/parts/compositor/parts/schedulers.js.map +1 -1
- package/x/timeline/parts/compositor/playback.js +5 -5
- package/x/timeline/parts/compositor/playback.js.map +1 -1
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=a092c8701463"></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-20</small></h1>
|
|
89
89
|
<button class=fetch>fetch</button>
|
|
90
90
|
<input type="file" class="file-input">
|
|
91
91
|
<div class=results></div>
|
|
@@ -3,7 +3,7 @@ export const realtime = (onTick, onUpdate) => {
|
|
|
3
3
|
let rafId = null;
|
|
4
4
|
let fps = 60;
|
|
5
5
|
let frameDuration = 1000 / fps;
|
|
6
|
-
let
|
|
6
|
+
let composeTime = 0;
|
|
7
7
|
let lastTime = 0;
|
|
8
8
|
let accumulator = 0;
|
|
9
9
|
let currentTime = 0;
|
|
@@ -13,11 +13,11 @@ export const realtime = (onTick, onUpdate) => {
|
|
|
13
13
|
const deltaTime = now - lastTime;
|
|
14
14
|
lastTime = now;
|
|
15
15
|
accumulator += deltaTime;
|
|
16
|
-
currentTime += deltaTime
|
|
16
|
+
currentTime += deltaTime;
|
|
17
17
|
onUpdate(currentTime);
|
|
18
18
|
while (accumulator >= frameDuration) {
|
|
19
|
-
onTick(
|
|
20
|
-
|
|
19
|
+
onTick(composeTime);
|
|
20
|
+
composeTime += frameDuration;
|
|
21
21
|
accumulator -= frameDuration;
|
|
22
22
|
}
|
|
23
23
|
rafId = requestAnimationFrame(tick);
|
|
@@ -38,11 +38,11 @@ export const realtime = (onTick, onUpdate) => {
|
|
|
38
38
|
cancelAnimationFrame(rafId);
|
|
39
39
|
rafId = null;
|
|
40
40
|
},
|
|
41
|
-
seek(
|
|
42
|
-
|
|
41
|
+
seek(ms) {
|
|
42
|
+
composeTime = ms;
|
|
43
43
|
accumulator = 0;
|
|
44
|
-
currentTime =
|
|
45
|
-
onUpdate(
|
|
44
|
+
currentTime = ms;
|
|
45
|
+
onUpdate(ms);
|
|
46
46
|
},
|
|
47
47
|
dispose() {
|
|
48
48
|
this.pause();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedulers.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/compositor/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,
|
|
1
|
+
{"version":3,"file":"schedulers.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/compositor/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,CAAC,GAAG,IAAI,CAAC,GAAG,CAAA;IACvB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;IAEjD,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"}
|
|
@@ -9,7 +9,7 @@ export class VideoPlayer {
|
|
|
9
9
|
sampler;
|
|
10
10
|
resolveMedia;
|
|
11
11
|
currentTime = signal(0);
|
|
12
|
-
#controller = realtime(
|
|
12
|
+
#controller = realtime(compositeTime => this.#tick(compositeTime), currentTime => this.currentTime(currentTime));
|
|
13
13
|
constructor(driver, canvas, root, sampler, resolveMedia = _hash => "/assets/temp/gl.mp4") {
|
|
14
14
|
this.driver = driver;
|
|
15
15
|
this.canvas = canvas;
|
|
@@ -31,15 +31,15 @@ export class VideoPlayer {
|
|
|
31
31
|
canvas.height = 1080;
|
|
32
32
|
return new this(driver, canvas, root, sampler);
|
|
33
33
|
}
|
|
34
|
-
async #tick(
|
|
35
|
-
const
|
|
36
|
-
const tt =
|
|
34
|
+
async #tick(ms) {
|
|
35
|
+
const duration = this.root.duration;
|
|
36
|
+
const tt = ms > duration ? duration : ms;
|
|
37
37
|
this.root.audio?.onTimeUpdate(tt);
|
|
38
38
|
const layers = await this.root.visuals?.sampleAt(tt) ?? [];
|
|
39
39
|
const frame = await this.driver.composite(layers);
|
|
40
40
|
this.context.drawImage(frame, 0, 0);
|
|
41
41
|
frame.close();
|
|
42
|
-
if (
|
|
42
|
+
if (ms >= duration)
|
|
43
43
|
this.pause();
|
|
44
44
|
}
|
|
45
45
|
async play() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playback.js","sourceRoot":"","sources":["../../../../s/timeline/parts/compositor/playback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAA;AAGnC,OAAO,EAAC,QAAQ,EAAC,MAAM,uBAAuB,CAAA;AAE9C,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAC,iBAAiB,EAAC,MAAM,sBAAsB,CAAA;AAMtD,MAAM,OAAO,WAAW;IAQd;IACD;IACC;IACA;IACA;IAXA,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IAChC,WAAW,GAAG,QAAQ,CACrB,
|
|
1
|
+
{"version":3,"file":"playback.js","sourceRoot":"","sources":["../../../../s/timeline/parts/compositor/playback.ts"],"names":[],"mappings":"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"}
|