@omnimedia/omnitool 1.1.0-33 → 1.1.0-35
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 +3 -2
- package/s/timeline/parts/compositor/samplers/webcodecs.ts +7 -7
- package/x/demo/demo.bundle.min.js +17 -17
- package/x/demo/demo.bundle.min.js.map +3 -3
- package/x/index.html +2 -2
- package/x/timeline/parts/compositor/parts/schedulers.js +3 -2
- package/x/timeline/parts/compositor/parts/schedulers.js.map +1 -1
- package/x/timeline/parts/compositor/samplers/webcodecs.js +7 -7
- package/x/timeline/parts/compositor/samplers/webcodecs.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=fbe7bf3ea916"></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-35</small></h1>
|
|
89
89
|
<button class=fetch>fetch</button>
|
|
90
90
|
<input type="file" class="file-input">
|
|
91
91
|
<div class=results></div>
|
|
@@ -57,8 +57,9 @@ export const realtime = (onTick, onUpdate) => {
|
|
|
57
57
|
};
|
|
58
58
|
};
|
|
59
59
|
export const fixedStep = async (opts, onFrame) => {
|
|
60
|
-
const dt =
|
|
61
|
-
const
|
|
60
|
+
const dt = 1000 / opts.fps;
|
|
61
|
+
const durationInSeconds = opts.duration / 1000;
|
|
62
|
+
const total = Math.ceil(durationInSeconds * opts.fps);
|
|
62
63
|
for (let i = 0; i < total; i++) {
|
|
63
64
|
if (opts.abort?.aborted)
|
|
64
65
|
break;
|
|
@@ -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,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,
|
|
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,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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { VideoCursor } from "../../../utils/video-cursor.js";
|
|
2
2
|
import { AudioStream } from "../../../utils/audio-stream.js";
|
|
3
|
-
const toUs = (
|
|
3
|
+
const toUs = (ms) => Math.round(ms * 1_000);
|
|
4
4
|
export function makeWebCodecsSampler(driver, resolveMedia) {
|
|
5
5
|
const videoCursors = new Map();
|
|
6
6
|
async function getCursorForVideo(videoItem) {
|
|
@@ -16,12 +16,12 @@ export function makeWebCodecsSampler(driver, resolveMedia) {
|
|
|
16
16
|
return {
|
|
17
17
|
async video(item, matrix) {
|
|
18
18
|
const cursor = await getCursorForVideo(item);
|
|
19
|
-
const baseUs = toUs(item.start
|
|
19
|
+
const baseUs = toUs(item.start);
|
|
20
20
|
return {
|
|
21
21
|
duration: item.duration,
|
|
22
22
|
visuals: {
|
|
23
|
-
sampleAt: async (
|
|
24
|
-
const frame = await cursor.atOrNear(baseUs + toUs(
|
|
23
|
+
sampleAt: async (ms) => {
|
|
24
|
+
const frame = await cursor.atOrNear(baseUs + toUs(ms));
|
|
25
25
|
return frame ? [{ kind: "image", frame, matrix }] : [];
|
|
26
26
|
}
|
|
27
27
|
}
|
|
@@ -33,9 +33,9 @@ export function makeWebCodecsSampler(driver, resolveMedia) {
|
|
|
33
33
|
audio: {
|
|
34
34
|
getStream: async function* () {
|
|
35
35
|
const source = resolveMedia(item.mediaHash);
|
|
36
|
-
const
|
|
37
|
-
const
|
|
38
|
-
const audio = driver.decodeAudio({ source, start
|
|
36
|
+
const start = item.start / 1000;
|
|
37
|
+
const end = (item.start + item.duration) / 1000;
|
|
38
|
+
const audio = driver.decodeAudio({ source, start, end });
|
|
39
39
|
const audioStream = new AudioStream(audio.getReader());
|
|
40
40
|
yield* audioStream.stream();
|
|
41
41
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webcodecs.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/compositor/samplers/webcodecs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAA;AAC1D,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAA;AAE1D,MAAM,IAAI,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"webcodecs.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/compositor/samplers/webcodecs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAA;AAC1D,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAA;AAE1D,MAAM,IAAI,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC,CAAA;AAEnD,MAAM,UAAU,oBAAoB,CACnC,MAAc,EACd,YAAmC;IAEnC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAuB,CAAA;IAEnD,KAAK,UAAU,iBAAiB,CAAC,SAAqB;QACrD,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QAC/C,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAA;QAC7B,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QAChD,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,EAAC,MAAM,EAAC,CAAC,CAAA;QAC1C,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAA;QACjD,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;QACtC,OAAO,MAAM,CAAA;IACd,CAAC;IAED,OAAO;QACN,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM;YACvB,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAA;YAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YAC/B,OAAO;gBACN,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,OAAO,EAAE;oBACR,QAAQ,EAAE,KAAK,EAAE,EAAU,EAAE,EAAE;wBAC9B,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;wBACtD,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,EAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;oBACrD,CAAC;iBACD;aACD,CAAA;QACF,CAAC;QACD,KAAK,CAAC,KAAK,CAAC,IAAI;YACf,OAAO;gBACN,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,KAAK,EAAE;oBACN,SAAS,EAAE,KAAK,SAAS,CAAC;wBACzB,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;wBAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;wBAC/B,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAA;wBAC/C,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,EAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAC,CAAC,CAAA;wBACtD,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAA;wBACtD,KAAK,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,CAAA;oBAC5B,CAAC;iBACD;aACD,CAAA;QACF,CAAC;QACA,KAAK,CAAC,OAAO;YACX,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAA;YACrE,YAAY,CAAC,KAAK,EAAE,CAAA;YACpB,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAC1B,CAAC;KACF,CAAA;AACF,CAAC"}
|