@editframe/elements 0.12.0-beta.1 → 0.12.0-beta.10
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/assets/src/MP4File.js +73 -20
- package/dist/elements/EFMedia.d.ts +0 -1
- package/dist/elements/src/elements/EFMedia.js +70 -13
- package/dist/elements/src/gui/ContextMixin.js +8 -4
- package/dist/elements/src/gui/EFPreview.js +3 -1
- package/dist/elements/src/gui/EFTogglePlay.js +1 -9
- package/dist/elements/src/gui/TWMixin.css.js +1 -1
- package/dist/gui/EFTogglePlay.d.ts +0 -2
- package/package.json +2 -2
- package/src/elements/EFCaptions.ts +1 -1
- package/src/elements/EFMedia.browsertest.ts +2 -0
- package/src/elements/EFMedia.ts +86 -14
- package/src/gui/ContextMixin.ts +11 -5
- package/src/gui/EFPreview.ts +4 -2
- package/src/gui/EFTogglePlay.ts +1 -7
- package/dist/elements/src/elements/util.js +0 -11
|
@@ -40,13 +40,13 @@ class MP4File extends MP4Box.ISOFile {
|
|
|
40
40
|
await this.readyPromise;
|
|
41
41
|
const trackInfo = {};
|
|
42
42
|
for (const videoTrack of this.getInfo().videoTracks) {
|
|
43
|
-
trackInfo[videoTrack.id] = { index: 0
|
|
43
|
+
trackInfo[videoTrack.id] = { index: 0 };
|
|
44
44
|
this.setSegmentOptions(videoTrack.id, null, {
|
|
45
45
|
rapAlignement: true
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
48
|
for (const audioTrack of this.getInfo().audioTracks) {
|
|
49
|
-
trackInfo[audioTrack.id] = { index: 0
|
|
49
|
+
trackInfo[audioTrack.id] = { index: 0 };
|
|
50
50
|
const sampleRate = audioTrack.audio.sample_rate;
|
|
51
51
|
const probablePacketSize = 1024;
|
|
52
52
|
const probableFourSecondsOfSamples = Math.ceil(
|
|
@@ -61,21 +61,12 @@ class MP4File extends MP4Box.ISOFile {
|
|
|
61
61
|
yield {
|
|
62
62
|
track: initSegment.id,
|
|
63
63
|
segment: "init",
|
|
64
|
-
data: initSegment.buffer
|
|
65
|
-
complete: false
|
|
64
|
+
data: initSegment.buffer
|
|
66
65
|
};
|
|
67
66
|
}
|
|
68
67
|
const fragmentStartSamples = {};
|
|
69
68
|
let finishedReading = false;
|
|
70
|
-
|
|
71
|
-
for (const fragmentedTrack of this.fragmentedTracks) {
|
|
72
|
-
if (!trackInfo[fragmentedTrack.id]?.complete) {
|
|
73
|
-
return false;
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
return true;
|
|
77
|
-
};
|
|
78
|
-
while (!(finishedReading && allTracksFinished())) {
|
|
69
|
+
do {
|
|
79
70
|
for (const fragTrak of this.fragmentedTracks) {
|
|
80
71
|
const trak = fragTrak.trak;
|
|
81
72
|
if (trak.nextSample === void 0) {
|
|
@@ -84,6 +75,8 @@ class MP4File extends MP4Box.ISOFile {
|
|
|
84
75
|
if (trak.samples === void 0) {
|
|
85
76
|
throw new Error("trak.samples is undefined");
|
|
86
77
|
}
|
|
78
|
+
log("trak.nextSample", fragTrak.id, trak.nextSample);
|
|
79
|
+
log("trak.samples.length", fragTrak.id, trak.samples.length);
|
|
87
80
|
while (trak.nextSample < trak.samples.length) {
|
|
88
81
|
let result = void 0;
|
|
89
82
|
const fragTrakNextSample = trak.samples[trak.nextSample];
|
|
@@ -120,22 +113,20 @@ class MP4File extends MP4Box.ISOFile {
|
|
|
120
113
|
if (!trackInfoForFrag) {
|
|
121
114
|
throw new Error("trackInfoForFrag is undefined");
|
|
122
115
|
}
|
|
123
|
-
if (trak.nextSample >= trak.samples.length) {
|
|
124
|
-
trackInfoForFrag.complete = true;
|
|
125
|
-
}
|
|
126
|
-
log(
|
|
127
|
-
`Yielding fragment #${trackInfoForFrag.index} for track=${fragTrak.id}`
|
|
128
|
-
);
|
|
129
116
|
const startSample = fragmentStartSamples[fragTrak.id];
|
|
130
117
|
const endSample = trak.samples[trak.nextSample - 1];
|
|
131
118
|
if (!startSample || !endSample) {
|
|
132
119
|
throw new Error("startSample or endSample is undefined");
|
|
133
120
|
}
|
|
121
|
+
log(
|
|
122
|
+
`Yielding fragment #${trackInfoForFrag.index} for track=${fragTrak.id}`,
|
|
123
|
+
`startTime=${startSample.cts}`,
|
|
124
|
+
`endTime=${endSample.cts + endSample.duration}`
|
|
125
|
+
);
|
|
134
126
|
yield {
|
|
135
127
|
track: fragTrak.id,
|
|
136
128
|
segment: trackInfoForFrag.index,
|
|
137
129
|
data: fragTrak.segmentStream.buffer,
|
|
138
|
-
complete: trackInfoForFrag.complete,
|
|
139
130
|
cts: startSample.cts,
|
|
140
131
|
dts: startSample.dts,
|
|
141
132
|
duration: endSample.cts - startSample.cts + endSample.duration
|
|
@@ -147,6 +138,68 @@ class MP4File extends MP4Box.ISOFile {
|
|
|
147
138
|
}
|
|
148
139
|
}
|
|
149
140
|
finishedReading = await this.waitForMoreSamples();
|
|
141
|
+
} while (!finishedReading);
|
|
142
|
+
for (const fragTrak of this.fragmentedTracks) {
|
|
143
|
+
const trak = fragTrak.trak;
|
|
144
|
+
if (trak.nextSample === void 0) {
|
|
145
|
+
throw new Error("trak.nextSample is undefined");
|
|
146
|
+
}
|
|
147
|
+
if (trak.samples === void 0) {
|
|
148
|
+
throw new Error("trak.samples is undefined");
|
|
149
|
+
}
|
|
150
|
+
while (trak.nextSample < trak.samples.length) {
|
|
151
|
+
let result = void 0;
|
|
152
|
+
try {
|
|
153
|
+
result = this.createFragment(
|
|
154
|
+
fragTrak.id,
|
|
155
|
+
trak.nextSample,
|
|
156
|
+
fragTrak.segmentStream
|
|
157
|
+
);
|
|
158
|
+
} catch (error) {
|
|
159
|
+
console.error("Failed to createFragment", error);
|
|
160
|
+
}
|
|
161
|
+
if (result) {
|
|
162
|
+
fragTrak.segmentStream = result;
|
|
163
|
+
trak.nextSample++;
|
|
164
|
+
} else {
|
|
165
|
+
finishedReading = await this.waitForMoreSamples();
|
|
166
|
+
break;
|
|
167
|
+
}
|
|
168
|
+
const nextSample = trak.samples[trak.nextSample];
|
|
169
|
+
const emitSegment = (
|
|
170
|
+
// if rapAlignement is true, we emit a fragment when we have a rap sample coming up next
|
|
171
|
+
fragTrak.rapAlignement === true && nextSample?.is_sync || // if rapAlignement is false, we emit a fragment when we have the required number of samples
|
|
172
|
+
!fragTrak.rapAlignement && trak.nextSample % fragTrak.nb_samples === 0 || // if we have more samples than the number of samples requested, we emit the fragment
|
|
173
|
+
trak.nextSample >= trak.samples.length
|
|
174
|
+
);
|
|
175
|
+
if (emitSegment) {
|
|
176
|
+
const trackInfoForFrag = trackInfo[fragTrak.id];
|
|
177
|
+
if (!trackInfoForFrag) {
|
|
178
|
+
throw new Error("trackInfoForFrag is undefined");
|
|
179
|
+
}
|
|
180
|
+
const startSample = fragmentStartSamples[fragTrak.id];
|
|
181
|
+
const endSample = trak.samples[trak.nextSample - 1];
|
|
182
|
+
if (!startSample || !endSample) {
|
|
183
|
+
throw new Error("startSample or endSample is undefined");
|
|
184
|
+
}
|
|
185
|
+
log(
|
|
186
|
+
`Yielding fragment #${trackInfoForFrag.index} for track=${fragTrak.id}`,
|
|
187
|
+
`startTime=${startSample.cts}`,
|
|
188
|
+
`endTime=${endSample.cts + endSample.duration}`
|
|
189
|
+
);
|
|
190
|
+
yield {
|
|
191
|
+
track: fragTrak.id,
|
|
192
|
+
segment: trackInfoForFrag.index,
|
|
193
|
+
data: fragTrak.segmentStream.buffer,
|
|
194
|
+
cts: startSample.cts,
|
|
195
|
+
dts: startSample.dts,
|
|
196
|
+
duration: endSample.cts - startSample.cts + endSample.duration
|
|
197
|
+
};
|
|
198
|
+
trackInfoForFrag.index += 1;
|
|
199
|
+
fragTrak.segmentStream = null;
|
|
200
|
+
delete fragmentStartSamples[fragTrak.id];
|
|
201
|
+
}
|
|
202
|
+
}
|
|
150
203
|
}
|
|
151
204
|
}
|
|
152
205
|
waitForMoreSamples() {
|
|
@@ -47,7 +47,6 @@ export declare class EFMedia extends EFMedia_base {
|
|
|
47
47
|
protected updated(changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void;
|
|
48
48
|
get hasOwnDuration(): boolean;
|
|
49
49
|
get durationMs(): number;
|
|
50
|
-
get startTimeMs(): number;
|
|
51
50
|
audioBufferTask: Task<readonly [Record<string, File> | undefined, Record<string, {
|
|
52
51
|
segment: TrackSegment;
|
|
53
52
|
track: MP4Box.TrackInfo;
|
|
@@ -10,9 +10,8 @@ import { EF_INTERACTIVE } from "../EF_INTERACTIVE.js";
|
|
|
10
10
|
import { EF_RENDERING } from "../EF_RENDERING.js";
|
|
11
11
|
import { apiHostContext } from "../gui/apiHostContext.js";
|
|
12
12
|
import { EFSourceMixin } from "./EFSourceMixin.js";
|
|
13
|
-
import { EFTemporal } from "./EFTemporal.js";
|
|
13
|
+
import { EFTemporal, isEFTemporal } from "./EFTemporal.js";
|
|
14
14
|
import { FetchMixin } from "./FetchMixin.js";
|
|
15
|
-
import { getStartTimeMs } from "./util.js";
|
|
16
15
|
var __defProp = Object.defineProperty;
|
|
17
16
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
18
17
|
var __decorateClass = (decorators, target, key, kind) => {
|
|
@@ -62,10 +61,10 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
62
61
|
return await Promise.all(
|
|
63
62
|
Object.entries(fragmentIndex).map(async ([trackId, track]) => {
|
|
64
63
|
const start = track.initSegment.offset;
|
|
65
|
-
const end = track.initSegment.offset + track.initSegment.size
|
|
64
|
+
const end = track.initSegment.offset + track.initSegment.size;
|
|
66
65
|
const response = await fetch(this.fragmentTrackPath(trackId), {
|
|
67
66
|
signal,
|
|
68
|
-
headers: { Range: `bytes=${start}-${end}` }
|
|
67
|
+
headers: { Range: `bytes=${start}-${end - 1}` }
|
|
69
68
|
});
|
|
70
69
|
const buffer = await response.arrayBuffer();
|
|
71
70
|
buffer.fileStart = 0;
|
|
@@ -131,14 +130,14 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
131
130
|
const end = segment.offset + segment.size;
|
|
132
131
|
const response = await fetch(this.fragmentTrackPath(trackId), {
|
|
133
132
|
signal,
|
|
134
|
-
headers: { Range: `bytes=${start}-${end}` }
|
|
133
|
+
headers: { Range: `bytes=${start}-${end - 1}` }
|
|
135
134
|
});
|
|
136
135
|
if (nextSegment) {
|
|
137
136
|
const nextStart = nextSegment.offset;
|
|
138
137
|
const nextEnd = nextSegment.offset + nextSegment.size;
|
|
139
138
|
fetch(this.fragmentTrackPath(trackId), {
|
|
140
139
|
signal,
|
|
141
|
-
headers: { Range: `bytes=${nextStart}-${nextEnd}` }
|
|
140
|
+
headers: { Range: `bytes=${nextStart}-${nextEnd - 1}` }
|
|
142
141
|
}).then(() => {
|
|
143
142
|
log("Prefetched next segment");
|
|
144
143
|
}).catch((error) => {
|
|
@@ -270,6 +269,67 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
270
269
|
if (changedProperties.has("ownCurrentTimeMs")) {
|
|
271
270
|
this.executeSeek(this.trimAdjustedOwnCurrentTimeMs);
|
|
272
271
|
}
|
|
272
|
+
if (changedProperties.has("currentTime") || changedProperties.has("ownCurrentTimeMs")) {
|
|
273
|
+
const timelineTimeMs = (this.rootTimegroup ?? this).currentTimeMs;
|
|
274
|
+
if (this.startTimeMs > timelineTimeMs || this.endTimeMs < timelineTimeMs) {
|
|
275
|
+
this.style.display = "none";
|
|
276
|
+
return;
|
|
277
|
+
}
|
|
278
|
+
this.style.display = "";
|
|
279
|
+
const animations = this.getAnimations({ subtree: true });
|
|
280
|
+
this.style.setProperty("--ef-duration", `${this.durationMs}ms`);
|
|
281
|
+
this.style.setProperty(
|
|
282
|
+
"--ef-transition--duration",
|
|
283
|
+
`${this.parentTimegroup?.overlapMs ?? 0}ms`
|
|
284
|
+
);
|
|
285
|
+
this.style.setProperty(
|
|
286
|
+
"--ef-transition-out-start",
|
|
287
|
+
`${this.durationMs - (this.parentTimegroup?.overlapMs ?? 0)}ms`
|
|
288
|
+
);
|
|
289
|
+
for (const animation of animations) {
|
|
290
|
+
if (animation.playState === "running") {
|
|
291
|
+
animation.pause();
|
|
292
|
+
}
|
|
293
|
+
const effect = animation.effect;
|
|
294
|
+
if (!(effect && effect instanceof KeyframeEffect)) {
|
|
295
|
+
return;
|
|
296
|
+
}
|
|
297
|
+
const target = effect.target;
|
|
298
|
+
if (!target) {
|
|
299
|
+
return;
|
|
300
|
+
}
|
|
301
|
+
if (target.closest("ef-video, ef-audio") !== this) {
|
|
302
|
+
return;
|
|
303
|
+
}
|
|
304
|
+
if (isEFTemporal(target)) {
|
|
305
|
+
const timing = effect.getTiming();
|
|
306
|
+
const duration = Number(timing.duration) ?? 0;
|
|
307
|
+
const delay = Number(timing.delay);
|
|
308
|
+
const newTime = Math.floor(
|
|
309
|
+
Math.min(target.ownCurrentTimeMs, duration - 1 + delay)
|
|
310
|
+
);
|
|
311
|
+
if (Number.isNaN(newTime)) {
|
|
312
|
+
return;
|
|
313
|
+
}
|
|
314
|
+
animation.currentTime = newTime;
|
|
315
|
+
} else if (target) {
|
|
316
|
+
const nearestTimegroup = target.closest("ef-timegroup");
|
|
317
|
+
if (!nearestTimegroup) {
|
|
318
|
+
return;
|
|
319
|
+
}
|
|
320
|
+
const timing = effect.getTiming();
|
|
321
|
+
const duration = Number(timing.duration) ?? 0;
|
|
322
|
+
const delay = Number(timing.delay);
|
|
323
|
+
const newTime = Math.floor(
|
|
324
|
+
Math.min(nearestTimegroup.ownCurrentTimeMs, duration - 1 + delay)
|
|
325
|
+
);
|
|
326
|
+
if (Number.isNaN(newTime)) {
|
|
327
|
+
return;
|
|
328
|
+
}
|
|
329
|
+
animation.currentTime = newTime;
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
}
|
|
273
333
|
}
|
|
274
334
|
get hasOwnDuration() {
|
|
275
335
|
return true;
|
|
@@ -300,9 +360,6 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
300
360
|
}
|
|
301
361
|
return Math.max(...durations) - this.trimStartMs - this.trimEndMs;
|
|
302
362
|
}
|
|
303
|
-
get startTimeMs() {
|
|
304
|
-
return getStartTimeMs(this);
|
|
305
|
-
}
|
|
306
363
|
#audioContext;
|
|
307
364
|
async fetchAudioSpanningTime(fromMs, toMs) {
|
|
308
365
|
if (this.sourceInMs) {
|
|
@@ -325,11 +382,11 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
325
382
|
return;
|
|
326
383
|
}
|
|
327
384
|
const start = audioTrackIndex.initSegment.offset;
|
|
328
|
-
const end = audioTrackIndex.initSegment.offset + audioTrackIndex.initSegment.size
|
|
385
|
+
const end = audioTrackIndex.initSegment.offset + audioTrackIndex.initSegment.size;
|
|
329
386
|
const audioInitFragmentRequest = this.fetch(
|
|
330
387
|
this.fragmentTrackPath(String(audioTrackId)),
|
|
331
388
|
{
|
|
332
|
-
headers: { Range: `bytes=${start}-${end}` }
|
|
389
|
+
headers: { Range: `bytes=${start}-${end - 1}` }
|
|
333
390
|
}
|
|
334
391
|
);
|
|
335
392
|
const fragments = Object.values(audioTrackIndex.segments).filter(
|
|
@@ -350,11 +407,11 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
350
407
|
return;
|
|
351
408
|
}
|
|
352
409
|
const fragmentStart = firstFragment.offset;
|
|
353
|
-
const fragmentEnd = lastFragment.offset + lastFragment.size
|
|
410
|
+
const fragmentEnd = lastFragment.offset + lastFragment.size;
|
|
354
411
|
const audioFragmentRequest = this.fetch(
|
|
355
412
|
this.fragmentTrackPath(String(audioTrackId)),
|
|
356
413
|
{
|
|
357
|
-
headers: { Range: `bytes=${fragmentStart}-${fragmentEnd}` }
|
|
414
|
+
headers: { Range: `bytes=${fragmentStart}-${fragmentEnd - 1}` }
|
|
358
415
|
}
|
|
359
416
|
);
|
|
360
417
|
const initResponse = await audioInitFragmentRequest;
|
|
@@ -83,14 +83,14 @@ function ContextMixin(superClass) {
|
|
|
83
83
|
const scale = stageHeight / canvasHeight;
|
|
84
84
|
if (this.stageScale !== scale) {
|
|
85
85
|
canvasElement.style.transform = `scale(${scale})`;
|
|
86
|
-
canvasElement.style.transformOrigin = "
|
|
86
|
+
canvasElement.style.transformOrigin = "center left";
|
|
87
87
|
}
|
|
88
88
|
this.stageScale = scale;
|
|
89
89
|
} else {
|
|
90
90
|
const scale = stageWidth / canvasWidth;
|
|
91
91
|
if (this.stageScale !== scale) {
|
|
92
92
|
canvasElement.style.transform = `scale(${scale})`;
|
|
93
|
-
canvasElement.style.transformOrigin = "
|
|
93
|
+
canvasElement.style.transformOrigin = "center left";
|
|
94
94
|
}
|
|
95
95
|
this.stageScale = scale;
|
|
96
96
|
}
|
|
@@ -187,6 +187,12 @@ function ContextMixin(superClass) {
|
|
|
187
187
|
}
|
|
188
188
|
await timegroup.waitForMediaDurations();
|
|
189
189
|
let currentMs = timegroup.currentTimeMs;
|
|
190
|
+
const fromMs = currentMs;
|
|
191
|
+
const toMs = timegroup.endTimeMs;
|
|
192
|
+
if (fromMs >= toMs) {
|
|
193
|
+
this.pause();
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
190
196
|
let bufferCount = 0;
|
|
191
197
|
this.#playbackAudioContext = new AudioContext({
|
|
192
198
|
latencyHint: "playback"
|
|
@@ -213,8 +219,6 @@ function ContextMixin(superClass) {
|
|
|
213
219
|
fillBuffer();
|
|
214
220
|
}
|
|
215
221
|
};
|
|
216
|
-
const fromMs = currentMs;
|
|
217
|
-
const toMs = timegroup.endTimeMs;
|
|
218
222
|
const queueBufferSource = async () => {
|
|
219
223
|
if (currentMs >= toMs) {
|
|
220
224
|
return false;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { html, css, LitElement } from "lit";
|
|
2
2
|
import { customElement } from "lit/decorators.js";
|
|
3
3
|
import { ref } from "lit/directives/ref.js";
|
|
4
|
-
import { TWMixin } from "./TWMixin.js";
|
|
5
4
|
import { ContextMixin } from "./ContextMixin.js";
|
|
5
|
+
import { TWMixin } from "./TWMixin.js";
|
|
6
6
|
var __defProp = Object.defineProperty;
|
|
7
7
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
8
8
|
var __decorateClass = (decorators, target, key, kind) => {
|
|
@@ -23,7 +23,9 @@ let EFPreview = class extends ContextMixin(TWMixin(LitElement)) {
|
|
|
23
23
|
<slot
|
|
24
24
|
${ref(this.canvasRef)}
|
|
25
25
|
class="inline-block"
|
|
26
|
+
name="canvas"
|
|
26
27
|
></slot>
|
|
28
|
+
<slot name="controls"></slot>
|
|
27
29
|
</div>
|
|
28
30
|
`;
|
|
29
31
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { consume } from "@lit/context";
|
|
2
2
|
import { css, LitElement, html } from "lit";
|
|
3
|
-
import {
|
|
3
|
+
import { customElement } from "lit/decorators.js";
|
|
4
4
|
import { efContext } from "./efContext.js";
|
|
5
5
|
import { playingContext } from "./playingContext.js";
|
|
6
6
|
var __defProp = Object.defineProperty;
|
|
@@ -17,8 +17,6 @@ let EFTogglePlay = class extends LitElement {
|
|
|
17
17
|
constructor() {
|
|
18
18
|
super(...arguments);
|
|
19
19
|
this.playing = false;
|
|
20
|
-
this.play = '<button class="text-2xl cursor-pointer">▶️</button>';
|
|
21
|
-
this.pause = '<button class="text-2xl cursor-pointer">⏸️</button>';
|
|
22
20
|
}
|
|
23
21
|
render() {
|
|
24
22
|
return html`
|
|
@@ -61,12 +59,6 @@ __decorateClass([
|
|
|
61
59
|
__decorateClass([
|
|
62
60
|
consume({ context: playingContext, subscribe: true })
|
|
63
61
|
], EFTogglePlay.prototype, "playing", 2);
|
|
64
|
-
__decorateClass([
|
|
65
|
-
property({ type: String })
|
|
66
|
-
], EFTogglePlay.prototype, "play", 2);
|
|
67
|
-
__decorateClass([
|
|
68
|
-
property({ type: String })
|
|
69
|
-
], EFTogglePlay.prototype, "pause", 2);
|
|
70
62
|
EFTogglePlay = __decorateClass([
|
|
71
63
|
customElement("ef-toggle-play")
|
|
72
64
|
], EFTogglePlay);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const twStyle = "/*\n! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com\n*//*\n1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)\n2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)\n*/\n\n*,\n::before,\n::after {\n box-sizing: border-box; /* 1 */\n border-width: 0; /* 2 */\n border-style: solid; /* 2 */\n border-color: #e5e7eb; /* 2 */\n}\n\n::before,\n::after {\n --tw-content: '';\n}\n\n/*\n1. Use a consistent sensible line-height in all browsers.\n2. Prevent adjustments of font size after orientation changes in iOS.\n3. Use a more readable tab size.\n4. Use the user's configured `sans` font-family by default.\n5. Use the user's configured `sans` font-feature-settings by default.\n6. Use the user's configured `sans` font-variation-settings by default.\n7. Disable tap highlights on iOS\n*/\n\nhtml,\n:host {\n line-height: 1.5; /* 1 */\n -webkit-text-size-adjust: 100%; /* 2 */\n -moz-tab-size: 4; /* 3 */\n -o-tab-size: 4;\n tab-size: 4; /* 3 */\n font-family: ui-sans-serif, system-ui, sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\"; /* 4 */\n font-feature-settings: normal; /* 5 */\n font-variation-settings: normal; /* 6 */\n -webkit-tap-highlight-color: transparent; /* 7 */\n}\n\n/*\n1. Remove the margin in all browsers.\n2. Inherit line-height from `html` so users can set them as a class directly on the `html` element.\n*/\n\nbody {\n margin: 0; /* 1 */\n line-height: inherit; /* 2 */\n}\n\n/*\n1. Add the correct height in Firefox.\n2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)\n3. Ensure horizontal rules are visible by default.\n*/\n\nhr {\n height: 0; /* 1 */\n color: inherit; /* 2 */\n border-top-width: 1px; /* 3 */\n}\n\n/*\nAdd the correct text decoration in Chrome, Edge, and Safari.\n*/\n\nabbr:where([title]) {\n -webkit-text-decoration: underline dotted;\n text-decoration: underline dotted;\n}\n\n/*\nRemove the default font size and weight for headings.\n*/\n\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n font-size: inherit;\n font-weight: inherit;\n}\n\n/*\nReset links to optimize for opt-in styling instead of opt-out.\n*/\n\na {\n color: inherit;\n text-decoration: inherit;\n}\n\n/*\nAdd the correct font weight in Edge and Safari.\n*/\n\nb,\nstrong {\n font-weight: bolder;\n}\n\n/*\n1. Use the user's configured `mono` font-family by default.\n2. Use the user's configured `mono` font-feature-settings by default.\n3. Use the user's configured `mono` font-variation-settings by default.\n4. Correct the odd `em` font sizing in all browsers.\n*/\n\ncode,\nkbd,\nsamp,\npre {\n font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace; /* 1 */\n font-feature-settings: normal; /* 2 */\n font-variation-settings: normal; /* 3 */\n font-size: 1em; /* 4 */\n}\n\n/*\nAdd the correct font size in all browsers.\n*/\n\nsmall {\n font-size: 80%;\n}\n\n/*\nPrevent `sub` and `sup` elements from affecting the line height in all browsers.\n*/\n\nsub,\nsup {\n font-size: 75%;\n line-height: 0;\n position: relative;\n vertical-align: baseline;\n}\n\nsub {\n bottom: -0.25em;\n}\n\nsup {\n top: -0.5em;\n}\n\n/*\n1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)\n2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)\n3. Remove gaps between table borders by default.\n*/\n\ntable {\n text-indent: 0; /* 1 */\n border-color: inherit; /* 2 */\n border-collapse: collapse; /* 3 */\n}\n\n/*\n1. Change the font styles in all browsers.\n2. Remove the margin in Firefox and Safari.\n3. Remove default padding in all browsers.\n*/\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n font-family: inherit; /* 1 */\n font-feature-settings: inherit; /* 1 */\n font-variation-settings: inherit; /* 1 */\n font-size: 100%; /* 1 */\n font-weight: inherit; /* 1 */\n line-height: inherit; /* 1 */\n letter-spacing: inherit; /* 1 */\n color: inherit; /* 1 */\n margin: 0; /* 2 */\n padding: 0; /* 3 */\n}\n\n/*\nRemove the inheritance of text transform in Edge and Firefox.\n*/\n\nbutton,\nselect {\n text-transform: none;\n}\n\n/*\n1. Correct the inability to style clickable types in iOS and Safari.\n2. Remove default button styles.\n*/\n\nbutton,\ninput:where([type='button']),\ninput:where([type='reset']),\ninput:where([type='submit']) {\n -webkit-appearance: button; /* 1 */\n background-color: transparent; /* 2 */\n background-image: none; /* 2 */\n}\n\n/*\nUse the modern Firefox focus style for all focusable elements.\n*/\n\n:-moz-focusring {\n outline: auto;\n}\n\n/*\nRemove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737)\n*/\n\n:-moz-ui-invalid {\n box-shadow: none;\n}\n\n/*\nAdd the correct vertical alignment in Chrome and Firefox.\n*/\n\nprogress {\n vertical-align: baseline;\n}\n\n/*\nCorrect the cursor style of increment and decrement buttons in Safari.\n*/\n\n::-webkit-inner-spin-button,\n::-webkit-outer-spin-button {\n height: auto;\n}\n\n/*\n1. Correct the odd appearance in Chrome and Safari.\n2. Correct the outline style in Safari.\n*/\n\n[type='search'] {\n -webkit-appearance: textfield; /* 1 */\n outline-offset: -2px; /* 2 */\n}\n\n/*\nRemove the inner padding in Chrome and Safari on macOS.\n*/\n\n::-webkit-search-decoration {\n -webkit-appearance: none;\n}\n\n/*\n1. Correct the inability to style clickable types in iOS and Safari.\n2. Change font properties to `inherit` in Safari.\n*/\n\n::-webkit-file-upload-button {\n -webkit-appearance: button; /* 1 */\n font: inherit; /* 2 */\n}\n\n/*\nAdd the correct display in Chrome and Safari.\n*/\n\nsummary {\n display: list-item;\n}\n\n/*\nRemoves the default spacing and border for appropriate elements.\n*/\n\nblockquote,\ndl,\ndd,\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\nhr,\nfigure,\np,\npre {\n margin: 0;\n}\n\nfieldset {\n margin: 0;\n padding: 0;\n}\n\nlegend {\n padding: 0;\n}\n\nol,\nul,\nmenu {\n list-style: none;\n margin: 0;\n padding: 0;\n}\n\n/*\nReset default styling for dialogs.\n*/\ndialog {\n padding: 0;\n}\n\n/*\nPrevent resizing textareas horizontally by default.\n*/\n\ntextarea {\n resize: vertical;\n}\n\n/*\n1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)\n2. Set the default placeholder color to the user's configured gray 400 color.\n*/\n\ninput::-moz-placeholder, textarea::-moz-placeholder {\n opacity: 1; /* 1 */\n color: #9ca3af; /* 2 */\n}\n\ninput::placeholder,\ntextarea::placeholder {\n opacity: 1; /* 1 */\n color: #9ca3af; /* 2 */\n}\n\n/*\nSet the default cursor for buttons.\n*/\n\nbutton,\n[role=\"button\"] {\n cursor: pointer;\n}\n\n/*\nMake sure disabled buttons don't get the pointer cursor.\n*/\n:disabled {\n cursor: default;\n}\n\n/*\n1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14)\n2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210)\n This can trigger a poorly considered lint error in some tools but is included by design.\n*/\n\nimg,\nsvg,\nvideo,\ncanvas,\naudio,\niframe,\nembed,\nobject {\n display: block; /* 1 */\n vertical-align: middle; /* 2 */\n}\n\n/*\nConstrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14)\n*/\n\nimg,\nvideo {\n max-width: 100%;\n height: auto;\n}\n\n/* Make elements with the HTML hidden attribute stay hidden by default */\n[hidden] {\n display: none;\n}\n\n*, ::before, ::after {\n --tw-border-spacing-x: 0;\n --tw-border-spacing-y: 0;\n --tw-translate-x: 0;\n --tw-translate-y: 0;\n --tw-rotate: 0;\n --tw-skew-x: 0;\n --tw-skew-y: 0;\n --tw-scale-x: 1;\n --tw-scale-y: 1;\n --tw-pan-x: ;\n --tw-pan-y: ;\n --tw-pinch-zoom: ;\n --tw-scroll-snap-strictness: proximity;\n --tw-gradient-from-position: ;\n --tw-gradient-via-position: ;\n --tw-gradient-to-position: ;\n --tw-ordinal: ;\n --tw-slashed-zero: ;\n --tw-numeric-figure: ;\n --tw-numeric-spacing: ;\n --tw-numeric-fraction: ;\n --tw-ring-inset: ;\n --tw-ring-offset-width: 0px;\n --tw-ring-offset-color: #fff;\n --tw-ring-color: rgb(59 130 246 / 0.5);\n --tw-ring-offset-shadow: 0 0 #0000;\n --tw-ring-shadow: 0 0 #0000;\n --tw-shadow: 0 0 #0000;\n --tw-shadow-colored: 0 0 #0000;\n --tw-blur: ;\n --tw-brightness: ;\n --tw-contrast: ;\n --tw-grayscale: ;\n --tw-hue-rotate: ;\n --tw-invert: ;\n --tw-saturate: ;\n --tw-sepia: ;\n --tw-drop-shadow: ;\n --tw-backdrop-blur: ;\n --tw-backdrop-brightness: ;\n --tw-backdrop-contrast: ;\n --tw-backdrop-grayscale: ;\n --tw-backdrop-hue-rotate: ;\n --tw-backdrop-invert: ;\n --tw-backdrop-opacity: ;\n --tw-backdrop-saturate: ;\n --tw-backdrop-sepia: ;\n --tw-contain-size: ;\n --tw-contain-layout: ;\n --tw-contain-paint: ;\n --tw-contain-style: ;\n}\n\n::backdrop {\n --tw-border-spacing-x: 0;\n --tw-border-spacing-y: 0;\n --tw-translate-x: 0;\n --tw-translate-y: 0;\n --tw-rotate: 0;\n --tw-skew-x: 0;\n --tw-skew-y: 0;\n --tw-scale-x: 1;\n --tw-scale-y: 1;\n --tw-pan-x: ;\n --tw-pan-y: ;\n --tw-pinch-zoom: ;\n --tw-scroll-snap-strictness: proximity;\n --tw-gradient-from-position: ;\n --tw-gradient-via-position: ;\n --tw-gradient-to-position: ;\n --tw-ordinal: ;\n --tw-slashed-zero: ;\n --tw-numeric-figure: ;\n --tw-numeric-spacing: ;\n --tw-numeric-fraction: ;\n --tw-ring-inset: ;\n --tw-ring-offset-width: 0px;\n --tw-ring-offset-color: #fff;\n --tw-ring-color: rgb(59 130 246 / 0.5);\n --tw-ring-offset-shadow: 0 0 #0000;\n --tw-ring-shadow: 0 0 #0000;\n --tw-shadow: 0 0 #0000;\n --tw-shadow-colored: 0 0 #0000;\n --tw-blur: ;\n --tw-brightness: ;\n --tw-contrast: ;\n --tw-grayscale: ;\n --tw-hue-rotate: ;\n --tw-invert: ;\n --tw-saturate: ;\n --tw-sepia: ;\n --tw-drop-shadow: ;\n --tw-backdrop-blur: ;\n --tw-backdrop-brightness: ;\n --tw-backdrop-contrast: ;\n --tw-backdrop-grayscale: ;\n --tw-backdrop-hue-rotate: ;\n --tw-backdrop-invert: ;\n --tw-backdrop-opacity: ;\n --tw-backdrop-saturate: ;\n --tw-backdrop-sepia: ;\n --tw-contain-size: ;\n --tw-contain-layout: ;\n --tw-contain-paint: ;\n --tw-contain-style: ;\n}\n.container {\n width: 100%;\n}\n@media (min-width: 640px) {\n\n .container {\n max-width: 640px;\n }\n}\n@media (min-width: 768px) {\n\n .container {\n max-width: 768px;\n }\n}\n@media (min-width: 1024px) {\n\n .container {\n max-width: 1024px;\n }\n}\n@media (min-width: 1280px) {\n\n .container {\n max-width: 1280px;\n }\n}\n@media (min-width: 1536px) {\n\n .container {\n max-width: 1536px;\n }\n}\n.pointer-events-none {\n pointer-events: none;\n}\n.static {\n position: static;\n}\n.fixed {\n position: fixed;\n}\n.absolute {\n position: absolute;\n}\n.relative {\n position: relative;\n}\n.inset-0 {\n inset: 0px;\n}\n.top-0 {\n top: 0px;\n}\n.z-10 {\n z-index: 10;\n}\n.z-20 {\n z-index: 20;\n}\n.col-span-2 {\n grid-column: span 2 / span 2;\n}\n.mx-2 {\n margin-left: 0.5rem;\n margin-right: 0.5rem;\n}\n.mb-\\[1px\\] {\n margin-bottom: 1px;\n}\n.block {\n display: block;\n}\n.inline-block {\n display: inline-block;\n}\n.inline {\n display: inline;\n}\n.flex {\n display: flex;\n}\n.grid {\n display: grid;\n}\n.contents {\n display: contents;\n}\n.hidden {\n display: none;\n}\n.h-\\[1\\.1rem\\] {\n height: 1.1rem;\n}\n.h-\\[5px\\] {\n height: 5px;\n}\n.h-full {\n height: 100%;\n}\n.w-1 {\n width: 0.25rem;\n}\n.w-\\[2px\\] {\n width: 2px;\n}\n.w-full {\n width: 100%;\n}\n.transform {\n transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));\n}\n.cursor-crosshair {\n cursor: crosshair;\n}\n.cursor-pointer {\n cursor: pointer;\n}\n.resize {\n resize: both;\n}\n.flex-wrap {\n flex-wrap: wrap;\n}\n.place-content-center {\n place-content: center;\n}\n.place-items-center {\n place-items: center;\n}\n.items-center {\n align-items: center;\n}\n.justify-center {\n justify-content: center;\n}\n.overflow-auto {\n overflow: auto;\n}\n.overflow-hidden {\n overflow: hidden;\n}\n.text-nowrap {\n text-wrap: nowrap;\n}\n.rounded {\n border-radius: 0.25rem;\n}\n.border {\n border-width: 1px;\n}\n.border-r-2 {\n border-right-width: 2px;\n}\n.border-blue-500 {\n --tw-border-opacity: 1;\n border-color: rgb(59 130 246 / var(--tw-border-opacity));\n}\n.border-red-700 {\n --tw-border-opacity: 1;\n border-color: rgb(185 28 28 / var(--tw-border-opacity));\n}\n.border-slate-500 {\n --tw-border-opacity: 1;\n border-color: rgb(100 116 139 / var(--tw-border-opacity));\n}\n.border-b-slate-600 {\n --tw-border-opacity: 1;\n border-bottom-color: rgb(71 85 105 / var(--tw-border-opacity));\n}\n.bg-blue-200 {\n --tw-bg-opacity: 1;\n background-color: rgb(191 219 254 / var(--tw-bg-opacity));\n}\n.bg-blue-500 {\n --tw-bg-opacity: 1;\n background-color: rgb(59 130 246 / var(--tw-bg-opacity));\n}\n.bg-red-500 {\n --tw-bg-opacity: 1;\n background-color: rgb(239 68 68 / var(--tw-bg-opacity));\n}\n.bg-slate-100 {\n --tw-bg-opacity: 1;\n background-color: rgb(241 245 249 / var(--tw-bg-opacity));\n}\n.bg-slate-200 {\n --tw-bg-opacity: 1;\n background-color: rgb(226 232 240 / var(--tw-bg-opacity));\n}\n.bg-slate-300 {\n --tw-bg-opacity: 1;\n background-color: rgb(203 213 225 / var(--tw-bg-opacity));\n}\n.bg-white {\n --tw-bg-opacity: 1;\n background-color: rgb(255 255 255 / var(--tw-bg-opacity));\n}\n.bg-opacity-20 {\n --tw-bg-opacity: 0.2;\n}\n.p-\\[1px\\] {\n padding: 1px;\n}\n.pb-0 {\n padding-bottom: 0px;\n}\n.pl-1 {\n padding-left: 0.25rem;\n}\n.pl-2 {\n padding-left: 0.5rem;\n}\n.pr-0 {\n padding-right: 0px;\n}\n.pr-1 {\n padding-right: 0.25rem;\n}\n.pt-2 {\n padding-top: 0.5rem;\n}\n.font-mono {\n font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace;\n}\n.text-2xl {\n font-size: 1.5rem;\n line-height: 2rem;\n}\n.text-sm {\n font-size: 0.875rem;\n line-height: 1.25rem;\n}\n.text-xs {\n font-size: 0.75rem;\n line-height: 1rem;\n}\n.opacity-50 {\n opacity: 0.5;\n}\n.shadow {\n --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);\n --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);\n box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);\n}\n.shadow-slate-300 {\n --tw-shadow-color: #cbd5e1;\n --tw-shadow: var(--tw-shadow-colored);\n}\n.shadow-slate-600 {\n --tw-shadow-color: #475569;\n --tw-shadow: var(--tw-shadow-colored);\n}\n.filter {\n filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);\n}\n.hover\\:bg-slate-400:hover {\n --tw-bg-opacity: 1;\n background-color: rgb(148 163 184 / var(--tw-bg-opacity));\n}\n.peer:hover ~ .peer-hover\\:border-slate-400 {\n --tw-border-opacity: 1;\n border-color: rgb(148 163 184 / var(--tw-border-opacity));\n}\n.peer:hover ~ .peer-hover\\:bg-slate-300 {\n --tw-bg-opacity: 1;\n background-color: rgb(203 213 225 / var(--tw-bg-opacity));\n}\n.data-\\[focused\\]\\:bg-slate-400[data-focused] {\n --tw-bg-opacity: 1;\n background-color: rgb(148 163 184 / var(--tw-bg-opacity));\n}\n.peer[data-focused] ~ .peer-data-\\[focused\\]\\:border-slate-400 {\n --tw-border-opacity: 1;\n border-color: rgb(148 163 184 / var(--tw-border-opacity));\n}\n.peer[data-focused] ~ .peer-data-\\[focused\\]\\:bg-slate-300 {\n --tw-bg-opacity: 1;\n background-color: rgb(203 213 225 / var(--tw-bg-opacity));\n}\n";
|
|
1
|
+
const twStyle = "/*\n! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com\n*//*\n1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)\n2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)\n*/\n\n*,\n::before,\n::after {\n box-sizing: border-box; /* 1 */\n border-width: 0; /* 2 */\n border-style: solid; /* 2 */\n border-color: #e5e7eb; /* 2 */\n}\n\n::before,\n::after {\n --tw-content: '';\n}\n\n/*\n1. Use a consistent sensible line-height in all browsers.\n2. Prevent adjustments of font size after orientation changes in iOS.\n3. Use a more readable tab size.\n4. Use the user's configured `sans` font-family by default.\n5. Use the user's configured `sans` font-feature-settings by default.\n6. Use the user's configured `sans` font-variation-settings by default.\n7. Disable tap highlights on iOS\n*/\n\nhtml,\n:host {\n line-height: 1.5; /* 1 */\n -webkit-text-size-adjust: 100%; /* 2 */\n -moz-tab-size: 4; /* 3 */\n -o-tab-size: 4;\n tab-size: 4; /* 3 */\n font-family: ui-sans-serif, system-ui, sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\"; /* 4 */\n font-feature-settings: normal; /* 5 */\n font-variation-settings: normal; /* 6 */\n -webkit-tap-highlight-color: transparent; /* 7 */\n}\n\n/*\n1. Remove the margin in all browsers.\n2. Inherit line-height from `html` so users can set them as a class directly on the `html` element.\n*/\n\nbody {\n margin: 0; /* 1 */\n line-height: inherit; /* 2 */\n}\n\n/*\n1. Add the correct height in Firefox.\n2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)\n3. Ensure horizontal rules are visible by default.\n*/\n\nhr {\n height: 0; /* 1 */\n color: inherit; /* 2 */\n border-top-width: 1px; /* 3 */\n}\n\n/*\nAdd the correct text decoration in Chrome, Edge, and Safari.\n*/\n\nabbr:where([title]) {\n -webkit-text-decoration: underline dotted;\n text-decoration: underline dotted;\n}\n\n/*\nRemove the default font size and weight for headings.\n*/\n\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n font-size: inherit;\n font-weight: inherit;\n}\n\n/*\nReset links to optimize for opt-in styling instead of opt-out.\n*/\n\na {\n color: inherit;\n text-decoration: inherit;\n}\n\n/*\nAdd the correct font weight in Edge and Safari.\n*/\n\nb,\nstrong {\n font-weight: bolder;\n}\n\n/*\n1. Use the user's configured `mono` font-family by default.\n2. Use the user's configured `mono` font-feature-settings by default.\n3. Use the user's configured `mono` font-variation-settings by default.\n4. Correct the odd `em` font sizing in all browsers.\n*/\n\ncode,\nkbd,\nsamp,\npre {\n font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace; /* 1 */\n font-feature-settings: normal; /* 2 */\n font-variation-settings: normal; /* 3 */\n font-size: 1em; /* 4 */\n}\n\n/*\nAdd the correct font size in all browsers.\n*/\n\nsmall {\n font-size: 80%;\n}\n\n/*\nPrevent `sub` and `sup` elements from affecting the line height in all browsers.\n*/\n\nsub,\nsup {\n font-size: 75%;\n line-height: 0;\n position: relative;\n vertical-align: baseline;\n}\n\nsub {\n bottom: -0.25em;\n}\n\nsup {\n top: -0.5em;\n}\n\n/*\n1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)\n2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)\n3. Remove gaps between table borders by default.\n*/\n\ntable {\n text-indent: 0; /* 1 */\n border-color: inherit; /* 2 */\n border-collapse: collapse; /* 3 */\n}\n\n/*\n1. Change the font styles in all browsers.\n2. Remove the margin in Firefox and Safari.\n3. Remove default padding in all browsers.\n*/\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n font-family: inherit; /* 1 */\n font-feature-settings: inherit; /* 1 */\n font-variation-settings: inherit; /* 1 */\n font-size: 100%; /* 1 */\n font-weight: inherit; /* 1 */\n line-height: inherit; /* 1 */\n letter-spacing: inherit; /* 1 */\n color: inherit; /* 1 */\n margin: 0; /* 2 */\n padding: 0; /* 3 */\n}\n\n/*\nRemove the inheritance of text transform in Edge and Firefox.\n*/\n\nbutton,\nselect {\n text-transform: none;\n}\n\n/*\n1. Correct the inability to style clickable types in iOS and Safari.\n2. Remove default button styles.\n*/\n\nbutton,\ninput:where([type='button']),\ninput:where([type='reset']),\ninput:where([type='submit']) {\n -webkit-appearance: button; /* 1 */\n background-color: transparent; /* 2 */\n background-image: none; /* 2 */\n}\n\n/*\nUse the modern Firefox focus style for all focusable elements.\n*/\n\n:-moz-focusring {\n outline: auto;\n}\n\n/*\nRemove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737)\n*/\n\n:-moz-ui-invalid {\n box-shadow: none;\n}\n\n/*\nAdd the correct vertical alignment in Chrome and Firefox.\n*/\n\nprogress {\n vertical-align: baseline;\n}\n\n/*\nCorrect the cursor style of increment and decrement buttons in Safari.\n*/\n\n::-webkit-inner-spin-button,\n::-webkit-outer-spin-button {\n height: auto;\n}\n\n/*\n1. Correct the odd appearance in Chrome and Safari.\n2. Correct the outline style in Safari.\n*/\n\n[type='search'] {\n -webkit-appearance: textfield; /* 1 */\n outline-offset: -2px; /* 2 */\n}\n\n/*\nRemove the inner padding in Chrome and Safari on macOS.\n*/\n\n::-webkit-search-decoration {\n -webkit-appearance: none;\n}\n\n/*\n1. Correct the inability to style clickable types in iOS and Safari.\n2. Change font properties to `inherit` in Safari.\n*/\n\n::-webkit-file-upload-button {\n -webkit-appearance: button; /* 1 */\n font: inherit; /* 2 */\n}\n\n/*\nAdd the correct display in Chrome and Safari.\n*/\n\nsummary {\n display: list-item;\n}\n\n/*\nRemoves the default spacing and border for appropriate elements.\n*/\n\nblockquote,\ndl,\ndd,\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\nhr,\nfigure,\np,\npre {\n margin: 0;\n}\n\nfieldset {\n margin: 0;\n padding: 0;\n}\n\nlegend {\n padding: 0;\n}\n\nol,\nul,\nmenu {\n list-style: none;\n margin: 0;\n padding: 0;\n}\n\n/*\nReset default styling for dialogs.\n*/\ndialog {\n padding: 0;\n}\n\n/*\nPrevent resizing textareas horizontally by default.\n*/\n\ntextarea {\n resize: vertical;\n}\n\n/*\n1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)\n2. Set the default placeholder color to the user's configured gray 400 color.\n*/\n\ninput::-moz-placeholder, textarea::-moz-placeholder {\n opacity: 1; /* 1 */\n color: #9ca3af; /* 2 */\n}\n\ninput::placeholder,\ntextarea::placeholder {\n opacity: 1; /* 1 */\n color: #9ca3af; /* 2 */\n}\n\n/*\nSet the default cursor for buttons.\n*/\n\nbutton,\n[role=\"button\"] {\n cursor: pointer;\n}\n\n/*\nMake sure disabled buttons don't get the pointer cursor.\n*/\n:disabled {\n cursor: default;\n}\n\n/*\n1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14)\n2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210)\n This can trigger a poorly considered lint error in some tools but is included by design.\n*/\n\nimg,\nsvg,\nvideo,\ncanvas,\naudio,\niframe,\nembed,\nobject {\n display: block; /* 1 */\n vertical-align: middle; /* 2 */\n}\n\n/*\nConstrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14)\n*/\n\nimg,\nvideo {\n max-width: 100%;\n height: auto;\n}\n\n/* Make elements with the HTML hidden attribute stay hidden by default */\n[hidden] {\n display: none;\n}\n\n*, ::before, ::after {\n --tw-border-spacing-x: 0;\n --tw-border-spacing-y: 0;\n --tw-translate-x: 0;\n --tw-translate-y: 0;\n --tw-rotate: 0;\n --tw-skew-x: 0;\n --tw-skew-y: 0;\n --tw-scale-x: 1;\n --tw-scale-y: 1;\n --tw-pan-x: ;\n --tw-pan-y: ;\n --tw-pinch-zoom: ;\n --tw-scroll-snap-strictness: proximity;\n --tw-gradient-from-position: ;\n --tw-gradient-via-position: ;\n --tw-gradient-to-position: ;\n --tw-ordinal: ;\n --tw-slashed-zero: ;\n --tw-numeric-figure: ;\n --tw-numeric-spacing: ;\n --tw-numeric-fraction: ;\n --tw-ring-inset: ;\n --tw-ring-offset-width: 0px;\n --tw-ring-offset-color: #fff;\n --tw-ring-color: rgb(59 130 246 / 0.5);\n --tw-ring-offset-shadow: 0 0 #0000;\n --tw-ring-shadow: 0 0 #0000;\n --tw-shadow: 0 0 #0000;\n --tw-shadow-colored: 0 0 #0000;\n --tw-blur: ;\n --tw-brightness: ;\n --tw-contrast: ;\n --tw-grayscale: ;\n --tw-hue-rotate: ;\n --tw-invert: ;\n --tw-saturate: ;\n --tw-sepia: ;\n --tw-drop-shadow: ;\n --tw-backdrop-blur: ;\n --tw-backdrop-brightness: ;\n --tw-backdrop-contrast: ;\n --tw-backdrop-grayscale: ;\n --tw-backdrop-hue-rotate: ;\n --tw-backdrop-invert: ;\n --tw-backdrop-opacity: ;\n --tw-backdrop-saturate: ;\n --tw-backdrop-sepia: ;\n --tw-contain-size: ;\n --tw-contain-layout: ;\n --tw-contain-paint: ;\n --tw-contain-style: ;\n}\n\n::backdrop {\n --tw-border-spacing-x: 0;\n --tw-border-spacing-y: 0;\n --tw-translate-x: 0;\n --tw-translate-y: 0;\n --tw-rotate: 0;\n --tw-skew-x: 0;\n --tw-skew-y: 0;\n --tw-scale-x: 1;\n --tw-scale-y: 1;\n --tw-pan-x: ;\n --tw-pan-y: ;\n --tw-pinch-zoom: ;\n --tw-scroll-snap-strictness: proximity;\n --tw-gradient-from-position: ;\n --tw-gradient-via-position: ;\n --tw-gradient-to-position: ;\n --tw-ordinal: ;\n --tw-slashed-zero: ;\n --tw-numeric-figure: ;\n --tw-numeric-spacing: ;\n --tw-numeric-fraction: ;\n --tw-ring-inset: ;\n --tw-ring-offset-width: 0px;\n --tw-ring-offset-color: #fff;\n --tw-ring-color: rgb(59 130 246 / 0.5);\n --tw-ring-offset-shadow: 0 0 #0000;\n --tw-ring-shadow: 0 0 #0000;\n --tw-shadow: 0 0 #0000;\n --tw-shadow-colored: 0 0 #0000;\n --tw-blur: ;\n --tw-brightness: ;\n --tw-contrast: ;\n --tw-grayscale: ;\n --tw-hue-rotate: ;\n --tw-invert: ;\n --tw-saturate: ;\n --tw-sepia: ;\n --tw-drop-shadow: ;\n --tw-backdrop-blur: ;\n --tw-backdrop-brightness: ;\n --tw-backdrop-contrast: ;\n --tw-backdrop-grayscale: ;\n --tw-backdrop-hue-rotate: ;\n --tw-backdrop-invert: ;\n --tw-backdrop-opacity: ;\n --tw-backdrop-saturate: ;\n --tw-backdrop-sepia: ;\n --tw-contain-size: ;\n --tw-contain-layout: ;\n --tw-contain-paint: ;\n --tw-contain-style: ;\n}\n.container {\n width: 100%;\n}\n@media (min-width: 640px) {\n\n .container {\n max-width: 640px;\n }\n}\n@media (min-width: 768px) {\n\n .container {\n max-width: 768px;\n }\n}\n@media (min-width: 1024px) {\n\n .container {\n max-width: 1024px;\n }\n}\n@media (min-width: 1280px) {\n\n .container {\n max-width: 1280px;\n }\n}\n@media (min-width: 1536px) {\n\n .container {\n max-width: 1536px;\n }\n}\n.pointer-events-none {\n pointer-events: none;\n}\n.static {\n position: static;\n}\n.fixed {\n position: fixed;\n}\n.absolute {\n position: absolute;\n}\n.relative {\n position: relative;\n}\n.inset-0 {\n inset: 0px;\n}\n.top-0 {\n top: 0px;\n}\n.z-10 {\n z-index: 10;\n}\n.z-20 {\n z-index: 20;\n}\n.col-span-2 {\n grid-column: span 2 / span 2;\n}\n.mx-2 {\n margin-left: 0.5rem;\n margin-right: 0.5rem;\n}\n.mb-\\[1px\\] {\n margin-bottom: 1px;\n}\n.block {\n display: block;\n}\n.inline-block {\n display: inline-block;\n}\n.inline {\n display: inline;\n}\n.flex {\n display: flex;\n}\n.grid {\n display: grid;\n}\n.contents {\n display: contents;\n}\n.hidden {\n display: none;\n}\n.h-\\[1\\.1rem\\] {\n height: 1.1rem;\n}\n.h-\\[5px\\] {\n height: 5px;\n}\n.h-full {\n height: 100%;\n}\n.w-1 {\n width: 0.25rem;\n}\n.w-\\[2px\\] {\n width: 2px;\n}\n.w-full {\n width: 100%;\n}\n.transform {\n transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));\n}\n.cursor-crosshair {\n cursor: crosshair;\n}\n.resize {\n resize: both;\n}\n.flex-wrap {\n flex-wrap: wrap;\n}\n.place-content-center {\n place-content: center;\n}\n.place-items-center {\n place-items: center;\n}\n.items-center {\n align-items: center;\n}\n.justify-center {\n justify-content: center;\n}\n.overflow-auto {\n overflow: auto;\n}\n.overflow-hidden {\n overflow: hidden;\n}\n.text-nowrap {\n text-wrap: nowrap;\n}\n.rounded {\n border-radius: 0.25rem;\n}\n.border {\n border-width: 1px;\n}\n.border-r-2 {\n border-right-width: 2px;\n}\n.border-blue-500 {\n --tw-border-opacity: 1;\n border-color: rgb(59 130 246 / var(--tw-border-opacity));\n}\n.border-red-700 {\n --tw-border-opacity: 1;\n border-color: rgb(185 28 28 / var(--tw-border-opacity));\n}\n.border-slate-500 {\n --tw-border-opacity: 1;\n border-color: rgb(100 116 139 / var(--tw-border-opacity));\n}\n.border-b-slate-600 {\n --tw-border-opacity: 1;\n border-bottom-color: rgb(71 85 105 / var(--tw-border-opacity));\n}\n.bg-blue-200 {\n --tw-bg-opacity: 1;\n background-color: rgb(191 219 254 / var(--tw-bg-opacity));\n}\n.bg-blue-500 {\n --tw-bg-opacity: 1;\n background-color: rgb(59 130 246 / var(--tw-bg-opacity));\n}\n.bg-red-500 {\n --tw-bg-opacity: 1;\n background-color: rgb(239 68 68 / var(--tw-bg-opacity));\n}\n.bg-slate-100 {\n --tw-bg-opacity: 1;\n background-color: rgb(241 245 249 / var(--tw-bg-opacity));\n}\n.bg-slate-200 {\n --tw-bg-opacity: 1;\n background-color: rgb(226 232 240 / var(--tw-bg-opacity));\n}\n.bg-slate-300 {\n --tw-bg-opacity: 1;\n background-color: rgb(203 213 225 / var(--tw-bg-opacity));\n}\n.bg-white {\n --tw-bg-opacity: 1;\n background-color: rgb(255 255 255 / var(--tw-bg-opacity));\n}\n.bg-opacity-20 {\n --tw-bg-opacity: 0.2;\n}\n.p-\\[1px\\] {\n padding: 1px;\n}\n.pb-0 {\n padding-bottom: 0px;\n}\n.pl-1 {\n padding-left: 0.25rem;\n}\n.pl-2 {\n padding-left: 0.5rem;\n}\n.pr-0 {\n padding-right: 0px;\n}\n.pr-1 {\n padding-right: 0.25rem;\n}\n.pt-2 {\n padding-top: 0.5rem;\n}\n.font-mono {\n font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace;\n}\n.text-sm {\n font-size: 0.875rem;\n line-height: 1.25rem;\n}\n.text-xs {\n font-size: 0.75rem;\n line-height: 1rem;\n}\n.opacity-50 {\n opacity: 0.5;\n}\n.shadow {\n --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);\n --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);\n box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);\n}\n.shadow-slate-300 {\n --tw-shadow-color: #cbd5e1;\n --tw-shadow: var(--tw-shadow-colored);\n}\n.shadow-slate-600 {\n --tw-shadow-color: #475569;\n --tw-shadow: var(--tw-shadow-colored);\n}\n.filter {\n filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);\n}\n.hover\\:bg-slate-400:hover {\n --tw-bg-opacity: 1;\n background-color: rgb(148 163 184 / var(--tw-bg-opacity));\n}\n.peer:hover ~ .peer-hover\\:border-slate-400 {\n --tw-border-opacity: 1;\n border-color: rgb(148 163 184 / var(--tw-border-opacity));\n}\n.peer:hover ~ .peer-hover\\:bg-slate-300 {\n --tw-bg-opacity: 1;\n background-color: rgb(203 213 225 / var(--tw-bg-opacity));\n}\n.data-\\[focused\\]\\:bg-slate-400[data-focused] {\n --tw-bg-opacity: 1;\n background-color: rgb(148 163 184 / var(--tw-bg-opacity));\n}\n.peer[data-focused] ~ .peer-data-\\[focused\\]\\:border-slate-400 {\n --tw-border-opacity: 1;\n border-color: rgb(148 163 184 / var(--tw-border-opacity));\n}\n.peer[data-focused] ~ .peer-data-\\[focused\\]\\:bg-slate-300 {\n --tw-bg-opacity: 1;\n background-color: rgb(203 213 225 / var(--tw-bg-opacity));\n}\n";
|
|
2
2
|
export {
|
|
3
3
|
twStyle as default
|
|
4
4
|
};
|
|
@@ -4,8 +4,6 @@ export declare class EFTogglePlay extends LitElement {
|
|
|
4
4
|
static styles: import('lit').CSSResult[];
|
|
5
5
|
context?: ContextMixinInterface | null;
|
|
6
6
|
playing: boolean;
|
|
7
|
-
play: string;
|
|
8
|
-
pause: string;
|
|
9
7
|
render(): import('lit-html').TemplateResult<1>;
|
|
10
8
|
togglePlay(): void;
|
|
11
9
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@editframe/elements",
|
|
3
|
-
"version": "0.12.0-beta.
|
|
3
|
+
"version": "0.12.0-beta.10",
|
|
4
4
|
"description": "",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"author": "",
|
|
21
21
|
"license": "UNLICENSED",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@editframe/assets": "0.12.0-beta.
|
|
23
|
+
"@editframe/assets": "0.12.0-beta.10",
|
|
24
24
|
"@lit/context": "^1.1.2",
|
|
25
25
|
"@lit/task": "^1.0.1",
|
|
26
26
|
"d3": "^7.9.0",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { GetISOBMFFFileTranscriptionResult } from "@editframe/api";
|
|
2
1
|
import { Task } from "@lit/task";
|
|
3
2
|
import { LitElement, type PropertyValueMap, css, html } from "lit";
|
|
4
3
|
import { customElement, property } from "lit/decorators.js";
|
|
4
|
+
import type { GetISOBMFFFileTranscriptionResult } from "../../../api/src/index.ts";
|
|
5
5
|
import { EF_INTERACTIVE } from "../EF_INTERACTIVE.ts";
|
|
6
6
|
import { EF_RENDERING } from "../EF_RENDERING.ts";
|
|
7
7
|
import { CrossUpdateController } from "./CrossUpdateController.ts";
|
|
@@ -4,6 +4,7 @@ import { afterEach, beforeEach, describe, expect, test } from "vitest";
|
|
|
4
4
|
import { EFMedia } from "./EFMedia.ts";
|
|
5
5
|
import "../gui/EFWorkbench.ts";
|
|
6
6
|
import "../gui/EFPreview.ts";
|
|
7
|
+
import "./EFTimegroup.ts";
|
|
7
8
|
import { createTestFragmentIndex } from "TEST/createTestFragmentIndex.ts";
|
|
8
9
|
import { useMockWorker } from "TEST/useMockWorker.ts";
|
|
9
10
|
import { http, HttpResponse } from "msw";
|
|
@@ -291,6 +292,7 @@ describe("EFMedia", () => {
|
|
|
291
292
|
expect(element.durationMs).toBe(4_000);
|
|
292
293
|
expect(timegroup.durationMs).toBe(4_000);
|
|
293
294
|
});
|
|
295
|
+
|
|
294
296
|
test("Computes duration from track fragment index sourceout and sourcein", async () => {
|
|
295
297
|
// Mock the request for the track fragment index, responds with a 10 second duration
|
|
296
298
|
worker.use(
|
package/src/elements/EFMedia.ts
CHANGED
|
@@ -14,9 +14,8 @@ import { EF_INTERACTIVE } from "../EF_INTERACTIVE.ts";
|
|
|
14
14
|
import { EF_RENDERING } from "../EF_RENDERING.ts";
|
|
15
15
|
import { apiHostContext } from "../gui/apiHostContext.ts";
|
|
16
16
|
import { EFSourceMixin } from "./EFSourceMixin.ts";
|
|
17
|
-
import { EFTemporal } from "./EFTemporal.ts";
|
|
17
|
+
import { EFTemporal, isEFTemporal } from "./EFTemporal.ts";
|
|
18
18
|
import { FetchMixin } from "./FetchMixin.ts";
|
|
19
|
-
import { getStartTimeMs } from "./util.ts";
|
|
20
19
|
|
|
21
20
|
const log = debug("ef:elements:EFMedia");
|
|
22
21
|
|
|
@@ -110,10 +109,10 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
110
109
|
return await Promise.all(
|
|
111
110
|
Object.entries(fragmentIndex).map(async ([trackId, track]) => {
|
|
112
111
|
const start = track.initSegment.offset;
|
|
113
|
-
const end = track.initSegment.offset + track.initSegment.size
|
|
112
|
+
const end = track.initSegment.offset + track.initSegment.size;
|
|
114
113
|
const response = await fetch(this.fragmentTrackPath(trackId), {
|
|
115
114
|
signal,
|
|
116
|
-
headers: { Range: `bytes=${start}-${end}` },
|
|
115
|
+
headers: { Range: `bytes=${start}-${end - 1}` },
|
|
117
116
|
});
|
|
118
117
|
const buffer =
|
|
119
118
|
(await response.arrayBuffer()) as MP4Box.MP4ArrayBuffer;
|
|
@@ -220,7 +219,7 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
220
219
|
|
|
221
220
|
const response = await fetch(this.fragmentTrackPath(trackId), {
|
|
222
221
|
signal,
|
|
223
|
-
headers: { Range: `bytes=${start}-${end}` },
|
|
222
|
+
headers: { Range: `bytes=${start}-${end - 1}` },
|
|
224
223
|
});
|
|
225
224
|
|
|
226
225
|
if (nextSegment) {
|
|
@@ -228,7 +227,7 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
228
227
|
const nextEnd = nextSegment.offset + nextSegment.size;
|
|
229
228
|
fetch(this.fragmentTrackPath(trackId), {
|
|
230
229
|
signal,
|
|
231
|
-
headers: { Range: `bytes=${nextStart}-${nextEnd}` },
|
|
230
|
+
headers: { Range: `bytes=${nextStart}-${nextEnd - 1}` },
|
|
232
231
|
})
|
|
233
232
|
.then(() => {
|
|
234
233
|
log("Prefetched next segment");
|
|
@@ -297,6 +296,83 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
297
296
|
if (changedProperties.has("ownCurrentTimeMs")) {
|
|
298
297
|
this.executeSeek(this.trimAdjustedOwnCurrentTimeMs);
|
|
299
298
|
}
|
|
299
|
+
// TODO: this is copied straight from EFTimegroup.ts
|
|
300
|
+
// and should be refactored to be shared/reduce bad duplication of
|
|
301
|
+
// critical logic.
|
|
302
|
+
if (
|
|
303
|
+
changedProperties.has("currentTime") ||
|
|
304
|
+
changedProperties.has("ownCurrentTimeMs")
|
|
305
|
+
) {
|
|
306
|
+
const timelineTimeMs = (this.rootTimegroup ?? this).currentTimeMs;
|
|
307
|
+
if (
|
|
308
|
+
this.startTimeMs > timelineTimeMs ||
|
|
309
|
+
this.endTimeMs < timelineTimeMs
|
|
310
|
+
) {
|
|
311
|
+
this.style.display = "none";
|
|
312
|
+
return;
|
|
313
|
+
}
|
|
314
|
+
this.style.display = "";
|
|
315
|
+
|
|
316
|
+
const animations = this.getAnimations({ subtree: true });
|
|
317
|
+
this.style.setProperty("--ef-duration", `${this.durationMs}ms`);
|
|
318
|
+
this.style.setProperty(
|
|
319
|
+
"--ef-transition--duration",
|
|
320
|
+
`${this.parentTimegroup?.overlapMs ?? 0}ms`,
|
|
321
|
+
);
|
|
322
|
+
this.style.setProperty(
|
|
323
|
+
"--ef-transition-out-start",
|
|
324
|
+
`${this.durationMs - (this.parentTimegroup?.overlapMs ?? 0)}ms`,
|
|
325
|
+
);
|
|
326
|
+
|
|
327
|
+
for (const animation of animations) {
|
|
328
|
+
if (animation.playState === "running") {
|
|
329
|
+
animation.pause();
|
|
330
|
+
}
|
|
331
|
+
const effect = animation.effect;
|
|
332
|
+
if (!(effect && effect instanceof KeyframeEffect)) {
|
|
333
|
+
return;
|
|
334
|
+
}
|
|
335
|
+
const target = effect.target;
|
|
336
|
+
// TODO: better generalize work avoidance for temporal elements
|
|
337
|
+
if (!target) {
|
|
338
|
+
return;
|
|
339
|
+
}
|
|
340
|
+
if (target.closest("ef-video, ef-audio") !== this) {
|
|
341
|
+
return;
|
|
342
|
+
}
|
|
343
|
+
|
|
344
|
+
// Important to avoid going to the end of the animation
|
|
345
|
+
// or it will reset awkwardly.
|
|
346
|
+
if (isEFTemporal(target)) {
|
|
347
|
+
const timing = effect.getTiming();
|
|
348
|
+
const duration = Number(timing.duration) ?? 0;
|
|
349
|
+
const delay = Number(timing.delay);
|
|
350
|
+
const newTime = Math.floor(
|
|
351
|
+
Math.min(target.ownCurrentTimeMs, duration - 1 + delay),
|
|
352
|
+
);
|
|
353
|
+
if (Number.isNaN(newTime)) {
|
|
354
|
+
return;
|
|
355
|
+
}
|
|
356
|
+
animation.currentTime = newTime;
|
|
357
|
+
} else if (target) {
|
|
358
|
+
const nearestTimegroup = target.closest("ef-timegroup");
|
|
359
|
+
if (!nearestTimegroup) {
|
|
360
|
+
return;
|
|
361
|
+
}
|
|
362
|
+
const timing = effect.getTiming();
|
|
363
|
+
const duration = Number(timing.duration) ?? 0;
|
|
364
|
+
const delay = Number(timing.delay);
|
|
365
|
+
const newTime = Math.floor(
|
|
366
|
+
Math.min(nearestTimegroup.ownCurrentTimeMs, duration - 1 + delay),
|
|
367
|
+
);
|
|
368
|
+
|
|
369
|
+
if (Number.isNaN(newTime)) {
|
|
370
|
+
return;
|
|
371
|
+
}
|
|
372
|
+
animation.currentTime = newTime;
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
}
|
|
300
376
|
}
|
|
301
377
|
|
|
302
378
|
get hasOwnDuration() {
|
|
@@ -351,10 +427,6 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
351
427
|
return Math.max(...durations) - this.trimStartMs - this.trimEndMs;
|
|
352
428
|
}
|
|
353
429
|
|
|
354
|
-
get startTimeMs() {
|
|
355
|
-
return getStartTimeMs(this);
|
|
356
|
-
}
|
|
357
|
-
|
|
358
430
|
#audioContext = new OfflineAudioContext(2, 48000 / 30, 48000);
|
|
359
431
|
|
|
360
432
|
audioBufferTask = new Task(this, {
|
|
@@ -413,11 +485,11 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
413
485
|
|
|
414
486
|
const start = audioTrackIndex.initSegment.offset;
|
|
415
487
|
const end =
|
|
416
|
-
audioTrackIndex.initSegment.offset + audioTrackIndex.initSegment.size
|
|
488
|
+
audioTrackIndex.initSegment.offset + audioTrackIndex.initSegment.size;
|
|
417
489
|
const audioInitFragmentRequest = this.fetch(
|
|
418
490
|
this.fragmentTrackPath(String(audioTrackId)),
|
|
419
491
|
{
|
|
420
|
-
headers: { Range: `bytes=${start}-${end}` },
|
|
492
|
+
headers: { Range: `bytes=${start}-${end - 1}` },
|
|
421
493
|
},
|
|
422
494
|
);
|
|
423
495
|
|
|
@@ -443,12 +515,12 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
|
|
|
443
515
|
return;
|
|
444
516
|
}
|
|
445
517
|
const fragmentStart = firstFragment.offset;
|
|
446
|
-
const fragmentEnd = lastFragment.offset + lastFragment.size
|
|
518
|
+
const fragmentEnd = lastFragment.offset + lastFragment.size;
|
|
447
519
|
|
|
448
520
|
const audioFragmentRequest = this.fetch(
|
|
449
521
|
this.fragmentTrackPath(String(audioTrackId)),
|
|
450
522
|
{
|
|
451
|
-
headers: { Range: `bytes=${fragmentStart}-${fragmentEnd}` },
|
|
523
|
+
headers: { Range: `bytes=${fragmentStart}-${fragmentEnd - 1}` },
|
|
452
524
|
},
|
|
453
525
|
);
|
|
454
526
|
|
package/src/gui/ContextMixin.ts
CHANGED
|
@@ -136,18 +136,19 @@ export function ContextMixin<T extends Constructor<LitElement>>(superClass: T) {
|
|
|
136
136
|
const canvasHeight = canvasElement.clientHeight;
|
|
137
137
|
const stageRatio = stageWidth / stageHeight;
|
|
138
138
|
const canvasRatio = canvasWidth / canvasHeight;
|
|
139
|
+
|
|
139
140
|
if (stageRatio > canvasRatio) {
|
|
140
141
|
const scale = stageHeight / canvasHeight;
|
|
141
142
|
if (this.stageScale !== scale) {
|
|
142
143
|
canvasElement.style.transform = `scale(${scale})`;
|
|
143
|
-
canvasElement.style.transformOrigin = "
|
|
144
|
+
canvasElement.style.transformOrigin = "center left";
|
|
144
145
|
}
|
|
145
146
|
this.stageScale = scale;
|
|
146
147
|
} else {
|
|
147
148
|
const scale = stageWidth / canvasWidth;
|
|
148
149
|
if (this.stageScale !== scale) {
|
|
149
150
|
canvasElement.style.transform = `scale(${scale})`;
|
|
150
|
-
canvasElement.style.transformOrigin = "
|
|
151
|
+
canvasElement.style.transformOrigin = "center left";
|
|
151
152
|
}
|
|
152
153
|
this.stageScale = scale;
|
|
153
154
|
}
|
|
@@ -251,6 +252,14 @@ export function ContextMixin<T extends Constructor<LitElement>>(superClass: T) {
|
|
|
251
252
|
await timegroup.waitForMediaDurations();
|
|
252
253
|
|
|
253
254
|
let currentMs = timegroup.currentTimeMs;
|
|
255
|
+
const fromMs = currentMs;
|
|
256
|
+
const toMs = timegroup.endTimeMs;
|
|
257
|
+
|
|
258
|
+
if (fromMs >= toMs) {
|
|
259
|
+
this.pause();
|
|
260
|
+
return;
|
|
261
|
+
}
|
|
262
|
+
|
|
254
263
|
let bufferCount = 0;
|
|
255
264
|
this.#playbackAudioContext = new AudioContext({
|
|
256
265
|
latencyHint: "playback",
|
|
@@ -280,9 +289,6 @@ export function ContextMixin<T extends Constructor<LitElement>>(superClass: T) {
|
|
|
280
289
|
}
|
|
281
290
|
};
|
|
282
291
|
|
|
283
|
-
const fromMs = currentMs;
|
|
284
|
-
const toMs = timegroup.endTimeMs;
|
|
285
|
-
|
|
286
292
|
const queueBufferSource = async () => {
|
|
287
293
|
if (currentMs >= toMs) {
|
|
288
294
|
return false;
|
package/src/gui/EFPreview.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { LitElement,
|
|
1
|
+
import { LitElement, css, html } from "lit";
|
|
2
2
|
import { customElement } from "lit/decorators.js";
|
|
3
3
|
import { ref } from "lit/directives/ref.js";
|
|
4
4
|
|
|
5
|
-
import { TWMixin } from "./TWMixin.ts";
|
|
6
5
|
import { ContextMixin } from "./ContextMixin.ts";
|
|
6
|
+
import { TWMixin } from "./TWMixin.ts";
|
|
7
7
|
|
|
8
8
|
@customElement("ef-preview")
|
|
9
9
|
export class EFPreview extends ContextMixin(TWMixin(LitElement)) {
|
|
@@ -26,7 +26,9 @@ export class EFPreview extends ContextMixin(TWMixin(LitElement)) {
|
|
|
26
26
|
<slot
|
|
27
27
|
${ref(this.canvasRef)}
|
|
28
28
|
class="inline-block"
|
|
29
|
+
name="canvas"
|
|
29
30
|
></slot>
|
|
31
|
+
<slot name="controls"></slot>
|
|
30
32
|
</div>
|
|
31
33
|
`;
|
|
32
34
|
}
|
package/src/gui/EFTogglePlay.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { consume } from "@lit/context";
|
|
2
2
|
import { LitElement, css, html } from "lit";
|
|
3
|
-
import { customElement
|
|
3
|
+
import { customElement } from "lit/decorators.js";
|
|
4
4
|
|
|
5
5
|
import type { ContextMixinInterface } from "./ContextMixin.ts";
|
|
6
6
|
import { efContext } from "./efContext.ts";
|
|
@@ -23,12 +23,6 @@ export class EFTogglePlay extends LitElement {
|
|
|
23
23
|
@consume({ context: playingContext, subscribe: true })
|
|
24
24
|
playing = false;
|
|
25
25
|
|
|
26
|
-
@property({ type: String })
|
|
27
|
-
play = '<button class="text-2xl cursor-pointer">▶️</button>';
|
|
28
|
-
|
|
29
|
-
@property({ type: String })
|
|
30
|
-
pause = '<button class="text-2xl cursor-pointer">⏸️</button>';
|
|
31
|
-
|
|
32
26
|
render() {
|
|
33
27
|
return html`
|
|
34
28
|
<div
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import { EFTimegroup } from "./EFTimegroup.js";
|
|
2
|
-
const getStartTimeMs = (element) => {
|
|
3
|
-
const nearestTimeGroup = element.closest("ef-timegroup");
|
|
4
|
-
if (!(nearestTimeGroup instanceof EFTimegroup)) {
|
|
5
|
-
return 0;
|
|
6
|
-
}
|
|
7
|
-
return nearestTimeGroup.startTimeMs;
|
|
8
|
-
};
|
|
9
|
-
export {
|
|
10
|
-
getStartTimeMs
|
|
11
|
-
};
|