@editframe/elements 0.5.0-beta.8 → 0.6.0-beta.1
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/dist/lib/av/EncodedAsset.cjs +561 -0
- package/dist/{editor/util/EncodedAsset/EncodedAsset.mjs → lib/av/EncodedAsset.js} +40 -33
- package/dist/lib/av/MP4File.cjs +182 -0
- package/dist/{editor/util/MP4File.mjs → lib/av/MP4File.js} +55 -51
- package/dist/lib/av/msToTimeCode.cjs +15 -0
- package/dist/lib/util/awaitMicrotask.cjs +8 -0
- package/dist/lib/util/memoize.cjs +14 -0
- package/dist/{util/memoize.mjs → lib/util/memoize.js} +1 -2
- package/dist/packages/elements/src/EF_FRAMEGEN.cjs +197 -0
- package/dist/packages/elements/src/EF_FRAMEGEN.d.ts +45 -0
- package/dist/packages/elements/src/EF_FRAMEGEN.js +197 -0
- package/dist/packages/elements/src/EF_INTERACTIVE.cjs +4 -0
- package/dist/packages/elements/src/EF_INTERACTIVE.d.ts +1 -0
- package/dist/packages/elements/src/elements/CrossUpdateController.cjs +16 -0
- package/dist/packages/elements/src/elements/CrossUpdateController.d.ts +9 -0
- package/dist/packages/elements/src/elements/EFAudio.cjs +53 -0
- package/dist/packages/elements/src/elements/EFAudio.d.ts +10 -0
- package/dist/{elements/src/elements/EFAudio.mjs → packages/elements/src/elements/EFAudio.js} +2 -5
- package/dist/packages/elements/src/elements/EFCaptions.cjs +171 -0
- package/dist/packages/elements/src/elements/EFCaptions.d.ts +39 -0
- package/dist/{elements/src/elements/EFCaptions.mjs → packages/elements/src/elements/EFCaptions.js} +18 -20
- package/dist/packages/elements/src/elements/EFImage.cjs +79 -0
- package/dist/packages/elements/src/elements/EFImage.d.ts +14 -0
- package/dist/{elements/src/elements/EFImage.mjs → packages/elements/src/elements/EFImage.js} +8 -7
- package/dist/packages/elements/src/elements/EFMedia.cjs +334 -0
- package/dist/packages/elements/src/elements/EFMedia.d.ts +61 -0
- package/dist/{elements/src/elements/EFMedia.mjs → packages/elements/src/elements/EFMedia.js} +40 -38
- package/dist/packages/elements/src/elements/EFSourceMixin.cjs +55 -0
- package/dist/packages/elements/src/elements/EFSourceMixin.d.ts +12 -0
- package/dist/{elements/src/elements/EFSourceMixin.mjs → packages/elements/src/elements/EFSourceMixin.js} +6 -8
- package/dist/packages/elements/src/elements/EFTemporal.cjs +198 -0
- package/dist/packages/elements/src/elements/EFTemporal.d.ts +36 -0
- package/dist/{elements/src/elements/EFTemporal.mjs → packages/elements/src/elements/EFTemporal.js} +6 -22
- package/dist/packages/elements/src/elements/EFTimegroup.browsertest.d.ts +12 -0
- package/{src/elements/EFTimegroup.ts → dist/packages/elements/src/elements/EFTimegroup.cjs} +162 -213
- package/dist/packages/elements/src/elements/EFTimegroup.d.ts +39 -0
- package/dist/{elements/src/elements/EFTimegroup.mjs → packages/elements/src/elements/EFTimegroup.js} +55 -65
- package/{src/elements/EFTimeline.ts → dist/packages/elements/src/elements/EFTimeline.cjs} +5 -3
- package/dist/packages/elements/src/elements/EFTimeline.d.ts +3 -0
- package/dist/{elements/src/elements/EFTimeline.mjs → packages/elements/src/elements/EFTimeline.js} +5 -2
- package/dist/packages/elements/src/elements/EFVideo.cjs +110 -0
- package/dist/packages/elements/src/elements/EFVideo.d.ts +14 -0
- package/dist/{elements/src/elements/EFVideo.mjs → packages/elements/src/elements/EFVideo.js} +10 -32
- package/dist/packages/elements/src/elements/EFWaveform.cjs +235 -0
- package/dist/packages/elements/src/elements/EFWaveform.d.ts +28 -0
- package/dist/{elements/src/elements/EFWaveform.mjs → packages/elements/src/elements/EFWaveform.js} +15 -16
- package/dist/packages/elements/src/elements/FetchMixin.cjs +28 -0
- package/dist/packages/elements/src/elements/FetchMixin.d.ts +8 -0
- package/dist/{elements/src/elements/FetchMixin.mjs → packages/elements/src/elements/FetchMixin.js} +5 -7
- package/dist/packages/elements/src/elements/TimegroupController.cjs +20 -0
- package/dist/packages/elements/src/elements/TimegroupController.d.ts +14 -0
- package/dist/packages/elements/src/elements/durationConverter.cjs +8 -0
- package/dist/packages/elements/src/elements/durationConverter.d.ts +4 -0
- package/dist/{elements/src/elements/durationConverter.mjs → packages/elements/src/elements/durationConverter.js} +1 -1
- package/dist/packages/elements/src/elements/parseTimeToMs.cjs +12 -0
- package/dist/packages/elements/src/elements/parseTimeToMs.d.ts +1 -0
- package/dist/packages/elements/src/elements/parseTimeToMs.js +12 -0
- package/dist/packages/elements/src/elements/util.cjs +11 -0
- package/dist/packages/elements/src/elements/util.d.ts +4 -0
- package/dist/{elements/src/elements/util.mjs → packages/elements/src/elements/util.js} +1 -1
- package/dist/packages/elements/src/gui/EFFilmstrip.cjs +675 -0
- package/dist/packages/elements/src/gui/EFFilmstrip.d.ts +138 -0
- package/dist/{elements/src/gui/EFFilmstrip.mjs → packages/elements/src/gui/EFFilmstrip.js} +57 -55
- package/dist/packages/elements/src/gui/EFWorkbench.cjs +199 -0
- package/dist/packages/elements/src/gui/EFWorkbench.d.ts +44 -0
- package/dist/{elements/src/gui/EFWorkbench.mjs → packages/elements/src/gui/EFWorkbench.js} +27 -49
- package/{src/gui/TWMixin.ts → dist/packages/elements/src/gui/TWMixin.cjs} +11 -10
- package/dist/packages/elements/src/gui/TWMixin.css.cjs +3 -0
- package/dist/packages/elements/src/gui/TWMixin.css.js +4 -0
- package/dist/packages/elements/src/gui/TWMixin.d.ts +3 -0
- package/dist/{elements/src/gui/TWMixin.mjs → packages/elements/src/gui/TWMixin.js} +4 -3
- package/dist/packages/elements/src/index.cjs +47 -0
- package/dist/packages/elements/src/index.d.ts +10 -0
- package/dist/packages/elements/src/index.js +23 -0
- package/dist/style.css +13 -4
- package/package.json +23 -4
- package/dist/elements/src/EF_FRAMEGEN.mjs +0 -130
- package/dist/elements/src/elements/parseTimeToMs.mjs +0 -13
- package/dist/elements/src/elements.mjs +0 -12
- package/dist/elements/src/gui/TWMixin.css.mjs +0 -4
- package/dist/util/awaitAnimationFrame.mjs +0 -11
- package/docker-compose.yaml +0 -17
- package/src/EF_FRAMEGEN.ts +0 -208
- package/src/EF_INTERACTIVE.ts +0 -2
- package/src/elements/CrossUpdateController.ts +0 -18
- package/src/elements/EFAudio.ts +0 -42
- package/src/elements/EFCaptions.ts +0 -202
- package/src/elements/EFImage.ts +0 -70
- package/src/elements/EFMedia.ts +0 -395
- package/src/elements/EFSourceMixin.ts +0 -57
- package/src/elements/EFTemporal.ts +0 -246
- package/src/elements/EFTimegroup.browsertest.ts +0 -360
- package/src/elements/EFVideo.ts +0 -114
- package/src/elements/EFWaveform.ts +0 -407
- package/src/elements/FetchMixin.ts +0 -18
- package/src/elements/TimegroupController.ts +0 -25
- package/src/elements/buildLitFixture.ts +0 -13
- package/src/elements/durationConverter.ts +0 -6
- package/src/elements/parseTimeToMs.ts +0 -10
- package/src/elements/util.ts +0 -24
- package/src/gui/EFFilmstrip.ts +0 -702
- package/src/gui/EFWorkbench.ts +0 -242
- package/src/gui/TWMixin.css +0 -3
- package/src/util.d.ts +0 -1
- /package/dist/{editor/msToTimeCode.mjs → lib/av/msToTimeCode.js} +0 -0
- /package/dist/{util/awaitMicrotask.mjs → lib/util/awaitMicrotask.js} +0 -0
- /package/dist/{elements/src/EF_INTERACTIVE.mjs → packages/elements/src/EF_INTERACTIVE.js} +0 -0
- /package/dist/{elements/src/elements/CrossUpdateController.mjs → packages/elements/src/elements/CrossUpdateController.js} +0 -0
- /package/dist/{elements/src/elements/TimegroupController.mjs → packages/elements/src/elements/TimegroupController.js} +0 -0
package/src/elements/EFMedia.ts
DELETED
|
@@ -1,395 +0,0 @@
|
|
|
1
|
-
import { LitElement, PropertyValueMap, css } from "lit";
|
|
2
|
-
import { EFTemporal } from "./EFTemporal";
|
|
3
|
-
import { property, state } from "lit/decorators.js";
|
|
4
|
-
import { deepArrayEquals } from "@lit/task/deep-equals.js";
|
|
5
|
-
import { Task } from "@lit/task";
|
|
6
|
-
import * as MP4Box from "mp4box";
|
|
7
|
-
import { MP4File } from "@/editor/util/MP4File";
|
|
8
|
-
import { TrackFragmentIndex, TrackSegment } from "@/assets/Probe";
|
|
9
|
-
import { getStartTimeMs } from "./util";
|
|
10
|
-
import { VideoAsset } from "@/editor/util/EncodedAsset/EncodedAsset";
|
|
11
|
-
import { FetchMixin } from "./FetchMixin";
|
|
12
|
-
import { apiHostContext } from "../gui/EFWorkbench";
|
|
13
|
-
import { consume } from "@lit/context";
|
|
14
|
-
import { EFSourceMixin } from "./EFSourceMixin";
|
|
15
|
-
import { EF_INTERACTIVE } from "../EF_INTERACTIVE";
|
|
16
|
-
|
|
17
|
-
export const deepGetMediaElements = (
|
|
18
|
-
element: Element,
|
|
19
|
-
medias: EFMedia[] = [],
|
|
20
|
-
) => {
|
|
21
|
-
for (const child of element.children) {
|
|
22
|
-
if (child instanceof EFMedia) {
|
|
23
|
-
medias.push(child);
|
|
24
|
-
} else {
|
|
25
|
-
deepGetMediaElements(child, medias);
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
return medias;
|
|
29
|
-
};
|
|
30
|
-
|
|
31
|
-
export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
32
|
-
assetType: "isobmff_files",
|
|
33
|
-
}) {
|
|
34
|
-
static styles = [
|
|
35
|
-
css`
|
|
36
|
-
:host {
|
|
37
|
-
display: block;
|
|
38
|
-
position: relative;
|
|
39
|
-
overflow: hidden;
|
|
40
|
-
}
|
|
41
|
-
`,
|
|
42
|
-
];
|
|
43
|
-
|
|
44
|
-
@property({ type: Number })
|
|
45
|
-
currentTimeMs = 0;
|
|
46
|
-
|
|
47
|
-
@consume({ context: apiHostContext, subscribe: true })
|
|
48
|
-
@state()
|
|
49
|
-
efHost?: string;
|
|
50
|
-
|
|
51
|
-
// get requiredAssets() {
|
|
52
|
-
// return { [this.md5SumLoader.value]: this.requiredAssetsPath.value ?? [] };
|
|
53
|
-
// }
|
|
54
|
-
|
|
55
|
-
fragmentIndexPath() {
|
|
56
|
-
if (this.getAttribute("src")?.startsWith("http")) {
|
|
57
|
-
return this.getAttribute("src")! + "/index";
|
|
58
|
-
}
|
|
59
|
-
return `/@ef-track-fragment-index/${this.getAttribute("src") ?? ""}`;
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
fragmentTrackPath(trackId: string) {
|
|
63
|
-
if (this.getAttribute("src")?.startsWith("http")) {
|
|
64
|
-
return (
|
|
65
|
-
this.getAttribute("src")!.replace("files", "tracks") + `/${trackId}`
|
|
66
|
-
);
|
|
67
|
-
}
|
|
68
|
-
return `/@ef-track/${this.getAttribute("src") ?? ""}?trackId=${trackId}`;
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
// requiredAssetsPath = new Task(this, {
|
|
72
|
-
// args: () => [this.trackFragmentIndexLoader.value] as const,
|
|
73
|
-
// task: ([trackFragmentIndex]) => {
|
|
74
|
-
// if (!trackFragmentIndex) {
|
|
75
|
-
// return [];
|
|
76
|
-
// }
|
|
77
|
-
// const paths = [this.fragmentIndexPath()];
|
|
78
|
-
|
|
79
|
-
// Object.values(trackFragmentIndex).forEach((track) => {
|
|
80
|
-
// paths.push(this.fragmentTrackPath(String(track.track)));
|
|
81
|
-
// });
|
|
82
|
-
|
|
83
|
-
// return paths;
|
|
84
|
-
// },
|
|
85
|
-
// });
|
|
86
|
-
|
|
87
|
-
public trackFragmentIndexLoader = new Task(this, {
|
|
88
|
-
args: () => [this.fragmentIndexPath(), this.fetch] as const,
|
|
89
|
-
task: async ([fragmentIndexPath, fetch], { signal }) => {
|
|
90
|
-
console.log("EFMedia trackFragmentIndexLoader");
|
|
91
|
-
const response = await fetch(fragmentIndexPath, { signal });
|
|
92
|
-
return (await response.json()) as Record<number, TrackFragmentIndex>;
|
|
93
|
-
},
|
|
94
|
-
onComplete: () => {
|
|
95
|
-
this.requestUpdate("ownCurrentTimeMs");
|
|
96
|
-
this.parentTimegroup?.requestUpdate("ownCurrentTimeMs");
|
|
97
|
-
},
|
|
98
|
-
});
|
|
99
|
-
|
|
100
|
-
protected initSegmentsLoader = new Task(this, {
|
|
101
|
-
autoRun: EF_INTERACTIVE,
|
|
102
|
-
args: () =>
|
|
103
|
-
[this.trackFragmentIndexLoader.value, this.src, this.fetch] as const,
|
|
104
|
-
task: async ([fragmentIndex, _src, fetch], { signal }) => {
|
|
105
|
-
console.log("EFMedia initSegmentsLoader");
|
|
106
|
-
if (!fragmentIndex) {
|
|
107
|
-
return;
|
|
108
|
-
}
|
|
109
|
-
return await Promise.all(
|
|
110
|
-
Object.entries(fragmentIndex).map(async ([trackId, track]) => {
|
|
111
|
-
const start = track.initSegment.offset;
|
|
112
|
-
const end = track.initSegment.offset + track.initSegment.size - 1;
|
|
113
|
-
const response = await fetch(this.fragmentTrackPath(trackId), {
|
|
114
|
-
signal,
|
|
115
|
-
headers: { Range: `bytes=${start}-${end}` },
|
|
116
|
-
});
|
|
117
|
-
const buffer =
|
|
118
|
-
(await response.arrayBuffer()) as MP4Box.MP4ArrayBuffer;
|
|
119
|
-
buffer.fileStart = 0;
|
|
120
|
-
const mp4File = new MP4File();
|
|
121
|
-
mp4File.appendBuffer(buffer, true);
|
|
122
|
-
mp4File.flush();
|
|
123
|
-
await mp4File.readyPromise;
|
|
124
|
-
|
|
125
|
-
return { trackId, buffer, mp4File };
|
|
126
|
-
}),
|
|
127
|
-
);
|
|
128
|
-
},
|
|
129
|
-
});
|
|
130
|
-
|
|
131
|
-
get defaultVideoTrackId() {
|
|
132
|
-
return Object.values(this.trackFragmentIndexLoader.value ?? {}).find(
|
|
133
|
-
(track) => track.type === "video",
|
|
134
|
-
)?.track;
|
|
135
|
-
}
|
|
136
|
-
|
|
137
|
-
get defaultAudioTrackId() {
|
|
138
|
-
return Object.values(this.trackFragmentIndexLoader.value ?? {}).find(
|
|
139
|
-
(track) => track.type === "audio",
|
|
140
|
-
)?.track;
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
seekTask = new Task(this, {
|
|
144
|
-
autoRun: EF_INTERACTIVE,
|
|
145
|
-
args: () =>
|
|
146
|
-
[
|
|
147
|
-
this.desiredSeekTimeMs,
|
|
148
|
-
this.trackFragmentIndexLoader.value,
|
|
149
|
-
this.initSegmentsLoader.value,
|
|
150
|
-
] as const,
|
|
151
|
-
task: async ([seekToMs, fragmentIndex, initSegments], { signal }) => {
|
|
152
|
-
console.log("EFMedia seekTask");
|
|
153
|
-
if (fragmentIndex === undefined) {
|
|
154
|
-
return;
|
|
155
|
-
}
|
|
156
|
-
if (initSegments === undefined) {
|
|
157
|
-
return;
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
const result: Record<
|
|
161
|
-
string,
|
|
162
|
-
{ segment: TrackSegment; track: MP4Box.TrackInfo }
|
|
163
|
-
> = {};
|
|
164
|
-
|
|
165
|
-
Object.values(fragmentIndex).forEach((index) => {
|
|
166
|
-
const track = initSegments
|
|
167
|
-
.find((segment) => segment.trackId === String(index.track))
|
|
168
|
-
?.mp4File.getInfo().tracks[0];
|
|
169
|
-
|
|
170
|
-
if (!track) {
|
|
171
|
-
throw new Error("Could not finding matching track");
|
|
172
|
-
}
|
|
173
|
-
|
|
174
|
-
const segment = index.segments.toReversed().find((segment) => {
|
|
175
|
-
return (segment.dts / track.timescale) * 1000 <= seekToMs;
|
|
176
|
-
});
|
|
177
|
-
|
|
178
|
-
if (!segment) {
|
|
179
|
-
return;
|
|
180
|
-
}
|
|
181
|
-
|
|
182
|
-
result[index.track] = { segment, track };
|
|
183
|
-
});
|
|
184
|
-
|
|
185
|
-
return result;
|
|
186
|
-
},
|
|
187
|
-
});
|
|
188
|
-
|
|
189
|
-
fetchSeekTask = new Task(this, {
|
|
190
|
-
autoRun: EF_INTERACTIVE,
|
|
191
|
-
argsEqual: deepArrayEquals,
|
|
192
|
-
args: () =>
|
|
193
|
-
[this.initSegmentsLoader.value, this.seekTask.value, this.fetch] as const,
|
|
194
|
-
task: async ([initSegments, seekResult, fetch], { signal }) => {
|
|
195
|
-
console.log("EFMedia fetchSeekTask");
|
|
196
|
-
if (!initSegments) {
|
|
197
|
-
return;
|
|
198
|
-
}
|
|
199
|
-
if (!seekResult) {
|
|
200
|
-
return;
|
|
201
|
-
}
|
|
202
|
-
|
|
203
|
-
const files: Record<string, File> = {};
|
|
204
|
-
|
|
205
|
-
for (const [trackId, { segment, track }] of Object.entries(seekResult)) {
|
|
206
|
-
const start = segment.offset;
|
|
207
|
-
const end = segment.offset + segment.size;
|
|
208
|
-
|
|
209
|
-
const response = await fetch(this.fragmentTrackPath(trackId), {
|
|
210
|
-
signal,
|
|
211
|
-
headers: { Range: `bytes=${start}-${end}` },
|
|
212
|
-
});
|
|
213
|
-
|
|
214
|
-
const initSegment = Object.values(initSegments).find(
|
|
215
|
-
(initSegment) => initSegment.trackId === String(track.id),
|
|
216
|
-
);
|
|
217
|
-
const initBuffer = initSegment!.buffer;
|
|
218
|
-
|
|
219
|
-
const mediaBuffer =
|
|
220
|
-
(await response.arrayBuffer()) as unknown as MP4Box.MP4ArrayBuffer;
|
|
221
|
-
|
|
222
|
-
files[trackId] = new File([initBuffer, mediaBuffer], "video.mp4", {
|
|
223
|
-
type: "video/mp4",
|
|
224
|
-
});
|
|
225
|
-
}
|
|
226
|
-
|
|
227
|
-
return files;
|
|
228
|
-
},
|
|
229
|
-
});
|
|
230
|
-
|
|
231
|
-
videoAssetTask = new Task(this, {
|
|
232
|
-
autoRun: EF_INTERACTIVE,
|
|
233
|
-
args: () => [this.fetchSeekTask.value] as const,
|
|
234
|
-
task: async ([files], { signal }) => {
|
|
235
|
-
console.log("EFMedia videoAssetTask");
|
|
236
|
-
if (!files) {
|
|
237
|
-
return;
|
|
238
|
-
}
|
|
239
|
-
if (!this.defaultVideoTrackId) {
|
|
240
|
-
return;
|
|
241
|
-
}
|
|
242
|
-
const videoFile = files[this.defaultVideoTrackId];
|
|
243
|
-
if (!videoFile) {
|
|
244
|
-
return;
|
|
245
|
-
}
|
|
246
|
-
return await VideoAsset.createFromReadableStream(
|
|
247
|
-
"video.mp4",
|
|
248
|
-
videoFile.stream(),
|
|
249
|
-
videoFile,
|
|
250
|
-
);
|
|
251
|
-
},
|
|
252
|
-
});
|
|
253
|
-
|
|
254
|
-
@state() desiredSeekTimeMs = 0;
|
|
255
|
-
|
|
256
|
-
protected async executeSeek(seekToMs: number) {
|
|
257
|
-
this.desiredSeekTimeMs = seekToMs;
|
|
258
|
-
}
|
|
259
|
-
|
|
260
|
-
protected updated(
|
|
261
|
-
changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>,
|
|
262
|
-
): void {
|
|
263
|
-
if (changedProperties.has("ownCurrentTimeMs")) {
|
|
264
|
-
this.executeSeek(this.ownCurrentTimeMs);
|
|
265
|
-
}
|
|
266
|
-
}
|
|
267
|
-
|
|
268
|
-
get hasOwnDuration() {
|
|
269
|
-
return true;
|
|
270
|
-
}
|
|
271
|
-
|
|
272
|
-
get durationMs() {
|
|
273
|
-
if (!this.trackFragmentIndexLoader.value) {
|
|
274
|
-
return 0;
|
|
275
|
-
}
|
|
276
|
-
|
|
277
|
-
const durations = Object.values(this.trackFragmentIndexLoader.value).map(
|
|
278
|
-
(track) => {
|
|
279
|
-
return (track.duration / track.timescale) * 1000;
|
|
280
|
-
},
|
|
281
|
-
);
|
|
282
|
-
if (durations.length === 0) {
|
|
283
|
-
return 0;
|
|
284
|
-
}
|
|
285
|
-
return Math.max(...durations);
|
|
286
|
-
}
|
|
287
|
-
|
|
288
|
-
get startTimeMs() {
|
|
289
|
-
return getStartTimeMs(this);
|
|
290
|
-
}
|
|
291
|
-
|
|
292
|
-
#audioContext = new OfflineAudioContext(2, 48000 / 30, 48000);
|
|
293
|
-
|
|
294
|
-
audioBufferTask = new Task(this, {
|
|
295
|
-
autoRun: EF_INTERACTIVE,
|
|
296
|
-
args: () => [this.fetchSeekTask.value, this.seekTask.value] as const,
|
|
297
|
-
task: async ([files, segments], { signal }) => {
|
|
298
|
-
console.log("EFMedia audioBufferTask", this.outerHTML);
|
|
299
|
-
if (!files) {
|
|
300
|
-
return;
|
|
301
|
-
}
|
|
302
|
-
if (!segments) {
|
|
303
|
-
return;
|
|
304
|
-
}
|
|
305
|
-
if (!this.defaultAudioTrackId) {
|
|
306
|
-
return;
|
|
307
|
-
}
|
|
308
|
-
const segment = segments[this.defaultAudioTrackId];
|
|
309
|
-
if (!segment) {
|
|
310
|
-
return;
|
|
311
|
-
}
|
|
312
|
-
const audioFile = files[this.defaultAudioTrackId];
|
|
313
|
-
if (!audioFile) {
|
|
314
|
-
return;
|
|
315
|
-
}
|
|
316
|
-
return {
|
|
317
|
-
buffer: await this.#audioContext.decodeAudioData(
|
|
318
|
-
await audioFile.arrayBuffer(),
|
|
319
|
-
),
|
|
320
|
-
startOffsetMs: (segment.segment.cts / segment.track.timescale) * 1000,
|
|
321
|
-
};
|
|
322
|
-
},
|
|
323
|
-
});
|
|
324
|
-
|
|
325
|
-
async fetchAudioSpanningTime(fromMs: number, toMs: number) {
|
|
326
|
-
// Adjust range for track's own time
|
|
327
|
-
fromMs -= this.startTimeMs;
|
|
328
|
-
toMs -= this.startTimeMs;
|
|
329
|
-
|
|
330
|
-
await this.trackFragmentIndexLoader.taskComplete;
|
|
331
|
-
const audioTrackId = this.defaultAudioTrackId;
|
|
332
|
-
if (!audioTrackId) {
|
|
333
|
-
console.warn("No audio track found");
|
|
334
|
-
return;
|
|
335
|
-
}
|
|
336
|
-
const audioTrackIndex = this.trackFragmentIndexLoader.value?.[audioTrackId];
|
|
337
|
-
if (!audioTrackIndex) {
|
|
338
|
-
console.warn("No audio track found");
|
|
339
|
-
return;
|
|
340
|
-
}
|
|
341
|
-
|
|
342
|
-
const start = audioTrackIndex.initSegment.offset;
|
|
343
|
-
const end =
|
|
344
|
-
audioTrackIndex.initSegment.offset + audioTrackIndex.initSegment.size - 1;
|
|
345
|
-
const audioInitFragmentRequest = this.fetch(
|
|
346
|
-
this.fragmentTrackPath(String(audioTrackId)),
|
|
347
|
-
{
|
|
348
|
-
headers: { Range: `bytes=${start}-${end}` },
|
|
349
|
-
},
|
|
350
|
-
);
|
|
351
|
-
|
|
352
|
-
const fragments = Object.values(audioTrackIndex.segments).filter(
|
|
353
|
-
(segment) => {
|
|
354
|
-
const segmentStartsBeforeEnd =
|
|
355
|
-
segment.dts <= (toMs * audioTrackIndex.timescale) / 1000;
|
|
356
|
-
const segmentEndsAfterStart =
|
|
357
|
-
segment.dts + segment.duration >=
|
|
358
|
-
(fromMs * audioTrackIndex.timescale) / 1000;
|
|
359
|
-
return segmentStartsBeforeEnd && segmentEndsAfterStart;
|
|
360
|
-
},
|
|
361
|
-
);
|
|
362
|
-
|
|
363
|
-
console.log("FRAGMENTS SPANNING TIME", JSON.stringify(fragments));
|
|
364
|
-
const firstFragment = fragments[0]!;
|
|
365
|
-
const lastFragment = fragments[fragments.length - 1]!;
|
|
366
|
-
const fragmentStart = firstFragment.offset;
|
|
367
|
-
const fragmentEnd = lastFragment.offset + lastFragment.size - 1;
|
|
368
|
-
|
|
369
|
-
console.log("FETCHING BYTES", `bytes=${fragmentStart}-${fragmentEnd}`);
|
|
370
|
-
const audioFragmentRequest = this.fetch(
|
|
371
|
-
this.fragmentTrackPath(String(audioTrackId)),
|
|
372
|
-
{
|
|
373
|
-
headers: { Range: `bytes=${fragmentStart}-${fragmentEnd}` },
|
|
374
|
-
},
|
|
375
|
-
);
|
|
376
|
-
|
|
377
|
-
const initResponse = await audioInitFragmentRequest;
|
|
378
|
-
const dataResponse = await audioFragmentRequest;
|
|
379
|
-
|
|
380
|
-
const initBuffer = await initResponse.arrayBuffer();
|
|
381
|
-
const dataBuffer = await dataResponse.arrayBuffer();
|
|
382
|
-
|
|
383
|
-
const audioBlob = new Blob([initBuffer, dataBuffer], {
|
|
384
|
-
type: "audio/mp4",
|
|
385
|
-
});
|
|
386
|
-
|
|
387
|
-
return {
|
|
388
|
-
blob: audioBlob,
|
|
389
|
-
startMs: (firstFragment.dts / audioTrackIndex.timescale) * 1000,
|
|
390
|
-
endMs:
|
|
391
|
-
(lastFragment.dts / audioTrackIndex.timescale) * 1000 +
|
|
392
|
-
(lastFragment.duration / audioTrackIndex.timescale) * 1000,
|
|
393
|
-
};
|
|
394
|
-
}
|
|
395
|
-
}
|
|
@@ -1,57 +0,0 @@
|
|
|
1
|
-
import { consume } from "@lit/context";
|
|
2
|
-
import { LitElement } from "lit";
|
|
3
|
-
import { apiHostContext } from "../gui/EFWorkbench";
|
|
4
|
-
import { state } from "lit/decorators/state.js";
|
|
5
|
-
import { Task } from "@lit/task";
|
|
6
|
-
import { property } from "lit/decorators/property.js";
|
|
7
|
-
|
|
8
|
-
export declare class EFSourceMixinInterface {
|
|
9
|
-
productionSrc(): string;
|
|
10
|
-
src: string;
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
interface EFSourceMixinOptions {
|
|
14
|
-
assetType: string;
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
export function EFSourceMixin<T extends Constructor<LitElement>>(
|
|
18
|
-
superClass: T,
|
|
19
|
-
options: EFSourceMixinOptions,
|
|
20
|
-
) {
|
|
21
|
-
class EFSourceElement extends superClass {
|
|
22
|
-
@consume({ context: apiHostContext, subscribe: true })
|
|
23
|
-
@state()
|
|
24
|
-
private efHost?: string;
|
|
25
|
-
|
|
26
|
-
@property({ type: String })
|
|
27
|
-
src = "";
|
|
28
|
-
|
|
29
|
-
productionSrc() {
|
|
30
|
-
if (!this.md5SumLoader.value) {
|
|
31
|
-
throw new Error(
|
|
32
|
-
`MD5 sum not available for ${this}. Cannot generate production URL`,
|
|
33
|
-
);
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
if (!this.efHost) {
|
|
37
|
-
throw new Error(
|
|
38
|
-
`efHost not available for ${this}. Cannot generate production URL`,
|
|
39
|
-
);
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
return `${this.efHost}/api/video2/${options.assetType}/${this.md5SumLoader.value}`;
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
md5SumLoader = new Task(this, {
|
|
46
|
-
autoRun: false,
|
|
47
|
-
args: () => [this.src] as const,
|
|
48
|
-
task: async ([src], { signal }) => {
|
|
49
|
-
const md5Path = `/@ef-asset/${src}`;
|
|
50
|
-
const response = await fetch(md5Path, { method: "HEAD", signal });
|
|
51
|
-
return response.headers.get("etag") ?? undefined;
|
|
52
|
-
},
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
return EFSourceElement as Constructor<EFSourceMixinInterface> & T;
|
|
57
|
-
}
|
|
@@ -1,246 +0,0 @@
|
|
|
1
|
-
import { LitElement, ReactiveController } from "lit";
|
|
2
|
-
import { consume, createContext } from "@lit/context";
|
|
3
|
-
import { property, state } from "lit/decorators.js";
|
|
4
|
-
import { EFTimegroup } from "./EFTimegroup";
|
|
5
|
-
|
|
6
|
-
import { durationConverter } from "./durationConverter";
|
|
7
|
-
import { Task } from "@lit/task";
|
|
8
|
-
import { EF_INTERACTIVE } from "../EF_INTERACTIVE";
|
|
9
|
-
|
|
10
|
-
export const timegroupContext = createContext<EFTimegroup>(
|
|
11
|
-
Symbol("timeGroupContext"),
|
|
12
|
-
);
|
|
13
|
-
|
|
14
|
-
export declare class TemporalMixinInterface {
|
|
15
|
-
get hasOwnDuration(): boolean;
|
|
16
|
-
get durationMs(): number;
|
|
17
|
-
get startTimeMs(): number;
|
|
18
|
-
get startTimeWithinParentMs(): number;
|
|
19
|
-
get endTimeMs(): number;
|
|
20
|
-
get ownCurrentTimeMs(): number;
|
|
21
|
-
|
|
22
|
-
parentTimegroup?: EFTimegroup;
|
|
23
|
-
rootTimegroup?: EFTimegroup;
|
|
24
|
-
|
|
25
|
-
frameTask: Task<readonly unknown[], unknown>;
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
export const isEFTemporal = (obj: any): obj is TemporalMixinInterface =>
|
|
29
|
-
obj[EF_TEMPORAL];
|
|
30
|
-
|
|
31
|
-
const EF_TEMPORAL = Symbol("EF_TEMPORAL");
|
|
32
|
-
|
|
33
|
-
export const deepGetTemporalElements = (
|
|
34
|
-
element: Element,
|
|
35
|
-
temporals: TemporalMixinInterface[] = [],
|
|
36
|
-
) => {
|
|
37
|
-
for (const child of element.children) {
|
|
38
|
-
if (isEFTemporal(child)) {
|
|
39
|
-
temporals.push(child);
|
|
40
|
-
}
|
|
41
|
-
deepGetTemporalElements(child, temporals);
|
|
42
|
-
}
|
|
43
|
-
return temporals;
|
|
44
|
-
};
|
|
45
|
-
|
|
46
|
-
export const deepGetElementsWithFrameTasks = (
|
|
47
|
-
element: Element,
|
|
48
|
-
elements: { frameTask: Task }[] = [],
|
|
49
|
-
) => {
|
|
50
|
-
for (const child of element.children) {
|
|
51
|
-
if ("frameTask" in child && child.frameTask instanceof Task) {
|
|
52
|
-
elements.push(child as { frameTask: Task });
|
|
53
|
-
}
|
|
54
|
-
deepGetElementsWithFrameTasks(child, elements);
|
|
55
|
-
}
|
|
56
|
-
return elements;
|
|
57
|
-
};
|
|
58
|
-
|
|
59
|
-
export const shallowGetTemporalElements = (
|
|
60
|
-
element: Element,
|
|
61
|
-
temporals: TemporalMixinInterface[] = [],
|
|
62
|
-
) => {
|
|
63
|
-
for (const child of element.children) {
|
|
64
|
-
if (isEFTemporal(child)) {
|
|
65
|
-
temporals.push(child);
|
|
66
|
-
} else {
|
|
67
|
-
shallowGetTemporalElements(child, temporals);
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
return temporals;
|
|
71
|
-
};
|
|
72
|
-
|
|
73
|
-
export const shallowGetTimegroups = (
|
|
74
|
-
element: Element,
|
|
75
|
-
groups: EFTimegroup[] = [],
|
|
76
|
-
) => {
|
|
77
|
-
for (const child of element.children) {
|
|
78
|
-
if (child instanceof EFTimegroup) {
|
|
79
|
-
groups.push(child);
|
|
80
|
-
} else {
|
|
81
|
-
shallowGetTimegroups(child, groups);
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
return groups;
|
|
85
|
-
};
|
|
86
|
-
|
|
87
|
-
export class OwnCurrentTimeController implements ReactiveController {
|
|
88
|
-
constructor(
|
|
89
|
-
private host: EFTimegroup,
|
|
90
|
-
private temporal: TemporalMixinInterface & LitElement,
|
|
91
|
-
) {
|
|
92
|
-
host.addController(this);
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
hostUpdated() {
|
|
96
|
-
this.temporal.requestUpdate("ownCurrentTimeMs");
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
remove() {
|
|
100
|
-
this.host.removeController(this);
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
export const EFTemporal = <T extends Constructor<LitElement>>(
|
|
105
|
-
superClass: T,
|
|
106
|
-
) => {
|
|
107
|
-
class TemporalMixinClass extends superClass {
|
|
108
|
-
ownCurrentTimeController?: OwnCurrentTimeController;
|
|
109
|
-
|
|
110
|
-
#parentTimegroup?: EFTimegroup;
|
|
111
|
-
@consume({ context: timegroupContext, subscribe: true })
|
|
112
|
-
@property({ attribute: false })
|
|
113
|
-
set parentTimegroup(value: EFTimegroup | undefined) {
|
|
114
|
-
this.#parentTimegroup = value;
|
|
115
|
-
this.ownCurrentTimeController?.remove();
|
|
116
|
-
this.rootTimegroup = this.getRootTimegroup();
|
|
117
|
-
if (this.rootTimegroup) {
|
|
118
|
-
this.ownCurrentTimeController = new OwnCurrentTimeController(
|
|
119
|
-
this.rootTimegroup,
|
|
120
|
-
this,
|
|
121
|
-
);
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
get parentTimegroup() {
|
|
125
|
-
return this.#parentTimegroup;
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
@property({
|
|
129
|
-
type: String,
|
|
130
|
-
attribute: "offset",
|
|
131
|
-
converter: durationConverter,
|
|
132
|
-
})
|
|
133
|
-
private _offsetMs = 0;
|
|
134
|
-
|
|
135
|
-
@property({
|
|
136
|
-
type: Number,
|
|
137
|
-
attribute: "duration",
|
|
138
|
-
converter: durationConverter,
|
|
139
|
-
})
|
|
140
|
-
private _durationMs?: number;
|
|
141
|
-
|
|
142
|
-
private get offsetAppliesToDuration() {
|
|
143
|
-
return !(this.parentTimegroup?.mode === "sequence");
|
|
144
|
-
}
|
|
145
|
-
|
|
146
|
-
@state()
|
|
147
|
-
rootTimegroup?: EFTimegroup = this.getRootTimegroup();
|
|
148
|
-
|
|
149
|
-
private getRootTimegroup(): EFTimegroup | undefined {
|
|
150
|
-
let parent = this instanceof EFTimegroup ? this : this.parentTimegroup;
|
|
151
|
-
while (parent?.parentTimegroup) {
|
|
152
|
-
parent = parent.parentTimegroup;
|
|
153
|
-
}
|
|
154
|
-
return parent;
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
get hasOwnDuration() {
|
|
158
|
-
return false;
|
|
159
|
-
}
|
|
160
|
-
|
|
161
|
-
// Defining this as a getter to a private property allows us to
|
|
162
|
-
// override it classes that include this mixin.
|
|
163
|
-
get durationMs() {
|
|
164
|
-
let durationMs =
|
|
165
|
-
this._durationMs || this.parentTimegroup?.durationMs || 0;
|
|
166
|
-
return durationMs || 0;
|
|
167
|
-
}
|
|
168
|
-
|
|
169
|
-
get offsetMs() {
|
|
170
|
-
return this._offsetMs || 0;
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
get parentTemporal() {
|
|
174
|
-
let parent = this.parentElement;
|
|
175
|
-
while (parent && !isEFTemporal(parent)) {
|
|
176
|
-
parent = parent.parentElement;
|
|
177
|
-
}
|
|
178
|
-
return parent;
|
|
179
|
-
}
|
|
180
|
-
|
|
181
|
-
get startTimeWithinParentMs() {
|
|
182
|
-
if (!this.parentTemporal) {
|
|
183
|
-
return 0;
|
|
184
|
-
}
|
|
185
|
-
return this.startTimeMs - this.parentTemporal.startTimeMs;
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
get startTimeMs(): number {
|
|
189
|
-
const parentTimegroup = this.parentTimegroup;
|
|
190
|
-
if (!parentTimegroup) {
|
|
191
|
-
return 0;
|
|
192
|
-
}
|
|
193
|
-
switch (parentTimegroup.mode) {
|
|
194
|
-
case "sequence": {
|
|
195
|
-
const siblingTemorals = shallowGetTemporalElements(parentTimegroup);
|
|
196
|
-
const ownIndex = siblingTemorals.indexOf(this);
|
|
197
|
-
if (ownIndex === 0) {
|
|
198
|
-
return parentTimegroup.startTimeMs;
|
|
199
|
-
}
|
|
200
|
-
const previous = siblingTemorals[ownIndex - 1];
|
|
201
|
-
if (!previous) {
|
|
202
|
-
throw new Error("Previous temporal element not found");
|
|
203
|
-
}
|
|
204
|
-
return previous.startTimeMs + previous.durationMs;
|
|
205
|
-
}
|
|
206
|
-
case "contain":
|
|
207
|
-
case "fixed":
|
|
208
|
-
return parentTimegroup.startTimeMs + this.offsetMs;
|
|
209
|
-
default:
|
|
210
|
-
throw new Error(`Invalid time mode: ${parentTimegroup.mode}`);
|
|
211
|
-
}
|
|
212
|
-
}
|
|
213
|
-
|
|
214
|
-
get endTimeMs(): number {
|
|
215
|
-
return this.startTimeMs + this.durationMs;
|
|
216
|
-
}
|
|
217
|
-
|
|
218
|
-
get ownCurrentTimeMs() {
|
|
219
|
-
if (this.rootTimegroup) {
|
|
220
|
-
return Math.min(
|
|
221
|
-
Math.max(0, this.rootTimegroup.currentTimeMs - this.startTimeMs),
|
|
222
|
-
this.durationMs,
|
|
223
|
-
);
|
|
224
|
-
}
|
|
225
|
-
return 0;
|
|
226
|
-
}
|
|
227
|
-
|
|
228
|
-
frameTask = new Task(this, {
|
|
229
|
-
autoRun: EF_INTERACTIVE,
|
|
230
|
-
args: () => [this.ownCurrentTimeMs] as const,
|
|
231
|
-
task: async ([], { signal }) => {
|
|
232
|
-
let fullyUpdated = await this.updateComplete;
|
|
233
|
-
while (!fullyUpdated) {
|
|
234
|
-
fullyUpdated = await this.updateComplete;
|
|
235
|
-
}
|
|
236
|
-
},
|
|
237
|
-
});
|
|
238
|
-
}
|
|
239
|
-
|
|
240
|
-
Object.defineProperty(TemporalMixinClass.prototype, EF_TEMPORAL, {
|
|
241
|
-
value: true,
|
|
242
|
-
});
|
|
243
|
-
|
|
244
|
-
return TemporalMixinClass as unknown as Constructor<TemporalMixinInterface> &
|
|
245
|
-
T;
|
|
246
|
-
};
|