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

package/dist/hls.js

@@ -1165,7 +1165,7 @@
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.6-0.canary.11339");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.6-0.canary.11342");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -3079,7 +3079,9 @@
     // Parsing of mp4a codecs strings in mp4-tools from media is incomplete as of d8c6c7a
     // so use level codec is parsed codec is unavailable or incomplete
     if (parsedCodec && (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) {
       var levelCodecs = levelCodec.split(',');
@@ -3096,6 +3098,9 @@
     }
     return levelCodec || parsedCodec;
   }
+  function isCodecSupportedAsType(codec, type) {
+    return isCodecType(codec, type) && isCodecMediaSourceSupported(codec, type);
+  }
   function convertAVC1ToAVCOTI(videoCodecs) {
     // 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.
@@ -16662,7 +16667,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.6-0.canary.11339";
+  var version = "1.6.6-0.canary.11342";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -34367,8 +34372,9 @@
         video = tracks.video,
         audiovideo = tracks.audiovideo;
       if (audio) {
-        var audioCodec = pickMostCompleteCodecName(audio.codec, currentLevel.audioCodec);
-        // Add level and profile to make up for passthrough-remuxer not being able to parse full codec
+        var levelCodec = currentLevel.audioCodec;
+        var 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';
@@ -34397,12 +34403,12 @@
           audioCodec = 'mp4a.40.2';
           this.log("Android: force audio codec to " + audioCodec);
         }
-        if (currentLevel.audioCodec && currentLevel.audioCodec !== audioCodec) {
-          this.log("Swapping manifest audio codec \"" + currentLevel.audioCodec + "\" for \"" + audioCodec + "\"");
+        if (levelCodec && levelCodec !== audioCodec) {
+          this.log("Swapping manifest audio codec \"" + levelCodec + "\" for \"" + audioCodec + "\"");
         }
         audio.levelCodec = audioCodec;
         audio.id = PlaylistLevelType.MAIN;
-        this.log("Init audio buffer, container:" + audio.container + ", codecs[selected/level/parsed]=[" + (audioCodec || '') + "/" + (currentLevel.audioCodec || '') + "/" + audio.codec + "]");
+        this.log("Init audio buffer, container:" + audio.container + ", codecs[selected/level/parsed]=[" + (audioCodec || '') + "/" + (levelCodec || '') + "/" + audio.codec + "]");
         delete tracks.audiovideo;
       }
       if (video) {