@meframe/core 0.0.29 → 0.0.30

package/dist/orchestrator/ExportScheduler.js

@@ -0,0 +1,241 @@
+import { VideoClipSession } from "./VideoClipSession.js";
+import { hasResourceId } from "../model/types.js";
+import { MeframeEvent } from "../event/events.js";
+class ExportScheduler {
+  deps;
+  constructor(deps) {
+    this.deps = deps;
+  }
+  async execute(model, options) {
+    const { muxManager, audioSession, resourceLoader, eventBus } = this.deps;
+    const signal = options.signal;
+    const controller = options.controller;
+    const checkStatus = async () => {
+      if (signal?.aborted) {
+        throw new DOMException("Export aborted", "AbortError");
+      }
+      if (controller?.isPaused()) {
+        while (controller.isPaused()) {
+          if (signal?.aborted) throw new DOMException("Export aborted", "AbortError");
+          await new Promise((resolve) => setTimeout(resolve, 100));
+        }
+      }
+    };
+    const width = options.width || model.renderConfig?.width || 720;
+    const height = options.height || model.renderConfig?.height || 1280;
+    const fps = options.fps || model.fps || 30;
+    eventBus.emit(MeframeEvent.ExportStart, {
+      format: options.format || "mp4",
+      width,
+      height,
+      fps,
+      durationUs: model.durationUs
+    });
+    try {
+      muxManager.start({
+        width,
+        height,
+        fps
+      });
+      for (const track of model.tracks) {
+        if (track.kind === "audio") {
+          for (const clip of track.clips) {
+            if (hasResourceId(clip)) {
+              resourceLoader.fetch(clip.resourceId, {
+                priority: "high",
+                clipId: clip.id,
+                trackId: clip.trackId
+              });
+            }
+          }
+        }
+      }
+      const videoTrack = model.tracks.find((t) => t.kind === "video");
+      if (videoTrack && videoTrack.clips.length > 0) {
+        await this.processVideoClipsSequentially(
+          videoTrack.clips,
+          muxManager,
+          model,
+          checkStatus,
+          audioSession
+        );
+      } else {
+        console.warn("[ExportScheduler] No video clips found");
+      }
+      await audioSession.finalizeExportAudio();
+      if (signal?.aborted) {
+        throw new DOMException("Export aborted", "AbortError");
+      }
+      const blob = await muxManager.finalize();
+      eventBus.emit(MeframeEvent.ExportComplete, {
+        size: blob.size,
+        durationMs: model.durationUs / 1e3,
+        format: options.format || "mp4"
+      });
+      return blob;
+    } catch (error) {
+      eventBus.emit(MeframeEvent.ExportError, {
+        error: error instanceof Error ? error : new Error(String(error)),
+        stage: "export"
+      });
+      throw error;
+    }
+  }
+  async processVideoClipsSequentially(clips, muxManager, model, checkStatus, audioSession) {
+    let accumulatedDurationUs = 0;
+    for (let i = 0; i < clips.length; i++) {
+      const clip = clips[i];
+      const nextClip = clips[i + 1];
+      await checkStatus();
+      if (nextClip && hasResourceId(nextClip)) {
+        this.deps.resourceLoader.fetch(nextClip.resourceId, {
+          priority: "normal",
+          clipId: nextClip.id,
+          trackId: nextClip.trackId,
+          isMainTrack: true
+        });
+      }
+      const sessionId = `${clip.id}-export`;
+      let streamFinishedResolver;
+      let streamFinishedRejecter;
+      const streamFinishedPromise = new Promise((resolve, reject) => {
+        streamFinishedResolver = resolve;
+        streamFinishedRejecter = reject;
+      });
+      let audioFinishedResolver;
+      const audioFinishedPromise = new Promise((resolve) => {
+        audioFinishedResolver = resolve;
+      });
+      let audioStreamStarted = false;
+      const session = await VideoClipSession.create({
+        clipId: clip.id,
+        sessionId,
+        forL2Only: true,
+        planner: this.deps.planner,
+        workerPool: this.deps.workerPool,
+        cacheManager: this.deps.cacheManager,
+        compositionModel: model,
+        workerConfigs: this.deps.workerConfigsProvider(),
+        callbacks: {
+          onComposedStreamReady: async () => {
+          },
+          onEncodedStreamReady: async (stream, track) => {
+            if (track === "video") {
+              const reader = stream.getReader();
+              try {
+                while (true) {
+                  await checkStatus();
+                  const { done, value } = await reader.read();
+                  if (done) break;
+                  if (value) {
+                    const originalChunk = value.chunk;
+                    const metadata = value.metadata;
+                    const buffer = new ArrayBuffer(originalChunk.byteLength);
+                    originalChunk.copyTo(buffer);
+                    const remappedChunk = new EncodedVideoChunk({
+                      type: originalChunk.type,
+                      timestamp: originalChunk.timestamp + accumulatedDurationUs,
+                      duration: originalChunk.duration ?? void 0,
+                      data: buffer
+                    });
+                    muxManager.writeVideoChunk(remappedChunk, metadata);
+                    const progress = Math.min(
+                      1,
+                      (accumulatedDurationUs + originalChunk.timestamp) / model.durationUs
+                    );
+                    this.deps.eventBus.emit(MeframeEvent.ExportProgress, {
+                      progress,
+                      stage: "muxing",
+                      timeUs: accumulatedDurationUs + originalChunk.timestamp
+                    });
+                  }
+                }
+                streamFinishedResolver();
+              } catch (error) {
+                if (error instanceof DOMException && error.name === "AbortError") {
+                  streamFinishedRejecter(error);
+                } else {
+                  console.error(`[ExportScheduler] Stream error for clip ${clip.id}:`, error);
+                  streamFinishedRejecter(error);
+                }
+              } finally {
+                reader.releaseLock();
+              }
+            }
+          },
+          onAudioStreamReady: (stream, metadata) => {
+            audioStreamStarted = true;
+            const reader = stream.getReader();
+            const pump = async () => {
+              try {
+                while (true) {
+                  const { done, value } = await reader.read();
+                  if (done) break;
+                  if (value) {
+                    this.deps.cacheManager.putClipAudioData(
+                      clip.id,
+                      // Use clip.id, NOT sessionId (which is clipId-export)
+                      value,
+                      metadata.clipDurationUs
+                    );
+                  }
+                }
+              } catch (e) {
+                console.error("[ExportScheduler] Audio stream error", e);
+              } finally {
+                reader.releaseLock();
+                audioFinishedResolver();
+              }
+            };
+            pump();
+          },
+          onPipelineReady: async (attachmentResourceIds) => {
+            if (hasResourceId(clip)) {
+              await this.deps.resourceLoader.fetch(clip.resourceId, {
+                priority: "high",
+                sessionId,
+                clipId: clip.id,
+                trackId: clip.trackId,
+                isMainTrack: true
+              });
+            }
+            if (attachmentResourceIds) {
+              for (const rid of attachmentResourceIds) {
+                await this.deps.resourceLoader.fetch(rid, {
+                  priority: "normal",
+                  sessionId,
+                  clipId: clip.id,
+                  isMainTrack: false
+                });
+              }
+            }
+          }
+        }
+      });
+      try {
+        await session.activate();
+        await streamFinishedPromise;
+        if (audioStreamStarted) {
+          await Promise.race([
+            audioFinishedPromise,
+            new Promise((resolve) => setTimeout(resolve, 5e3))
+            // 5s timeout for audio tail
+          ]);
+        } else {
+        }
+        await audioSession.mixAndEncodeSegment(
+          accumulatedDurationUs,
+          accumulatedDurationUs + clip.durationUs,
+          (chunk, meta) => muxManager.writeAudioChunk(chunk, meta)
+        );
+      } finally {
+        await session.dispose();
+      }
+      accumulatedDurationUs += clip.durationUs;
+    }
+  }
+}
+export {
+  ExportScheduler
+};
+//# sourceMappingURL=ExportScheduler.js.map

package/dist/orchestrator/ExportScheduler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExportScheduler.js","sources":["../../src/orchestrator/ExportScheduler.ts"],"sourcesContent":["import { CompositionModel } from '../model';\nimport { ExportOptions } from '../types';\nimport { WorkerPool } from '../worker/WorkerPool';\nimport { CompositionPlanner } from './CompositionPlanner';\nimport { CacheManager } from '../cache/CacheManager';\nimport { ResourceLoader } from '../stages/load/ResourceLoader';\nimport { MuxManager } from '../stages/mux/MuxManager';\nimport { GlobalAudioSession } from './GlobalAudioSession';\nimport { VideoClipSession } from './VideoClipSession';\nimport { WorkerType } from '../worker/types';\nimport { hasResourceId } from '../model/types';\nimport type { ExportController } from '../controllers/ExportController';\nimport { EventBus } from '../event/EventBus';\nimport { MeframeEvent, EventPayloadMap } from '../event/events';\n\ninterface ExportSchedulerDeps {\n  workerPool: WorkerPool;\n  planner: CompositionPlanner;\n  cacheManager: CacheManager;\n  resourceLoader: ResourceLoader;\n  muxManager: MuxManager;\n  audioSession: GlobalAudioSession;\n  workerConfigsProvider: () => Record<WorkerType, any>;\n  eventBus: EventBus<EventPayloadMap>;\n}\n\ninterface ExtendedExportOptions extends ExportOptions {\n  signal?: AbortSignal;\n  controller?: ExportController;\n}\n\nexport class ExportScheduler {\n  private deps: ExportSchedulerDeps;\n\n  constructor(deps: ExportSchedulerDeps) {\n    this.deps = deps;\n  }\n\n  async execute(model: CompositionModel, options: ExtendedExportOptions): Promise<Blob> {\n    const { muxManager, audioSession, resourceLoader, eventBus } = this.deps;\n    const signal = options.signal;\n    const controller = options.controller;\n\n    const checkStatus = async () => {\n      if (signal?.aborted) {\n        throw new DOMException('Export aborted', 'AbortError');\n      }\n      if (controller?.isPaused()) {\n        // Wait until resumed\n        while (controller.isPaused()) {\n          if (signal?.aborted) throw new DOMException('Export aborted', 'AbortError');\n          await new Promise((resolve) => setTimeout(resolve, 100));\n        }\n      }\n    };\n\n    const width = options.width || model.renderConfig?.width || 720;\n    const height = options.height || model.renderConfig?.height || 1280;\n    const fps = options.fps || model.fps || 30;\n\n    eventBus.emit(MeframeEvent.ExportStart, {\n      format: options.format || 'mp4',\n      width,\n      height,\n      fps,\n      durationUs: model.durationUs,\n    });\n\n    try {\n      // 1. Start Muxer\n      muxManager.start({\n        width,\n        height,\n        fps,\n      });\n\n      // 2. Preload Audio Tracks (BGM/Speech)\n      // Identify pure audio clips and start downloading them immediately\n      // This ensures BGM is ready when we need to mix it with video clips\n      for (const track of model.tracks) {\n        if (track.kind === 'audio') {\n          for (const clip of track.clips) {\n            if (hasResourceId(clip)) {\n              // Fire and forget - we don't await here, let them download in background\n              // GlobalAudioSession will wait for them if needed during mixing\n              resourceLoader.fetch(clip.resourceId, {\n                priority: 'high',\n                clipId: clip.id,\n                trackId: clip.trackId,\n              });\n            }\n          }\n        }\n      }\n\n      // 3. Process Video Clips (Sequential) and Audio (Interleaved)\n      const videoTrack = model.tracks.find((t) => t.kind === 'video');\n      if (videoTrack && videoTrack.clips.length > 0) {\n        await this.processVideoClipsSequentially(\n          videoTrack.clips,\n          muxManager,\n          model,\n          checkStatus,\n          audioSession\n        );\n      } else {\n        console.warn('[ExportScheduler] No video clips found');\n      }\n\n      // Finalize audio session (close encoder)\n      await audioSession.finalizeExportAudio();\n\n      if (signal?.aborted) {\n        throw new DOMException('Export aborted', 'AbortError');\n      }\n\n      // 4. Finalize\n      const blob = await muxManager.finalize();\n\n      eventBus.emit(MeframeEvent.ExportComplete, {\n        size: blob.size,\n        durationMs: model.durationUs / 1000,\n        format: options.format || 'mp4',\n      });\n\n      return blob;\n    } catch (error) {\n      eventBus.emit(MeframeEvent.ExportError, {\n        error: error instanceof Error ? error : new Error(String(error)),\n        stage: 'export',\n      });\n      throw error;\n    }\n  }\n\n  private async processVideoClipsSequentially(\n    clips: any[],\n    muxManager: MuxManager,\n    model: CompositionModel,\n    checkStatus: () => Promise<void>,\n    audioSession: GlobalAudioSession\n  ) {\n    let accumulatedDurationUs = 0;\n\n    for (let i = 0; i < clips.length; i++) {\n      const clip = clips[i];\n      const nextClip = clips[i + 1];\n\n      await checkStatus(); // Check before starting new clip\n\n      // --- Preload Next Clip ---\n      // Start downloading next clip's resource while current clip is processing\n      if (nextClip && hasResourceId(nextClip)) {\n        // Fire and forget - ResourceLoader handles deduping\n        this.deps.resourceLoader.fetch(nextClip.resourceId, {\n          priority: 'normal',\n          clipId: nextClip.id,\n          trackId: nextClip.trackId,\n          isMainTrack: true,\n        });\n      }\n      // -------------------------\n\n      const sessionId = `${clip.id}-export`;\n      let streamFinishedResolver: () => void;\n      let streamFinishedRejecter: (err: any) => void;\n      const streamFinishedPromise = new Promise<void>((resolve, reject) => {\n        streamFinishedResolver = resolve;\n        streamFinishedRejecter = reject;\n      });\n\n      let audioFinishedResolver: () => void;\n      const audioFinishedPromise = new Promise<void>((resolve) => {\n        audioFinishedResolver = resolve;\n      });\n      let audioStreamStarted = false;\n\n      const session = await VideoClipSession.create({\n        clipId: clip.id,\n        sessionId,\n        forL2Only: true,\n        planner: this.deps.planner,\n        workerPool: this.deps.workerPool,\n        cacheManager: this.deps.cacheManager,\n        compositionModel: model,\n        workerConfigs: this.deps.workerConfigsProvider(),\n        callbacks: {\n          onComposedStreamReady: async () => {},\n          onEncodedStreamReady: async (stream, track) => {\n            if (track === 'video') {\n              const reader = stream.getReader();\n              try {\n                while (true) {\n                  await checkStatus();\n\n                  const { done, value } = await reader.read();\n                  if (done) break;\n                  if (value) {\n                    const originalChunk = value.chunk;\n                    const metadata = value.metadata;\n\n                    const buffer = new ArrayBuffer(originalChunk.byteLength);\n                    originalChunk.copyTo(buffer);\n\n                    const remappedChunk = new EncodedVideoChunk({\n                      type: originalChunk.type,\n                      timestamp: originalChunk.timestamp + accumulatedDurationUs,\n                      duration: originalChunk.duration ?? undefined,\n                      data: buffer,\n                    });\n\n                    muxManager.writeVideoChunk(remappedChunk, metadata);\n\n                    // Emit progress\n                    const progress = Math.min(\n                      1.0,\n                      (accumulatedDurationUs + originalChunk.timestamp) / model.durationUs\n                    );\n                    this.deps.eventBus.emit(MeframeEvent.ExportProgress, {\n                      progress,\n                      stage: 'muxing',\n                      timeUs: accumulatedDurationUs + originalChunk.timestamp,\n                    });\n                  }\n                }\n                streamFinishedResolver();\n              } catch (error) {\n                if (error instanceof DOMException && error.name === 'AbortError') {\n                  streamFinishedRejecter(error);\n                } else {\n                  console.error(`[ExportScheduler] Stream error for clip ${clip.id}:`, error);\n                  streamFinishedRejecter(error);\n                }\n              } finally {\n                reader.releaseLock();\n              }\n            }\n          },\n          onAudioStreamReady: (stream, metadata) => {\n            audioStreamStarted = true;\n            // Handle audio stream from VideoClipSession (AudioDecodeWorker)\n            const reader = stream.getReader();\n            const pump = async () => {\n              try {\n                while (true) {\n                  const { done, value } = await reader.read();\n                  if (done) break;\n                  if (value) {\n                    // Put into CacheManager immediately so GlobalAudioSession can find it\n                    // Use clipId as sessionId because GlobalAudioSession expects that\n                    this.deps.cacheManager.putClipAudioData(\n                      clip.id, // Use clip.id, NOT sessionId (which is clipId-export)\n                      value,\n                      metadata.clipDurationUs\n                    );\n                  }\n                }\n              } catch (e) {\n                console.error('[ExportScheduler] Audio stream error', e);\n              } finally {\n                reader.releaseLock();\n                audioFinishedResolver(); // Signal audio stream completion\n              }\n            };\n            pump();\n          },\n          onPipelineReady: async (attachmentResourceIds) => {\n            // Load Main Track Resource\n            if (hasResourceId(clip)) {\n              await this.deps.resourceLoader.fetch(clip.resourceId, {\n                priority: 'high',\n                sessionId,\n                clipId: clip.id,\n                trackId: clip.trackId,\n                isMainTrack: true,\n              });\n            }\n\n            // Load Attachment Resources\n            if (attachmentResourceIds) {\n              for (const rid of attachmentResourceIds) {\n                await this.deps.resourceLoader.fetch(rid, {\n                  priority: 'normal',\n                  sessionId,\n                  clipId: clip.id,\n                  isMainTrack: false,\n                });\n              }\n            }\n          },\n        },\n      });\n\n      try {\n        await session.activate();\n\n        await streamFinishedPromise;\n\n        // If audio stream started, we wait for it to finish.\n        // This ensures we capture the tail of the audio.\n        if (audioStreamStarted) {\n          // Use a race with timeout to prevent hanging indefinitely if audio stream is stuck\n          await Promise.race([\n            audioFinishedPromise,\n            new Promise((resolve) => setTimeout(resolve, 5000)), // 5s timeout for audio tail\n          ]);\n        } else {\n          // If audio didn't start, maybe it's a silent clip, or audio init failed.\n          // We just proceed.\n        }\n\n        // Mix and encode audio for this segment\n        await audioSession.mixAndEncodeSegment(\n          accumulatedDurationUs,\n          accumulatedDurationUs + clip.durationUs,\n          (chunk, meta) => muxManager.writeAudioChunk(chunk, meta)\n        );\n      } finally {\n        await session.dispose();\n      }\n\n      accumulatedDurationUs += clip.durationUs;\n    }\n  }\n}\n"],"names":[],"mappings":";;;AA+BO,MAAM,gBAAgB;AAAA,EACnB;AAAA,EAER,YAAY,MAA2B;AACrC,SAAK,OAAO;AAAA,EACd;AAAA,EAEA,MAAM,QAAQ,OAAyB,SAA+C;AACpF,UAAM,EAAE,YAAY,cAAc,gBAAgB,SAAA,IAAa,KAAK;AACpE,UAAM,SAAS,QAAQ;AACvB,UAAM,aAAa,QAAQ;AAE3B,UAAM,cAAc,YAAY;AAC9B,UAAI,QAAQ,SAAS;AACnB,cAAM,IAAI,aAAa,kBAAkB,YAAY;AAAA,MACvD;AACA,UAAI,YAAY,YAAY;AAE1B,eAAO,WAAW,YAAY;AAC5B,cAAI,QAAQ,QAAS,OAAM,IAAI,aAAa,kBAAkB,YAAY;AAC1E,gBAAM,IAAI,QAAQ,CAAC,YAAY,WAAW,SAAS,GAAG,CAAC;AAAA,QACzD;AAAA,MACF;AAAA,IACF;AAEA,UAAM,QAAQ,QAAQ,SAAS,MAAM,cAAc,SAAS;AAC5D,UAAM,SAAS,QAAQ,UAAU,MAAM,cAAc,UAAU;AAC/D,UAAM,MAAM,QAAQ,OAAO,MAAM,OAAO;AAExC,aAAS,KAAK,aAAa,aAAa;AAAA,MACtC,QAAQ,QAAQ,UAAU;AAAA,MAC1B;AAAA,MACA;AAAA,MACA;AAAA,MACA,YAAY,MAAM;AAAA,IAAA,CACnB;AAED,QAAI;AAEF,iBAAW,MAAM;AAAA,QACf;AAAA,QACA;AAAA,QACA;AAAA,MAAA,CACD;AAKD,iBAAW,SAAS,MAAM,QAAQ;AAChC,YAAI,MAAM,SAAS,SAAS;AAC1B,qBAAW,QAAQ,MAAM,OAAO;AAC9B,gBAAI,cAAc,IAAI,GAAG;AAGvB,6BAAe,MAAM,KAAK,YAAY;AAAA,gBACpC,UAAU;AAAA,gBACV,QAAQ,KAAK;AAAA,gBACb,SAAS,KAAK;AAAA,cAAA,CACf;AAAA,YACH;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAGA,YAAM,aAAa,MAAM,OAAO,KAAK,CAAC,MAAM,EAAE,SAAS,OAAO;AAC9D,UAAI,cAAc,WAAW,MAAM,SAAS,GAAG;AAC7C,cAAM,KAAK;AAAA,UACT,WAAW;AAAA,UACX;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ,OAAO;AACL,gBAAQ,KAAK,wCAAwC;AAAA,MACvD;AAGA,YAAM,aAAa,oBAAA;AAEnB,UAAI,QAAQ,SAAS;AACnB,cAAM,IAAI,aAAa,kBAAkB,YAAY;AAAA,MACvD;AAGA,YAAM,OAAO,MAAM,WAAW,SAAA;AAE9B,eAAS,KAAK,aAAa,gBAAgB;AAAA,QACzC,MAAM,KAAK;AAAA,QACX,YAAY,MAAM,aAAa;AAAA,QAC/B,QAAQ,QAAQ,UAAU;AAAA,MAAA,CAC3B;AAED,aAAO;AAAA,IACT,SAAS,OAAO;AACd,eAAS,KAAK,aAAa,aAAa;AAAA,QACtC,OAAO,iBAAiB,QAAQ,QAAQ,IAAI,MAAM,OAAO,KAAK,CAAC;AAAA,QAC/D,OAAO;AAAA,MAAA,CACR;AACD,YAAM;AAAA,IACR;AAAA,EACF;AAAA,EAEA,MAAc,8BACZ,OACA,YACA,OACA,aACA,cACA;AACA,QAAI,wBAAwB;AAE5B,aAAS,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;AACrC,YAAM,OAAO,MAAM,CAAC;AACpB,YAAM,WAAW,MAAM,IAAI,CAAC;AAE5B,YAAM,YAAA;AAIN,UAAI,YAAY,cAAc,QAAQ,GAAG;AAEvC,aAAK,KAAK,eAAe,MAAM,SAAS,YAAY;AAAA,UAClD,UAAU;AAAA,UACV,QAAQ,SAAS;AAAA,UACjB,SAAS,SAAS;AAAA,UAClB,aAAa;AAAA,QAAA,CACd;AAAA,MACH;AAGA,YAAM,YAAY,GAAG,KAAK,EAAE;AAC5B,UAAI;AACJ,UAAI;AACJ,YAAM,wBAAwB,IAAI,QAAc,CAAC,SAAS,WAAW;AACnE,iCAAyB;AACzB,iCAAyB;AAAA,MAC3B,CAAC;AAED,UAAI;AACJ,YAAM,uBAAuB,IAAI,QAAc,CAAC,YAAY;AAC1D,gCAAwB;AAAA,MAC1B,CAAC;AACD,UAAI,qBAAqB;AAEzB,YAAM,UAAU,MAAM,iBAAiB,OAAO;AAAA,QAC5C,QAAQ,KAAK;AAAA,QACb;AAAA,QACA,WAAW;AAAA,QACX,SAAS,KAAK,KAAK;AAAA,QACnB,YAAY,KAAK,KAAK;AAAA,QACtB,cAAc,KAAK,KAAK;AAAA,QACxB,kBAAkB;AAAA,QAClB,eAAe,KAAK,KAAK,sBAAA;AAAA,QACzB,WAAW;AAAA,UACT,uBAAuB,YAAY;AAAA,UAAC;AAAA,UACpC,sBAAsB,OAAO,QAAQ,UAAU;AAC7C,gBAAI,UAAU,SAAS;AACrB,oBAAM,SAAS,OAAO,UAAA;AACtB,kBAAI;AACF,uBAAO,MAAM;AACX,wBAAM,YAAA;AAEN,wBAAM,EAAE,MAAM,MAAA,IAAU,MAAM,OAAO,KAAA;AACrC,sBAAI,KAAM;AACV,sBAAI,OAAO;AACT,0BAAM,gBAAgB,MAAM;AAC5B,0BAAM,WAAW,MAAM;AAEvB,0BAAM,SAAS,IAAI,YAAY,cAAc,UAAU;AACvD,kCAAc,OAAO,MAAM;AAE3B,0BAAM,gBAAgB,IAAI,kBAAkB;AAAA,sBAC1C,MAAM,cAAc;AAAA,sBACpB,WAAW,cAAc,YAAY;AAAA,sBACrC,UAAU,cAAc,YAAY;AAAA,sBACpC,MAAM;AAAA,oBAAA,CACP;AAED,+BAAW,gBAAgB,eAAe,QAAQ;AAGlD,0BAAM,WAAW,KAAK;AAAA,sBACpB;AAAA,uBACC,wBAAwB,cAAc,aAAa,MAAM;AAAA,oBAAA;AAE5D,yBAAK,KAAK,SAAS,KAAK,aAAa,gBAAgB;AAAA,sBACnD;AAAA,sBACA,OAAO;AAAA,sBACP,QAAQ,wBAAwB,cAAc;AAAA,oBAAA,CAC/C;AAAA,kBACH;AAAA,gBACF;AACA,uCAAA;AAAA,cACF,SAAS,OAAO;AACd,oBAAI,iBAAiB,gBAAgB,MAAM,SAAS,cAAc;AAChE,yCAAuB,KAAK;AAAA,gBAC9B,OAAO;AACL,0BAAQ,MAAM,2CAA2C,KAAK,EAAE,KAAK,KAAK;AAC1E,yCAAuB,KAAK;AAAA,gBAC9B;AAAA,cACF,UAAA;AACE,uBAAO,YAAA;AAAA,cACT;AAAA,YACF;AAAA,UACF;AAAA,UACA,oBAAoB,CAAC,QAAQ,aAAa;AACxC,iCAAqB;AAErB,kBAAM,SAAS,OAAO,UAAA;AACtB,kBAAM,OAAO,YAAY;AACvB,kBAAI;AACF,uBAAO,MAAM;AACX,wBAAM,EAAE,MAAM,MAAA,IAAU,MAAM,OAAO,KAAA;AACrC,sBAAI,KAAM;AACV,sBAAI,OAAO;AAGT,yBAAK,KAAK,aAAa;AAAA,sBACrB,KAAK;AAAA;AAAA,sBACL;AAAA,sBACA,SAAS;AAAA,oBAAA;AAAA,kBAEb;AAAA,gBACF;AAAA,cACF,SAAS,GAAG;AACV,wBAAQ,MAAM,wCAAwC,CAAC;AAAA,cACzD,UAAA;AACE,uBAAO,YAAA;AACP,sCAAA;AAAA,cACF;AAAA,YACF;AACA,iBAAA;AAAA,UACF;AAAA,UACA,iBAAiB,OAAO,0BAA0B;AAEhD,gBAAI,cAAc,IAAI,GAAG;AACvB,oBAAM,KAAK,KAAK,eAAe,MAAM,KAAK,YAAY;AAAA,gBACpD,UAAU;AAAA,gBACV;AAAA,gBACA,QAAQ,KAAK;AAAA,gBACb,SAAS,KAAK;AAAA,gBACd,aAAa;AAAA,cAAA,CACd;AAAA,YACH;AAGA,gBAAI,uBAAuB;AACzB,yBAAW,OAAO,uBAAuB;AACvC,sBAAM,KAAK,KAAK,eAAe,MAAM,KAAK;AAAA,kBACxC,UAAU;AAAA,kBACV;AAAA,kBACA,QAAQ,KAAK;AAAA,kBACb,aAAa;AAAA,gBAAA,CACd;AAAA,cACH;AAAA,YACF;AAAA,UACF;AAAA,QAAA;AAAA,MACF,CACD;AAED,UAAI;AACF,cAAM,QAAQ,SAAA;AAEd,cAAM;AAIN,YAAI,oBAAoB;AAEtB,gBAAM,QAAQ,KAAK;AAAA,YACjB;AAAA,YACA,IAAI,QAAQ,CAAC,YAAY,WAAW,SAAS,GAAI,CAAC;AAAA;AAAA,UAAA,CACnD;AAAA,QACH,OAAO;AAAA,QAGP;AAGA,cAAM,aAAa;AAAA,UACjB;AAAA,UACA,wBAAwB,KAAK;AAAA,UAC7B,CAAC,OAAO,SAAS,WAAW,gBAAgB,OAAO,IAAI;AAAA,QAAA;AAAA,MAE3D,UAAA;AACE,cAAM,QAAQ,QAAA;AAAA,MAChB;AAEA,+BAAyB,KAAK;AAAA,IAChC;AAAA,EACF;AACF;"}

package/dist/orchestrator/GlobalAudioSession.d.ts

@@ -14,10 +14,9 @@ interface AudioDataMessage {
 }
 interface AudioSessionDeps {
     cacheManager: CacheManager;
-    workers: WorkerPool;
+    workerPool: WorkerPool;
     resourceLoader: ResourceLoader;
     eventBus: EventBus<EventPayloadMap>;
-    getModel: () => CompositionModel | null;
     buildWorkerConfigs: () => any;
 }
 export declare class GlobalAudioSession {
@@ -25,6 +24,7 @@ export declare class GlobalAudioSession {
     private activeClips;
     private streamEndedClips;
     private deps;
+    private model;
     private audioContext;
     private audioSources;
     private audioGainNodes;
@@ -32,9 +32,11 @@ export declare class GlobalAudioSession {
     private playbackRate;
     private isPlaying;
     private currentPlaybackTimeUs;
-    private ensuringFromL2;
+    private ensuringClips;
     constructor(deps: AudioSessionDeps);
+    setModel(model: CompositionModel): void;
     onAudioData(message: AudioDataMessage): void;
+    ensureAudioForTime(timeUs: TimeUs): Promise<void>;
     activateAllAudioClips(): Promise<void>;
     deactivateClip(clipId: string): Promise<void>;
     restartPlayingClip(clipId: string, currentTimeUs?: TimeUs): void;
@@ -47,9 +49,14 @@ export declare class GlobalAudioSession {
     setPlaybackRate(rate: number): void;
     reset(): void;
     /**
-     * Create export encoded audio stream
+     * Mix and encode audio for a specific segment (used by ExportScheduler)
      */
-    createExportEncodedStream(config?: Partial<AudioEncoderConfig>, onFirstMetadata?: (metadata: EncodedAudioChunkMetadata) => void): Promise<ReadableStream<EncodedAudioChunk> | null>;
+    mixAndEncodeSegment(startUs: TimeUs, endUs: TimeUs, onChunk: (chunk: EncodedAudioChunk, metadata?: EncodedAudioChunkMetadata) => void): Promise<void>;
+    private exportEncoder;
+    private exportEncoderStream;
+    private exportEncoderWriter;
+    private startExportEncoderReader;
+    finalizeExportAudio(): Promise<void>;
     /**
      * Create export audio stream
      */
@@ -59,14 +66,22 @@ export declare class GlobalAudioSession {
     private startAllActiveClips;
     private checkAndStartNewClips;
     private startClipPlayback;
-    private continueClipPlayback;
     private stopAllAudioSources;
     private getActiveAudioClips;
     /**
-     * Ensure PCM for a clip is available by decoding from L2 encoded audio
-     * No-op if PCM already exists or L2 lacks audio
+     * Ensure PCM for a clip is available
+     * Priority: AudioSampleCache (Resource) > L2 > None
      */
-    ensureClipAudioFromL2(clipId: string): Promise<void>;
+    ensureClipAudio(clipId: string): Promise<void>;
+    /**
+     * Ensure PCM from AudioSampleCache (Resource-level)
+     * Returns true if successful
+     */
+    private ensureClipAudioFromResource;
+    /**
+     * Decode audio samples to PCM and cache
+     */
+    private decodeAudioSamples;
     private pcmToAudioBuffer;
     private audioBufferToAudioData;
     private interleavePlanarData;

package/dist/orchestrator/GlobalAudioSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GlobalAudioSession.d.ts","sourceRoot":"","sources":["../../src/orchestrator/GlobalAudioSession.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GlobalAudioSession.d.ts","sourceRoot":"","sources":["../../src/orchestrator/GlobalAudioSession.ts"],"names":[],"mappings":"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"}