avbridge 2.10.0 → 2.12.0

package/dist/element-browser.js

@@ -29513,7 +29513,8 @@ async function prepareLibavInput(libav, filename, source, transport) {
   if (source.kind === "url") {
     const handle = await attachLibavHttpReader(libav, filename, source.url, {
       requestInit: transport?.requestInit,
-      fetchFn: transport?.fetchFn
+      fetchFn: transport?.fetchFn,
+      cacheBytes: transport?.cacheBytes
     });
     return {
       filename,
@@ -29575,7 +29576,9 @@ async function attachLibavHttpReader(libav, filename, url2, options = {}) {
   }
   await libav.mkblockreaderdev(filename, size);
   let detached = false;
-  let cached = null;
+  const cache2 = /* @__PURE__ */ new Map();
+  let cacheBytes = 0;
+  const cacheBudget = Math.max(0, options.cacheBytes ?? DEFAULT_CACHE_BYTES);
   let inflight = null;
   function clampReadLength(requested) {
     const doubled = requested * 2;
@@ -29583,14 +29586,33 @@ async function attachLibavHttpReader(libav, filename, url2, options = {}) {
     if (doubled > MAX_READ) return MAX_READ;
     return doubled;
   }
-  function cacheCovers(pos, length) {
-    if (!cached) return false;
-    return pos >= cached.pos && pos + length <= cached.pos + cached.bytes.byteLength;
+  function cacheLookup(pos, length) {
+    for (const [blockPos, bytes2] of cache2) {
+      if (pos >= blockPos && pos + length <= blockPos + bytes2.byteLength) {
+        cache2.delete(blockPos);
+        cache2.set(blockPos, bytes2);
+        const offset = pos - blockPos;
+        return bytes2.subarray(offset, offset + length);
+      }
+    }
+    return null;
   }
-  function sliceFromCache(pos, length) {
-    if (!cached) throw new Error("sliceFromCache called with no cache");
-    const offset = pos - cached.pos;
-    return cached.bytes.subarray(offset, offset + length);
+  function cacheInsert(pos, bytes2) {
+    const existing = cache2.get(pos);
+    if (existing) {
+      cacheBytes -= existing.byteLength;
+      cache2.delete(pos);
+    }
+    cache2.set(pos, bytes2);
+    cacheBytes += bytes2.byteLength;
+    while (cacheBytes > cacheBudget && cache2.size > 0) {
+      const oldestKey = cache2.keys().next().value;
+      if (oldestKey === void 0) break;
+      const oldest = cache2.get(oldestKey);
+      if (!oldest) break;
+      cache2.delete(oldestKey);
+      cacheBytes -= oldest.byteLength;
+    }
   }
   async function fetchRange(pos, length) {
     const end = Math.min(pos + length - 1, size - 1);
@@ -29607,7 +29629,7 @@ async function attachLibavHttpReader(libav, filename, url2, options = {}) {
       );
     }
     const buf = new Uint8Array(await res.arrayBuffer());
-    cached = { pos, bytes: buf };
+    cacheInsert(pos, buf);
     return buf;
   }
   async function handleRead(name, pos, length) {
@@ -29618,10 +29640,10 @@ async function attachLibavHttpReader(libav, filename, url2, options = {}) {
       }
     }
     if (detached) return;
-    if (cacheCovers(pos, length)) {
-      const data = sliceFromCache(pos, length);
+    const hit = cacheLookup(pos, length);
+    if (hit) {
       try {
-        await libav.ff_block_reader_dev_send(name, pos, data);
+        await libav.ff_block_reader_dev_send(name, pos, hit);
       } catch {
       }
       return;
@@ -29674,7 +29696,8 @@ async function attachLibavHttpReader(libav, filename, url2, options = {}) {
         } catch {
         }
       }
-      cached = null;
+      cache2.clear();
+      cacheBytes = 0;
       try {
         await libav.unlinkreadaheadfile(filename);
       } catch {
@@ -29682,11 +29705,12 @@ async function attachLibavHttpReader(libav, filename, url2, options = {}) {
     }
   };
 }
-var MIN_READ, MAX_READ;
+var MIN_READ, MAX_READ, DEFAULT_CACHE_BYTES;
 var init_libav_http_reader = __esm({
   "src/util/libav-http-reader.ts"() {
     MIN_READ = 256 * 1024;
     MAX_READ = 1 * 1024 * 1024;
+    DEFAULT_CACHE_BYTES = 8 * 1024 * 1024;
   }
 });
 
@@ -31144,6 +31168,7 @@ async function attachSubtitleTracks(video, tracks, bag, onError, transport) {
   }
   for (const t of tracks) {
     if (!t.sidecarUrl) continue;
+    console.log(`[avbridge:subs] attaching track id=${t.id} format=${t.format} url=${t.sidecarUrl.slice(0, 60)}`);
     try {
       let url2 = t.sidecarUrl;
       if (t.format === "srt") {
@@ -32952,6 +32977,10 @@ var AudioOutput = class {
     if (this.ctx.state === "suspended") {
       await this.ctx.resume();
     }
+    try {
+      this.gain.connect(this.ctx.destination);
+    } catch {
+    }
     if (this.state === "paused") {
       this.ctxTimeAtAnchor = this.ctx.currentTime;
       this.state = "playing";
@@ -32978,6 +33007,10 @@ var AudioOutput = class {
     this.mediaTimeOfAnchor = this.now();
     this.state = "paused";
     if (this.noAudio) return;
+    try {
+      this.gain.disconnect();
+    } catch {
+    }
     if (this.ctx.state === "running") {
       await this.ctx.suspend();
     }
@@ -34625,9 +34658,9 @@ var UnifiedPlayer = class _UnifiedPlayer {
   constructor(options, registry) {
     this.options = options;
     this.registry = registry;
-    const { requestInit, fetchFn } = options;
-    if (requestInit || fetchFn) {
-      this.transport = { requestInit, fetchFn };
+    const { requestInit, fetchFn, cacheBytes } = options;
+    if (requestInit || fetchFn || cacheBytes !== void 0) {
+      this.transport = { requestInit, fetchFn, cacheBytes };
     }
   }
   options;
@@ -35787,14 +35820,27 @@ var AvbridgeVideoElement = class extends HTMLElementCtor {
       sidecarUrl: subtitle.url
     };
     this._subtitleTracks.push(track);
+    console.log(`[avbridge:subs] addSubtitle id=${track.id} format=${format} lang=${subtitle.language ?? "?"}`);
     await attachSubtitleTracks2(
       this._videoEl,
       this._subtitleTracks,
       void 0,
       (err, t) => {
-        console.warn(`[avbridge] subtitle ${t.id} failed: ${err.message}`);
+        console.warn(`[avbridge:subs] subtitle ${t.id} failed: ${err.message}`);
       }
     );
+    const textTracks = this._videoEl.textTracks;
+    for (let i = 0; i < textTracks.length; i++) {
+      if (textTracks[i].label === (subtitle.language ?? `Subtitle ${track.id}`)) {
+        textTracks[i].mode = "showing";
+        console.log(`[avbridge:subs] enabled textTrack[${i}] mode=showing`);
+        break;
+      }
+    }
+    this._dispatch("trackschange", {
+      audioTracks: this._audioTracks,
+      subtitleTracks: this.subtitleTracks
+    });
   }
   /**
    * Disable the automatic `screen.orientation.lock()` that runs on