hls.js 1.6.6-0.canary.11339 → 1.6.6-0.canary.11342

package/package.json

@@ -74,7 +74,7 @@
     "@babel/preset-env": "7.27.2",
     "@babel/preset-typescript": "7.27.1",
     "@babel/register": "7.27.1",
-    "@microsoft/api-documenter": "7.26.27",
+    "@microsoft/api-documenter": "7.26.28",
     "@microsoft/api-extractor": "7.52.8",
     "@rollup/plugin-alias": "5.1.1",
     "@rollup/plugin-babel": "6.0.4",
@@ -135,5 +135,5 @@
     "url-toolkit": "2.2.5",
     "wrangler": "4.22.0"
   },
-  "version": "1.6.6-0.canary.11339"
+  "version": "1.6.6-0.canary.11342"
 }

package/src/controller/stream-controller.ts

@@ -1424,11 +1424,9 @@ export default class StreamController
     // include levelCodec in audio and video tracks
     const { audio, video, audiovideo } = tracks;
     if (audio) {
-      let audioCodec = pickMostCompleteCodecName(
-        audio.codec,
-        currentLevel.audioCodec,
-      );
-      // Add level and profile to make up for passthrough-remuxer not being able to parse full codec
+      const levelCodec = currentLevel.audioCodec;
+      let audioCodec = pickMostCompleteCodecName(audio.codec, levelCodec);
+      // Add level and profile to make up for remuxer not being able to parse full codec
       // (logger warning "Unhandled audio codec...")
       if (audioCodec === 'mp4a') {
         audioCodec = 'mp4a.40.5';
@@ -1467,9 +1465,9 @@ export default class StreamController
         audioCodec = 'mp4a.40.2';
         this.log(`Android: force audio codec to ${audioCodec}`);
       }
-      if (currentLevel.audioCodec && currentLevel.audioCodec !== audioCodec) {
+      if (levelCodec && levelCodec !== audioCodec) {
         this.log(
-          `Swapping manifest audio codec "${currentLevel.audioCodec}" for "${audioCodec}"`,
+          `Swapping manifest audio codec "${levelCodec}" for "${audioCodec}"`,
         );
       }
       audio.levelCodec = audioCodec;
@@ -1478,7 +1476,7 @@ export default class StreamController
         `Init audio buffer, container:${
           audio.container
         }, codecs[selected/level/parsed]=[${audioCodec || ''}/${
-          currentLevel.audioCodec || ''
+          levelCodec || ''
         }/${audio.codec}]`,
       );
       delete tracks.audiovideo;

package/src/utils/codecs.ts

@@ -232,7 +232,12 @@ export function pickMostCompleteCodecName(
     (parsedCodec.length > 4 ||
       ['ac-3', 'ec-3', 'alac', 'fLaC', 'Opus'].indexOf(parsedCodec) !== -1)
   ) {
-    return parsedCodec;
+    if (
+      isCodecSupportedAsType(parsedCodec, 'audio') ||
+      isCodecSupportedAsType(parsedCodec, 'video')
+    ) {
+      return parsedCodec;
+    }
   }
   if (levelCodec) {
     const levelCodecs = levelCodec.split(',');
@@ -250,6 +255,10 @@ export function pickMostCompleteCodecName(
   return levelCodec || parsedCodec;
 }
 
+function isCodecSupportedAsType(codec: string, type: CodecType): boolean {
+  return isCodecType(codec, type) && isCodecMediaSourceSupported(codec, type);
+}
+
 export function convertAVC1ToAVCOTI(videoCodecs: string): string {
   // Convert avc1 codec string from RFC-4281 to RFC-6381 for MediaSource.isTypeSupported
   // Examples: avc1.66.30 to avc1.42001e and avc1.77.30,avc1.66.30 to avc1.4d001e,avc1.42001e.