hls.js 1.6.1-0.canary.11106 → 1.6.1-0.canary.11108

package/dist/hls.light.mjs

@@ -523,7 +523,7 @@ function enableLogs(debugConfig, context, id) {
     // 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.1-0.canary.11106"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.1-0.canary.11108"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -1502,8 +1502,10 @@ function parseStsd(stsd) {
       {
         // extract profile + compatibility + level out of avcC box
         const avcCBox = findBox(sampleEntriesEnd, ['avcC'])[0];
-        codec += '.' + toHex(avcCBox[1]) + toHex(avcCBox[2]) + toHex(avcCBox[3]);
-        supplemental = parseSupplementalDoViCodec(codecFourCC === 'avc1' ? 'dva1' : 'dvav', sampleEntriesEnd);
+        if (avcCBox && avcCBox.length > 3) {
+          codec += '.' + toHex(avcCBox[1]) + toHex(avcCBox[2]) + toHex(avcCBox[3]);
+          supplemental = parseSupplementalDoViCodec(codecFourCC === 'avc1' ? 'dva1' : 'dvav', sampleEntriesEnd);
+        }
         break;
       }
     case 'mp4a':
@@ -1554,9 +1556,8 @@ function parseStsd(stsd) {
     case 'hvc1':
     case 'hev1':
       {
-        const hvcCBoxes = findBox(sampleEntriesEnd, ['hvcC']);
-        if (hvcCBoxes) {
-          const hvcCBox = hvcCBoxes[0];
+        const hvcCBox = findBox(sampleEntriesEnd, ['hvcC'])[0];
+        if (hvcCBox && hvcCBox.length > 12) {
           const profileByte = hvcCBox[1];
           const profileSpace = ['', 'A', 'B', 'C'][profileByte >> 6];
           const generalProfileIdc = profileByte & 0x1f;
@@ -1592,34 +1593,38 @@ function parseStsd(stsd) {
     case 'vp09':
       {
         const vpcCBox = findBox(sampleEntriesEnd, ['vpcC'])[0];
-        const profile = vpcCBox[4];
-        const level = vpcCBox[5];
-        const bitDepth = vpcCBox[6] >> 4 & 0x0f;
-        codec += '.' + addLeadingZero(profile) + '.' + addLeadingZero(level) + '.' + addLeadingZero(bitDepth);
+        if (vpcCBox && vpcCBox.length > 6) {
+          const profile = vpcCBox[4];
+          const level = vpcCBox[5];
+          const bitDepth = vpcCBox[6] >> 4 & 0x0f;
+          codec += '.' + addLeadingZero(profile) + '.' + addLeadingZero(level) + '.' + addLeadingZero(bitDepth);
+        }
         break;
       }
     case 'av01':
       {
         const av1CBox = findBox(sampleEntriesEnd, ['av1C'])[0];
-        const profile = av1CBox[1] >>> 5;
-        const level = av1CBox[1] & 0x1f;
-        const tierFlag = av1CBox[2] >>> 7 ? 'H' : 'M';
-        const highBitDepth = (av1CBox[2] & 0x40) >> 6;
-        const twelveBit = (av1CBox[2] & 0x20) >> 5;
-        const bitDepth = profile === 2 && highBitDepth ? twelveBit ? 12 : 10 : highBitDepth ? 10 : 8;
-        const monochrome = (av1CBox[2] & 0x10) >> 4;
-        const chromaSubsamplingX = (av1CBox[2] & 0x08) >> 3;
-        const chromaSubsamplingY = (av1CBox[2] & 0x04) >> 2;
-        const chromaSamplePosition = av1CBox[2] & 0x03;
-        // TODO: parse color_description_present_flag
-        // default it to BT.709/limited range for now
-        // more info https://aomediacodec.github.io/av1-isobmff/#av1codecconfigurationbox-syntax
-        const colorPrimaries = 1;
-        const transferCharacteristics = 1;
-        const matrixCoefficients = 1;
-        const videoFullRangeFlag = 0;
-        codec += '.' + profile + '.' + addLeadingZero(level) + tierFlag + '.' + addLeadingZero(bitDepth) + '.' + monochrome + '.' + chromaSubsamplingX + chromaSubsamplingY + chromaSamplePosition + '.' + addLeadingZero(colorPrimaries) + '.' + addLeadingZero(transferCharacteristics) + '.' + addLeadingZero(matrixCoefficients) + '.' + videoFullRangeFlag;
-        supplemental = parseSupplementalDoViCodec('dav1', sampleEntriesEnd);
+        if (av1CBox && av1CBox.length > 2) {
+          const profile = av1CBox[1] >>> 5;
+          const level = av1CBox[1] & 0x1f;
+          const tierFlag = av1CBox[2] >>> 7 ? 'H' : 'M';
+          const highBitDepth = (av1CBox[2] & 0x40) >> 6;
+          const twelveBit = (av1CBox[2] & 0x20) >> 5;
+          const bitDepth = profile === 2 && highBitDepth ? twelveBit ? 12 : 10 : highBitDepth ? 10 : 8;
+          const monochrome = (av1CBox[2] & 0x10) >> 4;
+          const chromaSubsamplingX = (av1CBox[2] & 0x08) >> 3;
+          const chromaSubsamplingY = (av1CBox[2] & 0x04) >> 2;
+          const chromaSamplePosition = av1CBox[2] & 0x03;
+          // TODO: parse color_description_present_flag
+          // default it to BT.709/limited range for now
+          // more info https://aomediacodec.github.io/av1-isobmff/#av1codecconfigurationbox-syntax
+          const colorPrimaries = 1;
+          const transferCharacteristics = 1;
+          const matrixCoefficients = 1;
+          const videoFullRangeFlag = 0;
+          codec += '.' + profile + '.' + addLeadingZero(level) + tierFlag + '.' + addLeadingZero(bitDepth) + '.' + monochrome + '.' + chromaSubsamplingX + chromaSubsamplingY + chromaSamplePosition + '.' + addLeadingZero(colorPrimaries) + '.' + addLeadingZero(transferCharacteristics) + '.' + addLeadingZero(matrixCoefficients) + '.' + videoFullRangeFlag;
+          supplemental = parseSupplementalDoViCodec('dav1', sampleEntriesEnd);
+        }
         break;
       }
   }
@@ -10317,7 +10322,10 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
     if (buffersAppendedTo.length === 0) {
       this.warn(`Fragments must have at least one ElementaryStreamType set. type: ${frag.type} level: ${frag.level} sn: ${frag.sn}`);
     }
-    this.blockBuffers(onUnblocked, buffersAppendedTo);
+    this.blockBuffers(onUnblocked, buffersAppendedTo).catch(error => {
+      this.warn(`Fragment buffered callback ${error}`);
+      this.stepOperationQueue(this.sourceBufferTypes);
+    });
   }
   onFragChanged(event, data) {
     this.trimBuffers();
@@ -10810,9 +10818,16 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
   }
   blockUntilOpen(callback) {
     if (this.isUpdating() || this.isQueued()) {
-      this.blockBuffers(callback);
+      this.blockBuffers(callback).catch(error => {
+        this.warn(`SourceBuffer blocked callback ${error}`);
+        this.stepOperationQueue(this.sourceBufferTypes);
+      });
     } else {
-      callback();
+      try {
+        callback();
+      } catch (error) {
+        this.warn(`Callback run without blocking ${this.operationQueue} ${error}`);
+      }
     }
   }
   isUpdating() {
@@ -10831,8 +10846,7 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
   blockBuffers(onUnblocked, bufferNames = this.sourceBufferTypes) {
     if (!bufferNames.length) {
       this.log('Blocking operation requested, but no SourceBuffers exist');
-      Promise.resolve().then(onUnblocked);
-      return;
+      return Promise.resolve().then(onUnblocked);
     }
     const {
       operationQueue
@@ -10844,13 +10858,13 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
     if (audioBlocked) {
       this.unblockAudio();
     }
-    Promise.all(blockingOperations).then(result => {
+    return Promise.all(blockingOperations).then(result => {
       if (operationQueue !== this.operationQueue) {
         return;
       }
       // logger.debug(`[buffer-controller]: Blocking operation resolved; unblocking ${buffers} SourceBuffer`);
       onUnblocked();
-      this.stepOperationQueue(bufferNames);
+      this.stepOperationQueue(this.sourceBufferTypes);
     });
   }
   stepOperationQueue(bufferNames) {
@@ -19793,7 +19807,7 @@ function assignTrackIdsByGroup(tracks) {
   });
 }
 
-const version = "1.6.1-0.canary.11106";
+const version = "1.6.1-0.canary.11108";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js