@omnimedia/omnitool 1.1.0-4 → 1.1.0-40
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 +8 -4
- package/s/context.ts +0 -7
- package/s/demo/demo.bundle.ts +35 -5
- package/s/demo/demo.css +5 -0
- package/s/demo/routines/transcode-test.ts +8 -4
- package/s/demo/routines/transitions-test.ts +43 -0
- package/s/demo/routines/waveform-test.ts +3 -2
- package/s/driver/driver.ts +19 -11
- package/s/driver/fns/schematic.ts +46 -23
- package/s/driver/fns/work.ts +114 -102
- package/s/features/transition/parts/fragment.ts +24 -0
- package/s/features/transition/parts/types.ts +94 -0
- package/s/features/transition/parts/uniforms.ts +29 -0
- package/s/features/transition/parts/vertex.ts +31 -0
- package/s/features/transition/transition.ts +60 -0
- package/s/index.html.ts +6 -1
- package/s/timeline/index.ts +1 -0
- package/s/timeline/parts/basics.ts +1 -1
- package/s/timeline/parts/compositor/export.ts +77 -0
- package/s/timeline/parts/compositor/parts/html-tree.ts +37 -0
- package/s/timeline/parts/compositor/parts/schedulers.ts +95 -0
- package/s/timeline/parts/compositor/parts/tree-builder.ts +196 -0
- package/s/timeline/parts/compositor/parts/webcodecs-tree.ts +30 -0
- package/s/timeline/parts/compositor/playback.ts +94 -0
- package/s/timeline/parts/compositor/samplers/html.ts +115 -0
- package/s/timeline/parts/compositor/samplers/webcodecs.ts +61 -0
- package/s/timeline/parts/filmstrip.ts +42 -15
- package/s/timeline/parts/item.ts +48 -6
- package/s/timeline/parts/media.ts +21 -0
- package/s/timeline/parts/waveform.ts +3 -4
- package/s/timeline/sugar/builders.ts +102 -0
- package/s/timeline/sugar/o.ts +163 -38
- package/s/timeline/sugar/omni-test.ts +5 -3
- package/s/timeline/sugar/omni.ts +26 -11
- package/s/timeline/types.ts +29 -0
- package/s/timeline/utils/audio-stream.ts +15 -0
- package/s/timeline/utils/matrix.ts +33 -0
- package/s/timeline/utils/video-cursor.ts +40 -0
- package/x/context.d.ts +1 -4
- package/x/context.js +1 -5
- package/x/context.js.map +1 -1
- package/x/demo/demo.bundle.js +23 -6
- package/x/demo/demo.bundle.js.map +1 -1
- package/x/demo/demo.bundle.min.js +606 -36
- package/x/demo/demo.bundle.min.js.map +4 -4
- package/x/demo/demo.css +5 -0
- package/x/demo/routines/transcode-test.js +8 -4
- package/x/demo/routines/transcode-test.js.map +1 -1
- package/x/demo/routines/transitions-test.d.ts +5 -0
- package/x/demo/routines/transitions-test.js +35 -0
- package/x/demo/routines/transitions-test.js.map +1 -0
- package/x/demo/routines/waveform-test.d.ts +2 -1
- package/x/demo/routines/waveform-test.js +2 -2
- package/x/demo/routines/waveform-test.js.map +1 -1
- package/x/driver/driver.d.ts +4 -6
- package/x/driver/driver.js +17 -10
- package/x/driver/driver.js.map +1 -1
- package/x/driver/driver.worker.bundle.min.js +2537 -148
- package/x/driver/driver.worker.bundle.min.js.map +4 -4
- package/x/driver/fns/host.d.ts +9 -2
- package/x/driver/fns/schematic.d.ts +40 -22
- package/x/driver/fns/work.d.ts +11 -4
- package/x/driver/fns/work.js +107 -101
- package/x/driver/fns/work.js.map +1 -1
- package/x/features/speech/transcribe/worker.bundle.min.js +542 -542
- package/x/features/speech/transcribe/worker.bundle.min.js.map +4 -4
- package/x/features/transition/parts/fragment.d.ts +1 -0
- package/x/features/transition/parts/fragment.js +25 -0
- package/x/features/transition/parts/fragment.js.map +1 -0
- package/x/features/transition/parts/types.d.ts +23 -0
- package/x/features/transition/parts/types.js.map +1 -0
- package/x/features/transition/parts/uniforms.d.ts +31 -0
- package/x/features/transition/parts/uniforms.js +27 -0
- package/x/features/transition/parts/uniforms.js.map +1 -0
- package/x/features/transition/parts/vertex.d.ts +1 -0
- package/x/features/transition/parts/vertex.js +32 -0
- package/x/features/transition/parts/vertex.js.map +1 -0
- package/x/features/transition/transition.d.ts +5 -0
- package/x/features/transition/transition.js +50 -0
- package/x/features/transition/transition.js.map +1 -0
- package/x/index.html +13 -3
- package/x/index.html.js +6 -1
- package/x/index.html.js.map +1 -1
- package/x/timeline/index.d.ts +1 -0
- package/x/timeline/index.js +1 -0
- package/x/timeline/index.js.map +1 -1
- package/x/timeline/parts/basics.d.ts +1 -1
- package/x/timeline/parts/compositor/export.d.ts +11 -0
- package/x/timeline/parts/compositor/export.js +64 -0
- package/x/timeline/parts/compositor/export.js.map +1 -0
- package/x/timeline/parts/compositor/parts/html-tree.d.ts +3 -0
- package/x/timeline/parts/compositor/parts/html-tree.js +40 -0
- package/x/timeline/parts/compositor/parts/html-tree.js.map +1 -0
- package/x/timeline/parts/compositor/parts/schedulers.d.ts +15 -0
- package/x/timeline/parts/compositor/parts/schedulers.js +70 -0
- package/x/timeline/parts/compositor/parts/schedulers.js.map +1 -0
- package/x/timeline/parts/compositor/parts/tree-builder.d.ts +37 -0
- package/x/timeline/parts/compositor/parts/tree-builder.js +160 -0
- package/x/timeline/parts/compositor/parts/tree-builder.js.map +1 -0
- package/x/timeline/parts/compositor/parts/webcodecs-tree.d.ts +3 -0
- package/x/timeline/parts/compositor/parts/webcodecs-tree.js +28 -0
- package/x/timeline/parts/compositor/parts/webcodecs-tree.js.map +1 -0
- package/x/timeline/parts/compositor/playback.d.ts +26 -0
- package/x/timeline/parts/compositor/playback.js +79 -0
- package/x/timeline/parts/compositor/playback.js.map +1 -0
- package/x/timeline/parts/compositor/samplers/html.d.ts +3 -0
- package/x/timeline/parts/compositor/samplers/html.js +106 -0
- package/x/timeline/parts/compositor/samplers/html.js.map +1 -0
- package/x/timeline/parts/compositor/samplers/webcodecs.d.ts +3 -0
- package/x/timeline/parts/compositor/samplers/webcodecs.js +52 -0
- package/x/timeline/parts/compositor/samplers/webcodecs.js.map +1 -0
- package/x/timeline/parts/filmstrip.d.ts +2 -1
- package/x/timeline/parts/filmstrip.js +29 -10
- package/x/timeline/parts/filmstrip.js.map +1 -1
- package/x/timeline/parts/item.d.ts +42 -8
- package/x/timeline/parts/item.js +7 -3
- package/x/timeline/parts/item.js.map +1 -1
- package/x/timeline/parts/media.d.ts +3 -0
- package/x/timeline/parts/media.js +17 -0
- package/x/timeline/parts/media.js.map +1 -1
- package/x/timeline/parts/waveform.d.ts +2 -1
- package/x/timeline/parts/waveform.js +2 -4
- package/x/timeline/parts/waveform.js.map +1 -1
- package/x/timeline/sugar/builders.js +104 -0
- package/x/timeline/sugar/builders.js.map +1 -0
- package/x/timeline/sugar/o.d.ts +27 -5
- package/x/timeline/sugar/o.js +137 -38
- package/x/timeline/sugar/o.js.map +1 -1
- package/x/timeline/sugar/omni-test.js +4 -2
- package/x/timeline/sugar/omni-test.js.map +1 -1
- package/x/timeline/sugar/omni.d.ts +8 -2
- package/x/timeline/sugar/omni.js +22 -9
- package/x/timeline/sugar/omni.js.map +1 -1
- package/x/timeline/types.d.ts +24 -0
- package/x/timeline/types.js +2 -0
- package/x/timeline/types.js.map +1 -0
- package/x/timeline/utils/audio-stream.d.ts +6 -0
- package/x/timeline/utils/audio-stream.js +17 -0
- package/x/timeline/utils/audio-stream.js.map +1 -0
- package/x/timeline/utils/matrix.d.ts +8 -0
- package/x/timeline/utils/matrix.js +26 -0
- package/x/timeline/utils/matrix.js.map +1 -0
- package/x/timeline/utils/video-cursor.d.ts +10 -0
- package/x/timeline/utils/video-cursor.js +36 -0
- package/x/timeline/utils/video-cursor.js.map +1 -0
- package/s/tools/common/loader.ts +0 -26
- package/s/tools/common/transformer-pipeline.ts +0 -26
- package/s/tools/speech-recognition/common/model.ts +0 -26
- package/s/tools/speech-recognition/whisper/fns/host.ts +0 -25
- package/s/tools/speech-recognition/whisper/fns/schematic.ts +0 -23
- package/s/tools/speech-recognition/whisper/fns/work.ts +0 -91
- package/s/tools/speech-recognition/whisper/parts/types.ts +0 -38
- package/s/tools/speech-recognition/whisper/parts/worker.bundle.ts +0 -7
- package/s/tools/speech-recognition/whisper/tool.ts +0 -70
- package/x/tools/common/loader.d.ts +0 -19
- package/x/tools/common/loader.js +0 -18
- package/x/tools/common/loader.js.map +0 -1
- package/x/tools/common/transformer-pipeline.d.ts +0 -8
- package/x/tools/common/transformer-pipeline.js +0 -24
- package/x/tools/common/transformer-pipeline.js.map +0 -1
- package/x/tools/speech-recognition/common/model.d.ts +0 -14
- package/x/tools/speech-recognition/common/model.js +0 -16
- package/x/tools/speech-recognition/common/model.js.map +0 -1
- package/x/tools/speech-recognition/whisper/fns/host.d.ts +0 -13
- package/x/tools/speech-recognition/whisper/fns/host.js +0 -19
- package/x/tools/speech-recognition/whisper/fns/host.js.map +0 -1
- package/x/tools/speech-recognition/whisper/fns/schematic.d.ts +0 -19
- package/x/tools/speech-recognition/whisper/fns/schematic.js +0 -2
- package/x/tools/speech-recognition/whisper/fns/schematic.js.map +0 -1
- package/x/tools/speech-recognition/whisper/fns/work.d.ts +0 -12
- package/x/tools/speech-recognition/whisper/fns/work.js +0 -74
- package/x/tools/speech-recognition/whisper/fns/work.js.map +0 -1
- package/x/tools/speech-recognition/whisper/parts/types.d.ts +0 -31
- package/x/tools/speech-recognition/whisper/parts/types.js.map +0 -1
- package/x/tools/speech-recognition/whisper/parts/worker.bundle.js +0 -4
- package/x/tools/speech-recognition/whisper/parts/worker.bundle.js.map +0 -1
- package/x/tools/speech-recognition/whisper/parts/worker.bundle.min.js +0 -8
- package/x/tools/speech-recognition/whisper/parts/worker.bundle.min.js.map +0 -7
- package/x/tools/speech-recognition/whisper/tool.d.ts +0 -12
- package/x/tools/speech-recognition/whisper/tool.js +0 -63
- package/x/tools/speech-recognition/whisper/tool.js.map +0 -1
- /package/x/{tools/speech-recognition/whisper → features/transition}/parts/types.js +0 -0
- /package/x/{tools/speech-recognition/whisper/parts/worker.bundle.d.ts → timeline/sugar/builders.d.ts} +0 -0
|
@@ -0,0 +1,160 @@
|
|
|
1
|
+
import { Kind } from "../../item.js";
|
|
2
|
+
import { I6, mul6, transformToMat6 } from "../../../utils/matrix.js";
|
|
3
|
+
const requireItem = (items, id) => items.get(id);
|
|
4
|
+
export const getWorldMat6 = (items, item, parent) => {
|
|
5
|
+
let world = parent ?? I6;
|
|
6
|
+
if (item.spatialId) {
|
|
7
|
+
const spatial = requireItem(items, item.spatialId);
|
|
8
|
+
const local = transformToMat6(spatial.transform);
|
|
9
|
+
world = mul6(local, world);
|
|
10
|
+
}
|
|
11
|
+
return world;
|
|
12
|
+
};
|
|
13
|
+
export class TreeBuilder {
|
|
14
|
+
items;
|
|
15
|
+
sampler;
|
|
16
|
+
constructor(items, sampler) {
|
|
17
|
+
this.items = items;
|
|
18
|
+
this.sampler = sampler;
|
|
19
|
+
}
|
|
20
|
+
async build(root, parentMatrix) {
|
|
21
|
+
switch (root.kind) {
|
|
22
|
+
case Kind.Video: return this.sampler.video(root, getWorldMat6(this.items, root, parentMatrix));
|
|
23
|
+
case Kind.Audio: return this.sampler.audio(root);
|
|
24
|
+
case Kind.Text: {
|
|
25
|
+
const matrix = getWorldMat6(this.items, root, parentMatrix);
|
|
26
|
+
const styleItem = root.styleId !== undefined
|
|
27
|
+
? this.items.get(root.styleId)
|
|
28
|
+
: undefined;
|
|
29
|
+
return {
|
|
30
|
+
duration: root.duration,
|
|
31
|
+
visuals: {
|
|
32
|
+
sampleAt: async (t) => {
|
|
33
|
+
if (t < 0 || t >= root.duration)
|
|
34
|
+
return [];
|
|
35
|
+
else
|
|
36
|
+
return [{
|
|
37
|
+
kind: "text",
|
|
38
|
+
content: root.content,
|
|
39
|
+
style: styleItem?.style,
|
|
40
|
+
matrix
|
|
41
|
+
}];
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
case Kind.Gap: return {
|
|
47
|
+
duration: root.duration,
|
|
48
|
+
visuals: {
|
|
49
|
+
sampleAt: async () => []
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
case Kind.Stack: {
|
|
53
|
+
const matrix = getWorldMat6(this.items, root, parentMatrix);
|
|
54
|
+
const children = await Promise.all(root.childrenIds.map(id => this.build(requireItem(this.items, id), matrix)));
|
|
55
|
+
return this.#composeStack(children);
|
|
56
|
+
}
|
|
57
|
+
case Kind.Sequence: {
|
|
58
|
+
const matrix = getWorldMat6(this.items, root, parentMatrix);
|
|
59
|
+
return this.#composeSequence(root, matrix);
|
|
60
|
+
}
|
|
61
|
+
default: return { duration: 0 };
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
// Visual composition is the same for both builders, so it lives here.
|
|
65
|
+
#composeVisuals_Stack(children) {
|
|
66
|
+
return {
|
|
67
|
+
sampleAt: async (time) => {
|
|
68
|
+
const layers = await Promise.all(children.map(c => c.visuals ? c.visuals.sampleAt(time) : Promise.resolve([])));
|
|
69
|
+
return layers.flat();
|
|
70
|
+
}
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
#composeVisuals_Sequence(children) {
|
|
74
|
+
return {
|
|
75
|
+
sampleAt: async (time) => {
|
|
76
|
+
let localTime = time;
|
|
77
|
+
for (const child of children) {
|
|
78
|
+
if (localTime < child.duration)
|
|
79
|
+
return child.visuals ? child.visuals.sampleAt(localTime) : [];
|
|
80
|
+
localTime -= child.duration;
|
|
81
|
+
}
|
|
82
|
+
return [];
|
|
83
|
+
}
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
#composeStack(children) {
|
|
87
|
+
const duration = Math.max(0, ...children.map(k => (Number.isFinite(k.duration) ? k.duration : 0)));
|
|
88
|
+
return {
|
|
89
|
+
duration,
|
|
90
|
+
visuals: this.#composeVisuals_Stack(children),
|
|
91
|
+
audio: this.composeAudio_Stack(children),
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
async #composeSequence(sequence, parentMatrix) {
|
|
95
|
+
const childItems = sequence.childrenIds.map(id => requireItem(this.items, id));
|
|
96
|
+
const children = await this.#processChildren(childItems, parentMatrix);
|
|
97
|
+
const duration = children.reduce((a, k) => a + k.duration, 0);
|
|
98
|
+
return {
|
|
99
|
+
duration,
|
|
100
|
+
visuals: this.#composeVisuals_Sequence(children),
|
|
101
|
+
audio: this.composeAudio_Sequence(children),
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
async #processChildren(childItems, parentMatrix) {
|
|
105
|
+
const processedNodes = [];
|
|
106
|
+
for (let i = 0; i < childItems.length; i++) {
|
|
107
|
+
const item = childItems[i];
|
|
108
|
+
if (item.kind !== Kind.Transition) {
|
|
109
|
+
processedNodes.push(await this.build(item, parentMatrix));
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
const outgoingNode = processedNodes.pop();
|
|
113
|
+
const incomingItem = childItems[i + 1];
|
|
114
|
+
if (!outgoingNode || !incomingItem || incomingItem.kind === Kind.Transition) {
|
|
115
|
+
if (outgoingNode)
|
|
116
|
+
processedNodes.push(outgoingNode);
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
const incomingNode = await this.build(incomingItem, parentMatrix);
|
|
120
|
+
const transitionNode = await this.#createTransitionNode(item, outgoingNode, incomingNode);
|
|
121
|
+
processedNodes.push(transitionNode);
|
|
122
|
+
i++;
|
|
123
|
+
}
|
|
124
|
+
return processedNodes;
|
|
125
|
+
}
|
|
126
|
+
async #createTransitionNode(transitionItem, outgoingNode, incomingNode) {
|
|
127
|
+
const overlap = Math.max(0, Math.min(transitionItem.duration, outgoingNode.duration, incomingNode.duration));
|
|
128
|
+
const start = Math.max(0, outgoingNode.duration - overlap);
|
|
129
|
+
const combinedDuration = outgoingNode.duration + incomingNode.duration - overlap;
|
|
130
|
+
return {
|
|
131
|
+
duration: combinedDuration,
|
|
132
|
+
visuals: {
|
|
133
|
+
sampleAt: async (t) => {
|
|
134
|
+
if (!outgoingNode.visuals || !incomingNode.visuals)
|
|
135
|
+
return [];
|
|
136
|
+
if (t < start)
|
|
137
|
+
return outgoingNode.visuals.sampleAt(t);
|
|
138
|
+
if (t < outgoingNode.duration) {
|
|
139
|
+
const localTime = t - start;
|
|
140
|
+
const progress = overlap > 0 ? (localTime / overlap) : 1;
|
|
141
|
+
const from = await outgoingNode.visuals.sampleAt(t);
|
|
142
|
+
const to = await incomingNode.visuals.sampleAt(localTime);
|
|
143
|
+
if (!from[0]?.frame || !to[0]?.frame)
|
|
144
|
+
return [];
|
|
145
|
+
return [{
|
|
146
|
+
kind: "transition",
|
|
147
|
+
name: "circle",
|
|
148
|
+
progress,
|
|
149
|
+
from: from[0].frame,
|
|
150
|
+
to: to[0].frame,
|
|
151
|
+
}];
|
|
152
|
+
}
|
|
153
|
+
return incomingNode.visuals.sampleAt(t - outgoingNode.duration + overlap);
|
|
154
|
+
}
|
|
155
|
+
},
|
|
156
|
+
audio: this.composeAudio_Sequence([outgoingNode, incomingNode])
|
|
157
|
+
};
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
//# sourceMappingURL=tree-builder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tree-builder.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/compositor/parts/tree-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { Item } from "../../item.js";
|
|
2
|
+
import { AudioStreamComponent, Node, WebcodecsSampler } from "./tree-builder.js";
|
|
3
|
+
export declare function buildWebCodecsNodeTree(root: Item.Any, items: Map<number, Item.Any>, sampler: WebcodecsSampler): Promise<Node<AudioStreamComponent>>;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { TreeBuilder } from "./tree-builder.js";
|
|
2
|
+
class WebCodecsNodeBuilder extends TreeBuilder {
|
|
3
|
+
composeAudio_Stack(children) {
|
|
4
|
+
return {
|
|
5
|
+
getStream: async function* () {
|
|
6
|
+
for (const child of children) {
|
|
7
|
+
if (child.audio)
|
|
8
|
+
yield* child.audio.getStream();
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
composeAudio_Sequence(children) {
|
|
14
|
+
return {
|
|
15
|
+
getStream: async function* () {
|
|
16
|
+
for (const child of children) {
|
|
17
|
+
if (child.audio)
|
|
18
|
+
yield* child.audio.getStream();
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
export function buildWebCodecsNodeTree(root, items, sampler) {
|
|
25
|
+
const builder = new WebCodecsNodeBuilder(items, sampler);
|
|
26
|
+
return builder.build(root);
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=webcodecs-tree.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webcodecs-tree.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/compositor/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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { TimelineFile } from "../basics.js";
|
|
2
|
+
import { Driver } from "../../../driver/driver.js";
|
|
3
|
+
import { DecoderSource } from "../../../driver/fns/schematic.js";
|
|
4
|
+
import { AudioPlaybackComponent, HTMLSampler, Node } from "./parts/tree-builder.js";
|
|
5
|
+
type ResolveMedia = (hash: string) => DecoderSource;
|
|
6
|
+
export declare class VideoPlayer {
|
|
7
|
+
#private;
|
|
8
|
+
private driver;
|
|
9
|
+
canvas: HTMLCanvasElement;
|
|
10
|
+
private root;
|
|
11
|
+
private sampler;
|
|
12
|
+
private resolveMedia;
|
|
13
|
+
readonly currentTime: import("@e280/strata").SignalFn<number>;
|
|
14
|
+
constructor(driver: Driver, canvas: HTMLCanvasElement, root: Node<AudioPlaybackComponent>, sampler: HTMLSampler, resolveMedia?: ResolveMedia);
|
|
15
|
+
get context(): CanvasRenderingContext2D;
|
|
16
|
+
static create(driver: Driver, timeline: TimelineFile): Promise<VideoPlayer>;
|
|
17
|
+
play(): Promise<void>;
|
|
18
|
+
pause(): void;
|
|
19
|
+
seek(ms: number): Promise<void>;
|
|
20
|
+
setFPS(value: number): void;
|
|
21
|
+
/**
|
|
22
|
+
call this whenever your timeline state changes
|
|
23
|
+
*/
|
|
24
|
+
update(timeline: TimelineFile): Promise<void>;
|
|
25
|
+
}
|
|
26
|
+
export {};
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { signal } from "@e280/strata";
|
|
2
|
+
import { realtime } from "./parts/schedulers.js";
|
|
3
|
+
import { makeHtmlSampler } from "./samplers/html.js";
|
|
4
|
+
import { buildHTMLNodeTree } from "./parts/html-tree.js";
|
|
5
|
+
export class VideoPlayer {
|
|
6
|
+
driver;
|
|
7
|
+
canvas;
|
|
8
|
+
root;
|
|
9
|
+
sampler;
|
|
10
|
+
resolveMedia;
|
|
11
|
+
currentTime = signal(0);
|
|
12
|
+
#controller = realtime(compositeTime => this.#tick(compositeTime), currentTime => this.currentTime(currentTime));
|
|
13
|
+
constructor(driver, canvas, root, sampler, resolveMedia = _hash => "/assets/temp/gl.mp4") {
|
|
14
|
+
this.driver = driver;
|
|
15
|
+
this.canvas = canvas;
|
|
16
|
+
this.root = root;
|
|
17
|
+
this.sampler = sampler;
|
|
18
|
+
this.resolveMedia = resolveMedia;
|
|
19
|
+
this.#controller.setFPS(30);
|
|
20
|
+
}
|
|
21
|
+
get context() {
|
|
22
|
+
return this.canvas.getContext("2d");
|
|
23
|
+
}
|
|
24
|
+
static async create(driver, timeline) {
|
|
25
|
+
const rootItem = new Map(timeline.items.map(i => [i.id, i])).get(timeline.rootId);
|
|
26
|
+
const items = new Map(timeline.items.map(i => [i.id, i]));
|
|
27
|
+
const sampler = makeHtmlSampler(() => "/assets/temp/gl.mp4");
|
|
28
|
+
const root = await buildHTMLNodeTree(rootItem, items, sampler);
|
|
29
|
+
const canvas = document.createElement("canvas");
|
|
30
|
+
canvas.width = 1920;
|
|
31
|
+
canvas.height = 1080;
|
|
32
|
+
return new this(driver, canvas, root, sampler);
|
|
33
|
+
}
|
|
34
|
+
async #tick(ms) {
|
|
35
|
+
const duration = this.root.duration;
|
|
36
|
+
const tt = ms > duration ? duration : ms;
|
|
37
|
+
this.root.audio?.onTimeUpdate(tt);
|
|
38
|
+
const layers = await this.root.visuals?.sampleAt(tt) ?? [];
|
|
39
|
+
const frame = await this.driver.composite(layers);
|
|
40
|
+
this.context.drawImage(frame, 0, 0);
|
|
41
|
+
frame.close();
|
|
42
|
+
if (ms >= duration)
|
|
43
|
+
this.pause();
|
|
44
|
+
}
|
|
45
|
+
async play() {
|
|
46
|
+
if (!this.#controller.isPlaying()) {
|
|
47
|
+
this.sampler.setPaused(false);
|
|
48
|
+
this.#controller.play();
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
pause() {
|
|
52
|
+
if (this.#controller.isPlaying()) {
|
|
53
|
+
this.#controller.pause();
|
|
54
|
+
this.sampler.setPaused(true);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
async seek(ms) {
|
|
58
|
+
this.pause();
|
|
59
|
+
this.#controller.seek(ms);
|
|
60
|
+
this.root.audio?.onTimeUpdate(ms);
|
|
61
|
+
const layers = await this.root.visuals?.sampleAt(ms) ?? [];
|
|
62
|
+
const frame = await this.driver.composite(layers);
|
|
63
|
+
this.context.drawImage(frame, 0, 0);
|
|
64
|
+
frame.close();
|
|
65
|
+
}
|
|
66
|
+
setFPS(value) {
|
|
67
|
+
this.#controller.setFPS(value);
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
call this whenever your timeline state changes
|
|
71
|
+
*/
|
|
72
|
+
async update(timeline) {
|
|
73
|
+
const rootItem = new Map(timeline.items.map(i => [i.id, i])).get(timeline.rootId);
|
|
74
|
+
const items = new Map(timeline.items.map(i => [i.id, i]));
|
|
75
|
+
this.root = await buildHTMLNodeTree(rootItem, items, this.sampler);
|
|
76
|
+
await this.seek(this.currentTime());
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=playback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"playback.js","sourceRoot":"","sources":["../../../../s/timeline/parts/compositor/playback.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
const toUrl = (src) => (src instanceof Blob ? URL.createObjectURL(src) : String(src));
|
|
2
|
+
export function makeHtmlSampler(resolveMedia) {
|
|
3
|
+
const videoElements = new Map();
|
|
4
|
+
const audioElements = new Map();
|
|
5
|
+
function getOrCreateVideoElement(clip) {
|
|
6
|
+
let video = videoElements.get(clip.id);
|
|
7
|
+
if (!video) {
|
|
8
|
+
video = document.createElement("video");
|
|
9
|
+
video.playsInline = true;
|
|
10
|
+
video.muted = true;
|
|
11
|
+
video.preload = "auto";
|
|
12
|
+
video.crossOrigin = "anonymous";
|
|
13
|
+
video.src = toUrl(resolveMedia(clip.mediaHash));
|
|
14
|
+
videoElements.set(clip.id, video);
|
|
15
|
+
}
|
|
16
|
+
return video;
|
|
17
|
+
}
|
|
18
|
+
function getOrCreateAudioElement(clip) {
|
|
19
|
+
let audio = audioElements.get(clip.id);
|
|
20
|
+
if (!audio) {
|
|
21
|
+
audio = document.createElement("audio");
|
|
22
|
+
audio.preload = "auto";
|
|
23
|
+
audio.crossOrigin = "anonymous";
|
|
24
|
+
audio.src = toUrl(resolveMedia(clip.mediaHash));
|
|
25
|
+
audio.volume = 0.2;
|
|
26
|
+
audioElements.set(clip.id, audio);
|
|
27
|
+
}
|
|
28
|
+
return audio;
|
|
29
|
+
}
|
|
30
|
+
let paused = true;
|
|
31
|
+
return {
|
|
32
|
+
async video(item, matrix) {
|
|
33
|
+
const video = getOrCreateVideoElement(item);
|
|
34
|
+
return {
|
|
35
|
+
duration: item.duration,
|
|
36
|
+
// if paused seek otherwise play
|
|
37
|
+
visuals: {
|
|
38
|
+
sampleAt: async (ms) => {
|
|
39
|
+
if (ms < 0 || ms >= item.duration)
|
|
40
|
+
return [];
|
|
41
|
+
if (video.paused && paused) {
|
|
42
|
+
await seek(video, ms / 1000);
|
|
43
|
+
}
|
|
44
|
+
if (video.paused && !paused) {
|
|
45
|
+
await video.play();
|
|
46
|
+
}
|
|
47
|
+
const frame = new VideoFrame(video);
|
|
48
|
+
return frame ? [{ kind: "image", frame, matrix }] : [];
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
},
|
|
53
|
+
async audio(item) {
|
|
54
|
+
const audio = getOrCreateAudioElement(item);
|
|
55
|
+
return {
|
|
56
|
+
duration: item.duration,
|
|
57
|
+
audio: {
|
|
58
|
+
onTimeUpdate: async (ms) => {
|
|
59
|
+
const localTime = item.start + ms;
|
|
60
|
+
if (audio.paused && paused) {
|
|
61
|
+
await seek(audio, localTime / 1000);
|
|
62
|
+
}
|
|
63
|
+
if (audio.paused && !paused) {
|
|
64
|
+
await audio.play();
|
|
65
|
+
}
|
|
66
|
+
return [];
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
},
|
|
71
|
+
async dispose() {
|
|
72
|
+
const elements = [...videoElements.values(), ...audioElements.values()];
|
|
73
|
+
for (const element of elements) {
|
|
74
|
+
element.pause();
|
|
75
|
+
if (element.src.startsWith("blob:"))
|
|
76
|
+
URL.revokeObjectURL(element.src);
|
|
77
|
+
element.remove();
|
|
78
|
+
}
|
|
79
|
+
videoElements.clear();
|
|
80
|
+
audioElements.clear();
|
|
81
|
+
},
|
|
82
|
+
async setPaused(p) {
|
|
83
|
+
paused = p;
|
|
84
|
+
const elements = [...videoElements.values(), ...audioElements.values()];
|
|
85
|
+
for (const element of elements) {
|
|
86
|
+
if (p)
|
|
87
|
+
element.pause();
|
|
88
|
+
}
|
|
89
|
+
},
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
function seek(media, time) {
|
|
93
|
+
return new Promise((resolve) => {
|
|
94
|
+
const onSeeked = () => {
|
|
95
|
+
media.removeEventListener("seeked", onSeeked);
|
|
96
|
+
resolve();
|
|
97
|
+
};
|
|
98
|
+
media.addEventListener("seeked", onSeeked);
|
|
99
|
+
if (media.fastSeek) {
|
|
100
|
+
media.fastSeek(time);
|
|
101
|
+
}
|
|
102
|
+
else
|
|
103
|
+
media.currentTime = time;
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
//# sourceMappingURL=html.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"html.js","sourceRoot":"","sources":["../../../../../s/timeline/parts/compositor/samplers/html.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { VideoCursor } from "../../../utils/video-cursor.js";
|
|
2
|
+
import { AudioStream } from "../../../utils/audio-stream.js";
|
|
3
|
+
const toUs = (ms) => Math.round(ms * 1_000);
|
|
4
|
+
export function makeWebCodecsSampler(driver, resolveMedia) {
|
|
5
|
+
const videoCursors = new Map();
|
|
6
|
+
async function getCursorForVideo(videoItem) {
|
|
7
|
+
const existing = videoCursors.get(videoItem.id);
|
|
8
|
+
if (existing)
|
|
9
|
+
return existing;
|
|
10
|
+
const source = resolveMedia(videoItem.mediaHash);
|
|
11
|
+
const video = driver.decodeVideo({ source });
|
|
12
|
+
const cursor = new VideoCursor(video.getReader());
|
|
13
|
+
videoCursors.set(videoItem.id, cursor);
|
|
14
|
+
return cursor;
|
|
15
|
+
}
|
|
16
|
+
return {
|
|
17
|
+
async video(item, matrix) {
|
|
18
|
+
const cursor = await getCursorForVideo(item);
|
|
19
|
+
const baseUs = toUs(item.start);
|
|
20
|
+
return {
|
|
21
|
+
duration: item.duration,
|
|
22
|
+
visuals: {
|
|
23
|
+
sampleAt: async (ms) => {
|
|
24
|
+
const frame = await cursor.atOrNear(baseUs + toUs(ms));
|
|
25
|
+
return frame ? [{ kind: "image", frame, matrix }] : [];
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
},
|
|
30
|
+
async audio(item) {
|
|
31
|
+
return {
|
|
32
|
+
duration: item.duration,
|
|
33
|
+
audio: {
|
|
34
|
+
getStream: async function* () {
|
|
35
|
+
const source = resolveMedia(item.mediaHash);
|
|
36
|
+
const start = item.start / 1000;
|
|
37
|
+
const end = (item.start + item.duration) / 1000;
|
|
38
|
+
const audio = driver.decodeAudio({ source, start, end });
|
|
39
|
+
const audioStream = new AudioStream(audio.getReader());
|
|
40
|
+
yield* audioStream.stream();
|
|
41
|
+
},
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
},
|
|
45
|
+
async dispose() {
|
|
46
|
+
const tasks = Array.from([...videoCursors.values()], c => c.cancel());
|
|
47
|
+
videoCursors.clear();
|
|
48
|
+
await Promise.all(tasks);
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=webcodecs.js.map
|
|
@@ -0,0 +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,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"}
|
|
@@ -29,8 +29,9 @@ export declare class Filmstrip {
|
|
|
29
29
|
}
|
|
30
30
|
type TimeRange = [number, number];
|
|
31
31
|
interface FilmstripOptions {
|
|
32
|
-
frequency
|
|
32
|
+
frequency: number;
|
|
33
33
|
canvasSinkOptions?: CanvasSinkOptions;
|
|
34
|
+
onPlaceholders?: (timestamps: number[]) => void;
|
|
34
35
|
onChange: (tiles: {
|
|
35
36
|
time: number;
|
|
36
37
|
canvas: WrappedCanvas;
|
|
@@ -21,7 +21,8 @@ export class Filmstrip {
|
|
|
21
21
|
return new Filmstrip(videoTrack, {
|
|
22
22
|
frequency: options.frequency ?? 1,
|
|
23
23
|
canvasSinkOptions: options.canvasSinkOptions ?? { width: 80, height: 50, fit: "fill" },
|
|
24
|
-
onChange: options.onChange
|
|
24
|
+
onChange: options.onChange,
|
|
25
|
+
onPlaceholders: options.onPlaceholders
|
|
25
26
|
});
|
|
26
27
|
else
|
|
27
28
|
throw new Error("Source has no video track");
|
|
@@ -40,19 +41,31 @@ export class Filmstrip {
|
|
|
40
41
|
get frequency() {
|
|
41
42
|
return this.options.frequency;
|
|
42
43
|
}
|
|
43
|
-
#computeActiveRange([start, end]) {
|
|
44
|
+
#computeActiveRange([start, end], margin = 1) {
|
|
44
45
|
const tileSize = end - start;
|
|
45
|
-
return [start - tileSize, end + tileSize];
|
|
46
|
+
return [start - tileSize * margin, end + tileSize * margin];
|
|
47
|
+
}
|
|
48
|
+
async #generatePlaceholders() {
|
|
49
|
+
const [rangeStart, rangeEnd] = this.#activeRange;
|
|
50
|
+
const neededTimestamps = new Set();
|
|
51
|
+
// duration should be computed but with trim etc also
|
|
52
|
+
const duration = await this.videoTrack.computeDuration();
|
|
53
|
+
for (let timestamp = Math.max(0, rangeStart); timestamp <= rangeEnd; timestamp += this.options.frequency) {
|
|
54
|
+
// Clamp to valid time range
|
|
55
|
+
if (timestamp >= 0 && timestamp <= duration)
|
|
56
|
+
neededTimestamps.add(timestamp);
|
|
57
|
+
}
|
|
58
|
+
this.options.onPlaceholders?.([...neededTimestamps]);
|
|
46
59
|
}
|
|
47
60
|
async #generateTiles() {
|
|
48
61
|
const [rangeStart, rangeEnd] = this.#activeRange;
|
|
49
62
|
const neededTimestamps = new Set();
|
|
50
63
|
// duration should be computed but with trim etc also
|
|
51
64
|
const duration = await this.videoTrack.computeDuration();
|
|
52
|
-
for (let timestamp = rangeStart; timestamp <= rangeEnd; timestamp += this.options.frequency) {
|
|
65
|
+
for (let timestamp = Math.max(0, rangeStart); timestamp <= rangeEnd; timestamp += this.options.frequency) {
|
|
53
66
|
// Clamp to valid time range
|
|
54
67
|
if (timestamp >= 0 && timestamp <= duration)
|
|
55
|
-
neededTimestamps.add(
|
|
68
|
+
neededTimestamps.add(timestamp);
|
|
56
69
|
}
|
|
57
70
|
const missingTimestamps = [...neededTimestamps]
|
|
58
71
|
.filter(t => !this.#cache.has(t));
|
|
@@ -81,17 +94,23 @@ export class Filmstrip {
|
|
|
81
94
|
* @param visibleRange - The current timeline viewport as a [start, end] tuple in seconds.
|
|
82
95
|
*/
|
|
83
96
|
set range(visibleRange) {
|
|
84
|
-
const
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
97
|
+
const [visStart, visEnd] = visibleRange;
|
|
98
|
+
const visibleSize = visEnd - visStart;
|
|
99
|
+
const [actStart, actEnd] = this.#activeRange;
|
|
100
|
+
// trigger when we're 1x visible width away from margin edges
|
|
101
|
+
const leftTrigger = actStart + visibleSize;
|
|
102
|
+
const rightTrigger = actEnd - visibleSize;
|
|
103
|
+
const nearLeftEdge = visStart < leftTrigger;
|
|
104
|
+
const nearRightEdge = visEnd > rightTrigger;
|
|
105
|
+
if (!nearLeftEdge && !nearRightEdge)
|
|
88
106
|
return;
|
|
89
|
-
this.#activeRange =
|
|
107
|
+
this.#activeRange = this.#computeActiveRange(visibleRange, 2);
|
|
90
108
|
this.#update();
|
|
91
109
|
}
|
|
92
110
|
#updating = null;
|
|
93
111
|
#shouldRunAgain = false;
|
|
94
112
|
async #update() {
|
|
113
|
+
this.#generatePlaceholders();
|
|
95
114
|
// Perform update immediately. If multiple updates are requested while updating,
|
|
96
115
|
// only the latest one will run after the current finishes (skips intermediate ones).
|
|
97
116
|
if (this.#updating) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filmstrip.js","sourceRoot":"","sources":["../../../s/timeline/parts/filmstrip.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,WAAW,EACX,UAAU,EAEV,KAAK,GAGL,MAAM,YAAY,CAAA;AAGnB,OAAO,EAAC,iBAAiB,EAAC,MAAM,2CAA2C,CAAA;AAE3E,MAAM,OAAO,SAAS;IAMZ;IACA;IANT,KAAK,CAAY;IACjB,MAAM,GAA+B,IAAI,GAAG,EAAE,CAAA;IAC9C,YAAY,GAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAEhC,YACS,UAA2B,EAC3B,
|
|
1
|
+
{"version":3,"file":"filmstrip.js","sourceRoot":"","sources":["../../../s/timeline/parts/filmstrip.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,WAAW,EACX,UAAU,EAEV,KAAK,GAGL,MAAM,YAAY,CAAA;AAGnB,OAAO,EAAC,iBAAiB,EAAC,MAAM,2CAA2C,CAAA;AAE3E,MAAM,OAAO,SAAS;IAMZ;IACA;IANT,KAAK,CAAY;IACjB,MAAM,GAA+B,IAAI,GAAG,EAAE,CAAA;IAC9C,YAAY,GAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAEhC,YACS,UAA2B,EAC3B,OAAyB;QADzB,eAAU,GAAV,UAAU,CAAiB;QAC3B,YAAO,GAAP,OAAO,CAAkB;QAEjC,IAAI,CAAC,KAAK,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAA;IACnE,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAqB,EAAE,OAAyB;QACjE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;YACvB,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,MAAM,iBAAiB,CAAC,MAAM,CAAC;SACvC,CAAC,CAAA;QACF,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,oBAAoB,EAAE,CAAA;QACrD,IAAG,UAAU;YACZ,OAAO,IAAI,SAAS,CACnB,UAAU,EAAE;gBACX,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,CAAC;gBACjC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,EAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAC;gBACpF,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,cAAc,EAAE,OAAO,CAAC,cAAc;aACvC,CAAC,CAAA;;YACE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;IAClD,CAAC;IAED;;;;MAIG;IACH,IAAI,SAAS,CAAC,KAAa;QAC1B,IAAG,KAAK,KAAK,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YACrC,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,KAAK,CAAA;YAC9B,IAAI,CAAC,OAAO,EAAE,CAAA;QACf,CAAC;IACF,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAA;IAC9B,CAAC;IAED,mBAAmB,CAAC,CAAC,KAAK,EAAE,GAAG,CAAY,EAAE,MAAM,GAAG,CAAC;QACtD,MAAM,QAAQ,GAAG,GAAG,GAAG,KAAK,CAAA;QAC5B,OAAO,CAAC,KAAK,GAAG,QAAQ,GAAG,MAAM,EAAE,GAAG,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAA;IAC5D,CAAC;IAED,KAAK,CAAC,qBAAqB;QAC1B,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,YAAY,CAAA;QAChD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAA;QAE1C,qDAAqD;QACrD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAA;QACxD,KACC,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,EACvC,SAAS,IAAI,QAAQ,EACrB,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAClC,CAAC;YACF,4BAA4B;YAC5B,IAAI,SAAS,IAAI,CAAC,IAAI,SAAS,IAAI,QAAQ;gBAC1C,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACjC,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,cAAc;QACnB,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,YAAY,CAAA;QAChD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAA;QAE1C,qDAAqD;QACrD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAA;QACxD,KACC,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,EACvC,SAAS,IAAI,QAAQ,EACrB,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAClC,CAAC;YACF,4BAA4B;YAC5B,IAAI,SAAS,IAAI,CAAC,IAAI,SAAS,IAAI,QAAQ;gBAC1C,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACjC,CAAC;QAED,MAAM,iBAAiB,GAAG,CAAC,GAAG,gBAAgB,CAAC;aAC7C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAElC,IAAI,CAAC,GAAG,CAAC,CAAA;QACT,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC/E,IAAG,MAAM,EAAE,CAAC;gBACX,MAAM,aAAa,GAAG,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAA;gBAC5C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;YACvC,CAAC;QACF,CAAC;QAED,yCAAyC;QACzC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YACtC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YACxB,CAAC;QACF,CAAC;QAED,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;aACtC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC,CAAA;QAC3C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC;IAED;;;;;;MAMG;IACH,IAAI,KAAK,CAAC,YAAuB;QAChC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,YAAY,CAAA;QACvC,MAAM,WAAW,GAAG,MAAM,GAAG,QAAQ,CAAA;QACrC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,YAAY,CAAA;QAE5C,6DAA6D;QAC7D,MAAM,WAAW,GAAG,QAAQ,GAAG,WAAW,CAAA;QAC1C,MAAM,YAAY,GAAG,MAAM,GAAG,WAAW,CAAA;QAEzC,MAAM,YAAY,GAAG,QAAQ,GAAG,WAAW,CAAA;QAC3C,MAAM,aAAa,GAAG,MAAM,GAAG,YAAY,CAAA;QAE3C,IAAI,CAAC,YAAY,IAAI,CAAC,aAAa;YAAE,OAAM;QAE3C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAA;QAC7D,IAAI,CAAC,OAAO,EAAE,CAAA;IACf,CAAC;IAED,SAAS,GAAyB,IAAI,CAAA;IACtC,eAAe,GAAG,KAAK,CAAA;IAEvB,KAAK,CAAC,OAAO;QACZ,IAAI,CAAC,qBAAqB,EAAE,CAAA;QAC5B,gFAAgF;QAChF,qFAAqF;QACrF,IAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAA;YAC3B,OAAM;QACP,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;QACtC,MAAM,IAAI,CAAC,SAAS,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QAErB,IAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,IAAI,CAAC,eAAe,GAAG,KAAK,CAAA;YAC5B,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;QACrB,CAAC;IACF,CAAC;IACD;;;MAGG;IACH,YAAY,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC;CACD"}
|