@geekapps/silo-elements-nextjs 0.3.21 → 0.3.23

package/dist/VideoPlayer.js

@@ -20,9 +20,8 @@ function deviceSupportsHdr() {
 function deviceSupportsOpus() {
   if (typeof window === "undefined") return false;
   try {
-    if (typeof MediaSource !== "undefined" && MediaSource.isTypeSupported) {
-      if (MediaSource.isTypeSupported('audio/mp4; codecs="opus"')) return true;
-    }
+    if (typeof MediaSource !== "undefined" && MediaSource.isTypeSupported)
+      return MediaSource.isTypeSupported('audio/mp4; codecs="opus"');
     const a = document.createElement("audio");
     return a.canPlayType('audio/ogg; codecs="opus"') !== "" || a.canPlayType('video/mp4; codecs="opus"') !== "";
   } catch {
@@ -873,6 +872,22 @@ function Video({
           const Hls = HlsModule.default;
           console.debug("[Silo/hls] Hls.isSupported()=", Hls.isSupported());
           if (Hls.isSupported()) {
+            let tryNextAudioTrack2 = function() {
+              const next = mappedAudioTracks.find((t) => t.supported && !failedAudioTracks.has(t.id));
+              if (next) {
+                console.debug("[Silo/hls] trying audio track", next.id, next.codec || "(unknown codec)");
+                hls.audioTrack = next.id;
+                if (pinnedAudio === -1) setSelectedAudio(next.id);
+              } else {
+                console.warn("[Silo/hls] all audio tracks failed \u2014 disabling demuxed audio");
+                setAudioTracks([]);
+                try {
+                  hls.audioTrack = -1;
+                } catch {
+                }
+              }
+            };
+            var tryNextAudioTrack = tryNextAudioTrack2;
             const hls = new Hls({
               enableWorker: true,
               // Buffer ~20s ahead (≈1/6 of a 2min video). maxMaxBufferLength caps the
@@ -934,32 +949,27 @@ function Video({
               if (pinnedAudio >= 0) hls.audioTrack = pinnedAudio;
               setIsLoading(false);
             });
+            let mappedAudioTracks = [];
+            const failedAudioTracks = /* @__PURE__ */ new Set();
             hls.on(Hls.Events.AUDIO_TRACKS_UPDATED, (_, data) => {
               const tracks = data.audioTracks ?? [];
               console.debug("[Silo/hls] AUDIO_TRACKS_UPDATED", tracks.length);
               if (tracks.length > 0) {
-                const mapped = tracks.map((t, i) => {
+                mappedAudioTracks = tracks.map((t, i) => {
                   const codec = (t.attrs?.CODECS ?? t.codecSet ?? "").split(",")[0]?.trim() ?? "";
                   const supported = deviceSupportsAudioCodec(codec);
                   const label = friendlyAudioLabel(t.name, t.lang, codec, t.channels ?? t.attrs?.CHANNELS);
-                  return { id: i, label, supported };
+                  return { id: i, label, supported, codec };
                 });
-                const currentTrackIdx = hls.audioTrack ?? 0;
-                if (mapped[currentTrackIdx] && !mapped[currentTrackIdx].supported) {
-                  const firstSupported = mapped.findIndex((t) => t.supported);
-                  if (firstSupported >= 0) {
-                    console.debug("[Silo/hls] current audio track unsupported \u2014 switching to track", firstSupported);
-                    hls.audioTrack = firstSupported;
-                    if (pinnedAudio === -1) setSelectedAudio(firstSupported);
-                  } else {
-                    console.warn("[Silo/hls] no supported audio track found \u2014 disabling separate audio");
-                    try {
-                      hls.audioTrack = -1;
-                    } catch {
-                    }
+                if (pinnedAudio === -1) {
+                  const first = mappedAudioTracks.find((t) => t.supported) ?? mappedAudioTracks[0];
+                  if (first) {
+                    hls.audioTrack = first.id;
+                    setSelectedAudio(first.id);
+                    console.debug("[Silo/hls] starting with audio track", first.id, first.codec || "(unknown codec)");
                   }
                 }
-                if (mapped.length > 1) setAudioTracks(mapped);
+                if (mappedAudioTracks.length > 1) setAudioTracks(mappedAudioTracks.map(({ id, label, supported }) => ({ id, label, supported })));
               }
               if (pinnedAudio >= 0 && hls.audioTrack !== pinnedAudio) {
                 hls.audioTrack = pinnedAudio;
@@ -993,7 +1003,6 @@ function Video({
               console.debug("[Silo/hls] FRAG_LOADED", data.frag?.type, data.frag?.sn);
             });
             let mediaErrorAttempts = 0;
-            let audioAppendErrors = 0;
             let stalledOnPinnedLevel = 0;
             hls.on(Hls.Events.ERROR, (_, data) => {
               const fragUrl = (data.frag?.url ?? data.url ?? "").slice(-80);
@@ -1002,18 +1011,12 @@ function Video({
               if (!data.fatal) {
                 const isAudioBufError = fragType === "audio" && (data.details === Hls.ErrorDetails.BUFFER_APPEND_ERROR || data.details === Hls.ErrorDetails.BUFFER_APPENDING_ERROR);
                 if (isAudioBufError) {
-                  audioAppendErrors += 1;
-                  if (audioAppendErrors >= 3) {
-                    console.warn("[Silo/hls] repeated audio buffer errors \u2014 disabling separate audio tracks");
-                    setAudioTracks([]);
-                    try {
-                      hls.audioTrack = -1;
-                    } catch {
-                    }
-                    audioAppendErrors = 0;
+                  const failedTrack = hls.audioTrack;
+                  if (failedTrack >= 0 && pinnedAudio === -1) {
+                    failedAudioTracks.add(failedTrack);
+                    console.warn("[Silo/hls] audio track", failedTrack, "failed \u2014 trying next");
+                    tryNextAudioTrack2();
                   }
-                } else {
-                  audioAppendErrors = 0;
                 }
                 if (data.details === Hls.ErrorDetails.BUFFER_STALLED_ERROR && pinnedLevel >= 0) {
                   stalledOnPinnedLevel += 1;