@geekapps/silo-elements-nextjs 0.3.21 → 0.3.22

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,12 @@ 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;
+            };
+            var audioCodecPriority = audioCodecPriority2;
             const hls = new Hls({
               enableWorker: true,
               // Buffer ~20s ahead (≈1/6 of a 2min video). maxMaxBufferLength caps the
@@ -934,32 +939,36 @@ 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 = [];
             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);
+                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 separate audio");
+                    console.warn("[Silo/hls] no supported audio track found \u2014 disabling");
                     try {
                       hls.audioTrack = -1;
                     } catch {
                     }
                   }
                 }
-                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;
@@ -991,6 +1000,16 @@ 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;
@@ -1003,8 +1022,8 @@ function Video({
                 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");
+                  if (audioAppendErrors >= 1) {
+                    console.warn("[Silo/hls] audio buffer append error \u2014 disabling separate audio tracks");
                     setAudioTracks([]);
                     try {
                       hls.audioTrack = -1;