@geekapps/silo-elements-nextjs 0.3.22 → 0.3.24

package/dist/VideoPlayer.js

@@ -872,12 +872,22 @@ function Video({
           const Hls = HlsModule.default;
           console.debug("[Silo/hls] Hls.isSupported()=", Hls.isSupported());
           if (Hls.isSupported()) {
-            let audioCodecPriority2 = function(codec) {
-              const c = codec.toLowerCase();
-              const idx = AUDIO_CODEC_PRIORITY.findIndex((k) => c.includes(k));
-              return idx === -1 ? 0 : idx;
+            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 audioCodecPriority = audioCodecPriority2;
+            var tryNextAudioTrack = tryNextAudioTrack2;
             const hls = new Hls({
               enableWorker: true,
               // Buffer ~20s ahead (≈1/6 of a 2min video). maxMaxBufferLength caps the
@@ -939,9 +949,8 @@ function Video({
               if (pinnedAudio >= 0) hls.audioTrack = pinnedAudio;
               setIsLoading(false);
             });
-            const AUDIO_CODEC_PRIORITY = ["opus", "mp4a", "aac", "ac-3", "ac3", "dts", "ec-3", "eac3", "dts-hd", "dtshd", "truehd"];
-            let audioUpgradeDone = 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);
@@ -953,19 +962,11 @@ function Video({
                   return { id: i, label, supported, codec };
                 });
                 if (pinnedAudio === -1) {
-                  const opusTrack = mappedAudioTracks.find((t) => t.supported && /opus/i.test(t.codec));
-                  const fallback = mappedAudioTracks.find((t) => t.supported);
-                  const startTrack = opusTrack ?? fallback;
-                  if (startTrack) {
-                    hls.audioTrack = startTrack.id;
-                    setSelectedAudio(startTrack.id);
-                    console.debug("[Silo/hls] starting with audio track", startTrack.id, startTrack.codec);
-                  } else {
-                    console.warn("[Silo/hls] no supported audio track found \u2014 disabling");
-                    try {
-                      hls.audioTrack = -1;
-                    } catch {
-                    }
+                  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 (mappedAudioTracks.length > 1) setAudioTracks(mappedAudioTracks.map(({ id, label, supported }) => ({ id, label, supported })));
@@ -1000,19 +1001,8 @@ function Video({
             });
             hls.on(Hls.Events.FRAG_LOADED, (_, data) => {
               console.debug("[Silo/hls] FRAG_LOADED", data.frag?.type, data.frag?.sn);
-              if (!audioUpgradeDone && data.frag?.type === "audio" && data.frag?.sn === 0 && pinnedAudio === -1 && mappedAudioTracks.length > 1) {
-                audioUpgradeDone = true;
-                const supported = mappedAudioTracks.filter((t) => t.supported);
-                const best = supported.reduce((a, b) => audioCodecPriority2(b.codec) > audioCodecPriority2(a.codec) ? b : a, supported[0]);
-                if (best && best.id !== hls.audioTrack) {
-                  console.debug("[Silo/hls] upgrading audio track", hls.audioTrack, "\u2192", best.id, best.codec);
-                  hls.audioTrack = best.id;
-                  setSelectedAudio(best.id);
-                }
-              }
             });
             let mediaErrorAttempts = 0;
-            let audioAppendErrors = 0;
             let stalledOnPinnedLevel = 0;
             hls.on(Hls.Events.ERROR, (_, data) => {
               const fragUrl = (data.frag?.url ?? data.url ?? "").slice(-80);
@@ -1021,18 +1011,14 @@ 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 >= 1) {
-                    console.warn("[Silo/hls] audio buffer append error \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 recovering MSE and trying next");
+                    hls.recoverMediaError();
+                    tryNextAudioTrack2();
                   }
-                } else {
-                  audioAppendErrors = 0;
+                  return;
                 }
                 if (data.details === Hls.ErrorDetails.BUFFER_STALLED_ERROR && pinnedLevel >= 0) {
                   stalledOnPinnedLevel += 1;