@editframe/elements 0.11.0-beta.14 → 0.11.0-beta.15

package/dist/elements/EFMedia.d.ts

@@ -16,7 +16,7 @@ export declare class EFMedia extends EFMedia_base {
     fragmentIndexPath(): string;
     fragmentTrackPath(trackId: string): string;
     trackFragmentIndexLoader: Task<readonly [string, typeof fetch], Record<number, TrackFragmentIndex>>;
-    protected initSegmentsLoader: Task<readonly [Record<number, TrackFragmentIndex> | undefined, string, typeof fetch], {
+    initSegmentsLoader: Task<readonly [Record<number, TrackFragmentIndex> | undefined, string, typeof fetch], {
         trackId: string;
         buffer: MP4Box.MP4ArrayBuffer;
         mp4File: MP4File;

package/dist/elements/EFTimegroup.d.ts

@@ -17,7 +17,17 @@ export declare class EFTimegroup extends EFTimegroup_base {
     connectedCallback(): void;
     get storageKey(): string;
     get durationMs(): number;
-    waitForMediaDurations(): Promise<Record<number, import('../../../assets/src/index.ts').TrackFragmentIndex>[]>;
+    /**
+     * Wait for all media elements to load their initial segments.
+     * Ideally we would only need the extracted index json data, but
+     * that caused issues with constructing audio data. We had negative durations
+     * in calculations and it was not clear why.
+     */
+    waitForMediaDurations(): Promise<({
+        trackId: string;
+        buffer: import('mp4box').MP4ArrayBuffer;
+        mp4File: import('../../../assets/src/MP4File.ts').MP4File;
+    }[] | undefined)[]>;
     get childTemporals(): import('./EFTemporal.ts').TemporalMixinInterface[];
     protected updated(changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void;
     get contextProvider(): (ParentNode & import('../gui/ContextMixin.ts').ContextMixinInterface) | null;

package/dist/elements/src/elements/EFTimegroup.js

@@ -139,10 +139,16 @@ let EFTimegroup = class extends EFTemporal(LitElement) {
         throw new Error(`Invalid time mode: ${this.mode}`);
     }
   }
+  /**
+   * Wait for all media elements to load their initial segments.
+   * Ideally we would only need the extracted index json data, but
+   * that caused issues with constructing audio data. We had negative durations
+   * in calculations and it was not clear why.
+   */
   async waitForMediaDurations() {
     return await Promise.all(
       deepGetMediaElements(this).map(
-        (media) => media.trackFragmentIndexLoader.taskComplete
+        (media) => media.initSegmentsLoader.taskComplete
       )
     );
   }
@@ -291,10 +297,8 @@ _currentTime = /* @__PURE__ */ new WeakMap();
 _EFTimegroup_instances = /* @__PURE__ */ new WeakSet();
 addAudioToContext_fn = async function(audioContext, fromMs, toMs) {
   await this.waitForMediaDurations();
-  const durationMs = toMs - fromMs;
   await Promise.all(
     deepGetMediaElements(this).map(async (mediaElement) => {
-      await mediaElement.trackFragmentIndexLoader.taskComplete;
       const mediaStartsBeforeEnd = mediaElement.startTimeMs <= toMs;
       const mediaEndsAfterStart = mediaElement.endTimeMs >= fromMs;
       const mediaOverlaps = mediaStartsBeforeEnd && mediaEndsAfterStart;
@@ -305,15 +309,15 @@ addAudioToContext_fn = async function(audioContext, fromMs, toMs) {
       if (!audio) {
         throw new Error("Failed to fetch audio");
       }
-      const ctxStartMs = Math.max(0, mediaElement.startTimeMs - fromMs);
-      const ctxEndMs = Math.min(durationMs, mediaElement.endTimeMs - fromMs);
-      const ctxDurationMs = ctxEndMs - ctxStartMs;
-      const offset = Math.max(0, fromMs - mediaElement.startTimeMs) - audio.startMs;
       const bufferSource = audioContext.createBufferSource();
       bufferSource.buffer = await audioContext.decodeAudioData(
         await audio.blob.arrayBuffer()
       );
       bufferSource.connect(audioContext.destination);
+      const ctxStartMs = Math.max(0, mediaElement.startTimeMs - fromMs);
+      const ctxEndMs = mediaElement.endTimeMs - fromMs;
+      const ctxDurationMs = ctxEndMs - ctxStartMs;
+      const offset = Math.max(0, fromMs - mediaElement.startTimeMs) - audio.startMs;
       bufferSource.start(
         ctxStartMs / 1e3,
         offset / 1e3,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@editframe/elements",
-  "version": "0.11.0-beta.14",
+  "version": "0.11.0-beta.15",
   "description": "",
   "exports": {
     ".": {
@@ -20,7 +20,7 @@
   "author": "",
   "license": "UNLICENSED",
   "dependencies": {
-    "@editframe/assets": "0.11.0-beta.14",
+    "@editframe/assets": "0.11.0-beta.15",
     "@lit/context": "^1.1.2",
     "@lit/task": "^1.0.1",
     "d3": "^7.9.0",

package/src/elements/EFMedia.ts

@@ -104,7 +104,7 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
     },
   });
 
-  protected initSegmentsLoader = new Task(this, {
+  public initSegmentsLoader = new Task(this, {
     autoRun: EF_INTERACTIVE,
     args: () =>
       [this.trackFragmentIndexLoader.value, this.src, this.fetch] as const,

package/src/elements/EFTimegroup.ts

@@ -152,10 +152,16 @@ export class EFTimegroup extends EFTemporal(LitElement) {
     }
   }
 
+  /**
+   * Wait for all media elements to load their initial segments.
+   * Ideally we would only need the extracted index json data, but
+   * that caused issues with constructing audio data. We had negative durations
+   * in calculations and it was not clear why.
+   */
   async waitForMediaDurations() {
     return await Promise.all(
       deepGetMediaElements(this).map(
-        (media) => media.trackFragmentIndexLoader.taskComplete,
+        (media) => media.initSegmentsLoader.taskComplete,
       ),
     );
   }
@@ -309,12 +315,8 @@ export class EFTimegroup extends EFTemporal(LitElement) {
   ) {
     await this.waitForMediaDurations();
 
-    const durationMs = toMs - fromMs;
-
     await Promise.all(
       deepGetMediaElements(this).map(async (mediaElement) => {
-        await mediaElement.trackFragmentIndexLoader.taskComplete;
-
         const mediaStartsBeforeEnd = mediaElement.startTimeMs <= toMs;
         const mediaEndsAfterStart = mediaElement.endTimeMs >= fromMs;
         const mediaOverlaps = mediaStartsBeforeEnd && mediaEndsAfterStart;
@@ -327,19 +329,19 @@ export class EFTimegroup extends EFTemporal(LitElement) {
           throw new Error("Failed to fetch audio");
         }
 
-        const ctxStartMs = Math.max(0, mediaElement.startTimeMs - fromMs);
-        const ctxEndMs = Math.min(durationMs, mediaElement.endTimeMs - fromMs);
-        const ctxDurationMs = ctxEndMs - ctxStartMs;
-
-        const offset =
-          Math.max(0, fromMs - mediaElement.startTimeMs) - audio.startMs;
-
         const bufferSource = audioContext.createBufferSource();
         bufferSource.buffer = await audioContext.decodeAudioData(
           await audio.blob.arrayBuffer(),
         );
         bufferSource.connect(audioContext.destination);
 
+        const ctxStartMs = Math.max(0, mediaElement.startTimeMs - fromMs);
+        const ctxEndMs = mediaElement.endTimeMs - fromMs;
+        const ctxDurationMs = ctxEndMs - ctxStartMs;
+
+        const offset =
+          Math.max(0, fromMs - mediaElement.startTimeMs) - audio.startMs;
+
         bufferSource.start(
           ctxStartMs / 1000,
           offset / 1000,