hls.js 1.5.9-0.canary.10267 → 1.5.9-0.canary.10269

package/dist/hls.mjs

@@ -512,7 +512,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.5.9-0.canary.10267"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.5.9-0.canary.10269"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -9688,11 +9688,14 @@ class BaseStreamController extends TaskLoop {
     } = this;
     const fragState = fragmentTracker.getState(frag);
     if (fragState === FragmentState.APPENDING) {
-      // Lower the buffer size and try again
+      // Lower the max buffer length and try again
       const playlistType = frag.type;
       const bufferedInfo = this.getFwdBufferInfo(this.mediaBuffer, playlistType);
       const minForwardBufferLength = Math.max(frag.duration, bufferedInfo ? bufferedInfo.len : this.config.maxBufferLength);
-      if (this.reduceMaxBufferLength(minForwardBufferLength)) {
+      // If backtracking, always remove from the tracker without reducing max buffer length
+      const backtrackFragment = this.backtrackFragment;
+      const backtracked = backtrackFragment ? frag.sn - backtrackFragment.sn : 0;
+      if (backtracked === 1 || this.reduceMaxBufferLength(minForwardBufferLength)) {
         fragmentTracker.removeFragment(frag);
       }
     } else if (((_this$mediaBuffer = this.mediaBuffer) == null ? void 0 : _this$mediaBuffer.buffered.length) === 0) {
@@ -10196,10 +10199,11 @@ class BaseStreamController extends TaskLoop {
   reduceMaxBufferLength(threshold) {
     const config = this.config;
     const minLength = threshold || config.maxBufferLength;
-    if (config.maxMaxBufferLength >= minLength) {
+    const reducedLength = config.maxMaxBufferLength / 2;
+    if (reducedLength >= minLength) {
       // reduce max buffer length as it might be too high. we do this to avoid loop flushing ...
-      config.maxMaxBufferLength /= 2;
-      this.warn(`Reduce max buffer length to ${config.maxMaxBufferLength}s`);
+      config.maxMaxBufferLength = reducedLength;
+      this.warn(`Reduce max buffer length to ${reducedLength}s`);
       return true;
     }
     return false;
@@ -20203,13 +20207,7 @@ const specialCea608CharsCodes = {
 /**
  * Utils
  */
-const getCharForByte = function getCharForByte(byte) {
-  let charCode = byte;
-  if (specialCea608CharsCodes.hasOwnProperty(byte)) {
-    charCode = specialCea608CharsCodes[byte];
-  }
-  return String.fromCharCode(charCode);
-};
+const getCharForByte = byte => String.fromCharCode(specialCea608CharsCodes[byte] || byte);
 const NR_ROWS = 15;
 const NR_COLS = 100;
 // Tables to look up row from PAC data
@@ -20897,28 +20895,39 @@ class Cea608Parser {
    * Add data for time t in forms of list of bytes (unsigned ints). The bytes are treated as pairs.
    */
   addData(time, byteList) {
-    let cmdFound;
-    let a;
-    let b;
-    let charsFound = false;
     this.logger.time = time;
     for (let i = 0; i < byteList.length; i += 2) {
-      a = byteList[i] & 0x7f;
-      b = byteList[i + 1] & 0x7f;
+      const a = byteList[i] & 0x7f;
+      const b = byteList[i + 1] & 0x7f;
+      let cmdFound = false;
+      let charsFound = null;
       if (a === 0 && b === 0) {
         continue;
       } else {
-        this.logger.log(3, '[' + numArrayToHexArray([byteList[i], byteList[i + 1]]) + '] -> (' + numArrayToHexArray([a, b]) + ')');
-      }
-      cmdFound = this.parseCmd(a, b);
-      if (!cmdFound) {
-        cmdFound = this.parseMidrow(a, b);
-      }
-      if (!cmdFound) {
-        cmdFound = this.parsePAC(a, b);
-      }
-      if (!cmdFound) {
-        cmdFound = this.parseBackgroundAttributes(a, b);
+        this.logger.log(3, () => '[' + numArrayToHexArray([byteList[i], byteList[i + 1]]) + '] -> (' + numArrayToHexArray([a, b]) + ')');
+      }
+      const cmdHistory = this.cmdHistory;
+      const isControlCode = a >= 0x10 && a <= 0x1f;
+      if (isControlCode) {
+        // Skip redundant control codes
+        if (hasCmdRepeated(a, b, cmdHistory)) {
+          setLastCmd(null, null, cmdHistory);
+          this.logger.log(3, () => 'Repeated command (' + numArrayToHexArray([a, b]) + ') is dropped');
+          continue;
+        }
+        setLastCmd(a, b, this.cmdHistory);
+        cmdFound = this.parseCmd(a, b);
+        if (!cmdFound) {
+          cmdFound = this.parseMidrow(a, b);
+        }
+        if (!cmdFound) {
+          cmdFound = this.parsePAC(a, b);
+        }
+        if (!cmdFound) {
+          cmdFound = this.parseBackgroundAttributes(a, b);
+        }
+      } else {
+        setLastCmd(null, null, cmdHistory);
       }
       if (!cmdFound) {
         charsFound = this.parseChars(a, b);
@@ -20933,7 +20942,7 @@ class Cea608Parser {
         }
       }
       if (!cmdFound && !charsFound) {
-        this.logger.log(2, "Couldn't parse cleaned data " + numArrayToHexArray([a, b]) + ' orig: ' + numArrayToHexArray([byteList[i], byteList[i + 1]]));
+        this.logger.log(2, () => "Couldn't parse cleaned data " + numArrayToHexArray([a, b]) + ' orig: ' + numArrayToHexArray([byteList[i], byteList[i + 1]]));
       }
     }
   }
@@ -20943,19 +20952,11 @@ class Cea608Parser {
    * @returns True if a command was found
    */
   parseCmd(a, b) {
-    const {
-      cmdHistory
-    } = this;
     const cond1 = (a === 0x14 || a === 0x1c || a === 0x15 || a === 0x1d) && b >= 0x20 && b <= 0x2f;
     const cond2 = (a === 0x17 || a === 0x1f) && b >= 0x21 && b <= 0x23;
     if (!(cond1 || cond2)) {
       return false;
     }
-    if (hasCmdRepeated(a, b, cmdHistory)) {
-      setLastCmd(null, null, cmdHistory);
-      this.logger.log(3, 'Repeated command (' + numArrayToHexArray([a, b]) + ') is dropped');
-      return true;
-    }
     const chNr = a === 0x14 || a === 0x15 || a === 0x17 ? 1 : 2;
     const channel = this.channels[chNr];
     if (a === 0x14 || a === 0x15 || a === 0x1c || a === 0x1d) {
@@ -20996,7 +20997,6 @@ class Cea608Parser {
       // a == 0x17 || a == 0x1F
       channel.ccTO(b - 0x20);
     }
-    setLastCmd(a, b, cmdHistory);
     this.currentChannel = chNr;
     return true;
   }
@@ -21021,7 +21021,7 @@ class Cea608Parser {
         return false;
       }
       channel.ccMIDROW(b);
-      this.logger.log(3, 'MIDROW (' + numArrayToHexArray([a, b]) + ')');
+      this.logger.log(3, () => 'MIDROW (' + numArrayToHexArray([a, b]) + ')');
       return true;
     }
     return false;
@@ -21033,16 +21033,11 @@ class Cea608Parser {
    */
   parsePAC(a, b) {
     let row;
-    const cmdHistory = this.cmdHistory;
     const case1 = (a >= 0x11 && a <= 0x17 || a >= 0x19 && a <= 0x1f) && b >= 0x40 && b <= 0x7f;
     const case2 = (a === 0x10 || a === 0x18) && b >= 0x40 && b <= 0x5f;
     if (!(case1 || case2)) {
       return false;
     }
-    if (hasCmdRepeated(a, b, cmdHistory)) {
-      setLastCmd(null, null, cmdHistory);
-      return true; // Repeated commands are dropped (once)
-    }
     const chNr = a <= 0x17 ? 1 : 2;
     if (b >= 0x40 && b <= 0x5f) {
       row = chNr === 1 ? rowsLowCh1[a] : rowsLowCh2[a];
@@ -21055,7 +21050,6 @@ class Cea608Parser {
       return false;
     }
     channel.setPAC(this.interpretPAC(row, b));
-    setLastCmd(a, b, cmdHistory);
     this.currentChannel = chNr;
     return true;
   }
@@ -21115,15 +21109,13 @@ class Cea608Parser {
       } else {
         oneCode = b + 0x90;
       }
-      this.logger.log(2, "Special char '" + getCharForByte(oneCode) + "' in channel " + channelNr);
+      this.logger.log(2, () => "Special char '" + getCharForByte(oneCode) + "' in channel " + channelNr);
       charCodes = [oneCode];
     } else if (a >= 0x20 && a <= 0x7f) {
       charCodes = b === 0 ? [a] : [a, b];
     }
     if (charCodes) {
-      const hexCodes = numArrayToHexArray(charCodes);
-      this.logger.log(3, 'Char codes =  ' + hexCodes.join(','));
-      setLastCmd(a, b, this.cmdHistory);
+      this.logger.log(3, () => 'Char codes =  ' + numArrayToHexArray(charCodes).join(','));
     }
     return charCodes;
   }
@@ -21157,7 +21149,6 @@ class Cea608Parser {
     const chNr = a <= 0x17 ? 1 : 2;
     const channel = this.channels[chNr];
     channel.setBkgData(bkgData);
-    setLastCmd(a, b, this.cmdHistory);
     return true;
   }
 
@@ -21171,7 +21162,7 @@ class Cea608Parser {
         channel.reset();
       }
     }
-    this.cmdHistory = createCmdHistory();
+    setLastCmd(null, null, this.cmdHistory);
   }
 
   /**
@@ -22644,17 +22635,16 @@ class TimelineController {
         cea608Parser2,
         lastSn
       } = this;
-      if (!cea608Parser1 || !cea608Parser2) {
-        return;
-      }
       const {
         cc,
         sn
       } = data.frag;
       const partIndex = (_data$part$index = (_data$part = data.part) == null ? void 0 : _data$part.index) != null ? _data$part$index : -1;
-      if (!(sn === lastSn + 1 || sn === lastSn && partIndex === this.lastPartIndex + 1 || cc === this.lastCc)) {
-        cea608Parser1.reset();
-        cea608Parser2.reset();
+      if (cea608Parser1 && cea608Parser2) {
+        if (sn !== lastSn + 1 || sn === lastSn && partIndex !== this.lastPartIndex + 1 || cc !== this.lastCc) {
+          cea608Parser1.reset();
+          cea608Parser2.reset();
+        }
       }
       this.lastCc = cc;
       this.lastSn = sn;
@@ -29024,7 +29014,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.5.9-0.canary.10267";
+    return "1.5.9-0.canary.10269";
   }
 
   /**