hls.js 1.6.0-beta.2.0.canary.10873 → 1.6.0-beta.2.0.canary.10877

package/dist/hls.light.js

@@ -1029,7 +1029,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.0-beta.2.0.canary.10873");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.2.0.canary.10877");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -12041,7 +12041,6 @@
           // logger.log('AVC PID:'  + pid);
           if (result.videoPid === -1) {
             result.videoPid = pid;
-            result.segmentVideoCodec = 'avc';
           }
           break;
 
@@ -12469,7 +12468,7 @@
       0x00, 0x00]));
     };
     MP4.mdia = function mdia(track) {
-      return MP4.box(MP4.types.mdia, MP4.mdhd(track.timescale, track.duration), MP4.hdlr(track.type), MP4.minf(track));
+      return MP4.box(MP4.types.mdia, MP4.mdhd(track.timescale || 0, track.duration || 0), MP4.hdlr(track.type), MP4.minf(track));
     };
     MP4.mfhd = function mfhd(sequenceNumber) {
       return MP4.box(MP4.types.mfhd, new Uint8Array([0x00, 0x00, 0x00, 0x00,
@@ -12493,7 +12492,7 @@
       while (i--) {
         boxes[i] = MP4.trak(tracks[i]);
       }
-      return MP4.box.apply(null, [MP4.types.moov, MP4.mvhd(tracks[0].timescale, tracks[0].duration)].concat(boxes).concat(MP4.mvex(tracks)));
+      return MP4.box.apply(null, [MP4.types.moov, MP4.mvhd(tracks[0].timescale || 0, tracks[0].duration || 0)].concat(boxes).concat(MP4.mvex(tracks)));
     };
     MP4.mvex = function mvex(tracks) {
       var i = tracks.length;
@@ -12677,7 +12676,7 @@
       ]));
     };
     MP4.audioStsd = function audioStsd(track) {
-      var samplerate = track.samplerate;
+      var samplerate = track.samplerate || 0;
       return new Uint8Array([0x00, 0x00, 0x00,
       // reserved
       0x00, 0x00, 0x00,
@@ -12686,7 +12685,7 @@
       // data_reference_index
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
       // reserved
-      0x00, track.channelCount,
+      0x00, track.channelCount || 0,
       // channelcount
       0x00, 0x10,
       // sampleSize:16bits
@@ -12706,25 +12705,30 @@
       return MP4.box(MP4.types['ac-3'], MP4.audioStsd(track), MP4.box(MP4.types.dac3, track.config));
     };
     MP4.stsd = function stsd(track) {
+      var segmentCodec = track.segmentCodec;
       if (track.type === 'audio') {
-        if (track.segmentCodec === 'mp3' && track.codec === 'mp3') {
-          return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp3(track));
+        if (segmentCodec === 'aac') {
+          return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp4a(track));
         }
-        if (track.segmentCodec === 'ac3') {
-          return MP4.box(MP4.types.stsd, MP4.STSD, MP4.ac3(track));
+        if (segmentCodec === 'mp3' && track.codec === 'mp3') {
+          return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp3(track));
         }
-        return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp4a(track));
-      } else if (track.segmentCodec === 'avc') {
-        return MP4.box(MP4.types.stsd, MP4.STSD, MP4.avc1(track));
       } else {
-        return MP4.box(MP4.types.stsd, MP4.STSD, MP4.hvc1(track));
+        if (track.pps && track.sps) {
+          if (segmentCodec === 'avc') {
+            return MP4.box(MP4.types.stsd, MP4.STSD, MP4.avc1(track));
+          }
+        } else {
+          throw new Error("video track missing pps or sps");
+        }
       }
+      throw new Error("unsupported " + track.type + " segment codec (" + segmentCodec + "/" + track.codec + ")");
     };
     MP4.tkhd = function tkhd(track) {
       var id = track.id;
-      var duration = track.duration * track.timescale;
-      var width = track.width;
-      var height = track.height;
+      var duration = (track.duration || 0) * (track.timescale || 0);
+      var width = track.width || 0;
+      var height = track.height || 0;
       var upperWordDuration = Math.floor(duration / (UINT32_MAX + 1));
       var lowerWordDuration = Math.floor(duration % (UINT32_MAX + 1));
       return MP4.box(MP4.types.tkhd, new Uint8Array([0x01,
@@ -12856,82 +12860,9 @@
       return result;
     };
     MP4.hvc1 = function hvc1(track) {
-      var ps = track.params;
-      var units = [track.vps, track.sps, track.pps];
-      var NALuLengthSize = 4;
-      var config = new Uint8Array([0x01, ps.general_profile_space << 6 | (ps.general_tier_flag ? 32 : 0) | ps.general_profile_idc, ps.general_profile_compatibility_flags[0], ps.general_profile_compatibility_flags[1], ps.general_profile_compatibility_flags[2], ps.general_profile_compatibility_flags[3], ps.general_constraint_indicator_flags[0], ps.general_constraint_indicator_flags[1], ps.general_constraint_indicator_flags[2], ps.general_constraint_indicator_flags[3], ps.general_constraint_indicator_flags[4], ps.general_constraint_indicator_flags[5], ps.general_level_idc, 240 | ps.min_spatial_segmentation_idc >> 8, 255 & ps.min_spatial_segmentation_idc, 252 | ps.parallelismType, 252 | ps.chroma_format_idc, 248 | ps.bit_depth_luma_minus8, 248 | ps.bit_depth_chroma_minus8, 0x00, parseInt(ps.frame_rate.fps), NALuLengthSize - 1 | ps.temporal_id_nested << 2 | ps.num_temporal_layers << 3 | (ps.frame_rate.fixed ? 64 : 0), units.length]);
-
-      // compute hvcC size in bytes
-      var length = config.length;
-      for (var i = 0; i < units.length; i += 1) {
-        length += 3;
-        for (var j = 0; j < units[i].length; j += 1) {
-          length += 2 + units[i][j].length;
-        }
-      }
-      var hvcC = new Uint8Array(length);
-      hvcC.set(config, 0);
-      length = config.length;
-      // append parameter set units: one vps, one or more sps and pps
-      var iMax = units.length - 1;
-      for (var _i = 0; _i < units.length; _i += 1) {
-        hvcC.set(new Uint8Array([32 + _i | (_i === iMax ? 128 : 0), 0x00, units[_i].length]), length);
-        length += 3;
-        for (var _j = 0; _j < units[_i].length; _j += 1) {
-          hvcC.set(new Uint8Array([units[_i][_j].length >> 8, units[_i][_j].length & 255]), length);
-          length += 2;
-          hvcC.set(units[_i][_j], length);
-          length += units[_i][_j].length;
-        }
-      }
-      var hvcc = MP4.box(MP4.types.hvcC, hvcC);
-      var width = track.width;
-      var height = track.height;
-      var hSpacing = track.pixelRatio[0];
-      var vSpacing = track.pixelRatio[1];
-      return MP4.box(MP4.types.hvc1, new Uint8Array([0x00, 0x00, 0x00,
-      // reserved
-      0x00, 0x00, 0x00,
-      // reserved
-      0x00, 0x01,
-      // data_reference_index
-      0x00, 0x00,
-      // pre_defined
-      0x00, 0x00,
-      // reserved
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      // pre_defined
-      width >> 8 & 0xff, width & 0xff,
-      // width
-      height >> 8 & 0xff, height & 0xff,
-      // height
-      0x00, 0x48, 0x00, 0x00,
-      // horizresolution
-      0x00, 0x48, 0x00, 0x00,
-      // vertresolution
-      0x00, 0x00, 0x00, 0x00,
-      // reserved
-      0x00, 0x01,
-      // frame_count
-      0x12, 0x64, 0x61, 0x69, 0x6c,
-      // dailymotion/hls.js
-      0x79, 0x6d, 0x6f, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x68, 0x6c, 0x73, 0x2e, 0x6a, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      // compressorname
-      0x00, 0x18,
-      // depth = 24
-      0x11, 0x11]),
-      // pre_defined = -1
-      hvcc, MP4.box(MP4.types.btrt, new Uint8Array([0x00, 0x1c, 0x9c, 0x80,
-      // bufferSizeDB
-      0x00, 0x2d, 0xc6, 0xc0,
-      // maxBitrate
-      0x00, 0x2d, 0xc6, 0xc0])),
-      // avgBitrate
-      MP4.box(MP4.types.pasp, new Uint8Array([hSpacing >> 24,
-      // hSpacing
-      hSpacing >> 16 & 0xff, hSpacing >> 8 & 0xff, hSpacing & 0xff, vSpacing >> 24,
-      // vSpacing
-      vSpacing >> 16 & 0xff, vSpacing >> 8 & 0xff, vSpacing & 0xff])));
+      {
+        return new Uint8Array();
+      }
     };
     return MP4;
   }();
@@ -12965,6 +12896,21 @@
   var AC3_SAMPLES_PER_FRAME = 1536;
   var chromeVersion = null;
   var safariWebkitVersion = null;
+  function createMp4Sample(isKeyframe, duration, size, cts) {
+    return {
+      duration: duration,
+      size: size,
+      cts: cts,
+      flags: {
+        isLeading: 0,
+        isDependedOn: 0,
+        hasRedundancy: 0,
+        degradPrio: 0,
+        dependsOn: isKeyframe ? 2 : 1,
+        isNonSync: isKeyframe ? 0 : 1
+      }
+    };
+  }
   var MP4Remuxer = /*#__PURE__*/function () {
     function MP4Remuxer(observer, config, typeSupported, logger) {
       this.logger = void 0;
@@ -13464,7 +13410,7 @@
         maxDtsDelta = Math.max(maxDtsDelta, mp4SampleDuration);
         minPtsDelta = Math.min(minPtsDelta, ptsDelta);
         maxPtsDelta = Math.max(maxPtsDelta, ptsDelta);
-        outputSamples.push(new Mp4Sample(VideoSample.key, mp4SampleDuration, mp4SampleLength, compositionTimeOffset));
+        outputSamples.push(createMp4Sample(VideoSample.key, mp4SampleDuration, mp4SampleLength, compositionTimeOffset));
       }
       if (outputSamples.length) {
         if (chromeVersion) {
@@ -13501,7 +13447,7 @@
       this.nextAvcDts = nextAvcDts = lastDTS + mp4SampleDuration;
       this.videoSampleDuration = mp4SampleDuration;
       this.isVideoContiguous = true;
-      var moof = MP4.moof(track.sequenceNumber++, firstDTS, _extends({}, track, {
+      var moof = MP4.moof(track.sequenceNumber++, firstDTS, _extends(track, {
         samples: outputSamples
       }));
       var type = 'video';
@@ -13705,7 +13651,7 @@
         // Default the sample's duration to the computed mp4SampleDuration, which will either be 1024 for AAC or 1152 for MPEG
         // In the case that we have 1 sample, this will be the duration. If we have more than one sample, the duration
         // becomes the PTS diff with the previous sample
-        outputSamples.push(new Mp4Sample(true, mp4SampleDuration, unitLen, 0));
+        outputSamples.push(createMp4Sample(true, mp4SampleDuration, unitLen, 0));
         lastPTS = _pts2;
       }
 
@@ -13814,23 +13760,6 @@
       samples: samples
     };
   }
-  var Mp4Sample = function Mp4Sample(isKeyframe, duration, size, cts) {
-    this.size = void 0;
-    this.duration = void 0;
-    this.cts = void 0;
-    this.flags = void 0;
-    this.duration = duration;
-    this.size = size;
-    this.cts = cts;
-    this.flags = {
-      isLeading: 0,
-      isDependedOn: 0,
-      hasRedundancy: 0,
-      degradPrio: 0,
-      dependsOn: isKeyframe ? 2 : 1,
-      isNonSync: isKeyframe ? 0 : 1
-    };
-  };
 
   var PassThroughRemuxer = /*#__PURE__*/function () {
     function PassThroughRemuxer(observer, config, typeSupported, logger) {
@@ -19806,7 +19735,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.2.0.canary.10873";
+  var version = "1.6.0-beta.2.0.canary.10877";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -21548,7 +21477,7 @@
     };
     _proto.load = function load(frag) {
       var _this2 = this;
-      if (!frag.decryptdata && frag.encrypted && this.emeController) {
+      if (!frag.decryptdata && frag.encrypted && this.emeController && this.config.emeEnabled) {
         // Multiple keys, but none selected, resolve in eme-controller
         return this.emeController.selectKeySystemFormat(frag).then(function (keySystemFormat) {
           return _this2.loadInternal(frag, keySystemFormat);