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

package/dist/hls.js

@@ -637,7 +637,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.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();
@@ -10044,11 +10044,14 @@
       var fragmentTracker = this.fragmentTracker;
       var fragState = fragmentTracker.getState(frag);
       if (fragState === FragmentState.APPENDING) {
-        // Lower the buffer size and try again
+        // Lower the max buffer length and try again
         var playlistType = frag.type;
         var bufferedInfo = this.getFwdBufferInfo(this.mediaBuffer, playlistType);
         var 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
+        var backtrackFragment = this.backtrackFragment;
+        var 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) {
@@ -10549,10 +10552,11 @@
     _proto.reduceMaxBufferLength = function reduceMaxBufferLength(threshold) {
       var config = this.config;
       var minLength = threshold || config.maxBufferLength;
-      if (config.maxMaxBufferLength >= minLength) {
+      var 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;
@@ -20720,11 +20724,7 @@
    * Utils
    */
   var getCharForByte = function getCharForByte(_byte) {
-    var charCode = _byte;
-    if (specialCea608CharsCodes.hasOwnProperty(_byte)) {
-      charCode = specialCea608CharsCodes[_byte];
-    }
-    return String.fromCharCode(charCode);
+    return String.fromCharCode(specialCea608CharsCodes[_byte] || _byte);
   };
   var NR_ROWS = 15;
   var NR_COLS = 100;
@@ -21443,44 +21443,67 @@
      * Add data for time t in forms of list of bytes (unsigned ints). The bytes are treated as pairs.
      */;
     _proto7.addData = function addData(time, byteList) {
-      var cmdFound;
-      var a;
-      var b;
-      var charsFound = false;
+      var _this5 = this;
       this.logger.time = time;
-      for (var i = 0; i < byteList.length; i += 2) {
-        a = byteList[i] & 0x7f;
-        b = byteList[i + 1] & 0x7f;
-        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);
-        }
-        if (!cmdFound) {
-          charsFound = this.parseChars(a, b);
-          if (charsFound) {
-            var currChNr = this.currentChannel;
-            if (currChNr && currChNr > 0) {
-              var channel = this.channels[currChNr];
-              channel.insertChars(charsFound);
-            } else {
-              this.logger.log(2, 'No channel found yet. TEXT-MODE?');
+      var _loop = function _loop(i) {
+          var a = byteList[i] & 0x7f;
+          var b = byteList[i + 1] & 0x7f;
+          var cmdFound = false;
+          var charsFound = null;
+          if (a === 0 && b === 0) {
+            return 0; // continue
+          } else {
+            _this5.logger.log(3, function () {
+              return '[' + numArrayToHexArray([byteList[i], byteList[i + 1]]) + '] -> (' + numArrayToHexArray([a, b]) + ')';
+            });
+          }
+          var cmdHistory = _this5.cmdHistory;
+          var isControlCode = a >= 0x10 && a <= 0x1f;
+          if (isControlCode) {
+            // Skip redundant control codes
+            if (hasCmdRepeated(a, b, cmdHistory)) {
+              setLastCmd(null, null, cmdHistory);
+              _this5.logger.log(3, function () {
+                return 'Repeated command (' + numArrayToHexArray([a, b]) + ') is dropped';
+              });
+              return 0; // continue
+            }
+            setLastCmd(a, b, _this5.cmdHistory);
+            cmdFound = _this5.parseCmd(a, b);
+            if (!cmdFound) {
+              cmdFound = _this5.parseMidrow(a, b);
+            }
+            if (!cmdFound) {
+              cmdFound = _this5.parsePAC(a, b);
+            }
+            if (!cmdFound) {
+              cmdFound = _this5.parseBackgroundAttributes(a, b);
+            }
+          } else {
+            setLastCmd(null, null, cmdHistory);
+          }
+          if (!cmdFound) {
+            charsFound = _this5.parseChars(a, b);
+            if (charsFound) {
+              var currChNr = _this5.currentChannel;
+              if (currChNr && currChNr > 0) {
+                var channel = _this5.channels[currChNr];
+                channel.insertChars(charsFound);
+              } else {
+                _this5.logger.log(2, 'No channel found yet. TEXT-MODE?');
+              }
             }
           }
-        }
-        if (!cmdFound && !charsFound) {
-          this.logger.log(2, "Couldn't parse cleaned data " + numArrayToHexArray([a, b]) + ' orig: ' + numArrayToHexArray([byteList[i], byteList[i + 1]]));
-        }
+          if (!cmdFound && !charsFound) {
+            _this5.logger.log(2, function () {
+              return "Couldn't parse cleaned data " + numArrayToHexArray([a, b]) + ' orig: ' + numArrayToHexArray([byteList[i], byteList[i + 1]]);
+            });
+          }
+        },
+        _ret;
+      for (var i = 0; i < byteList.length; i += 2) {
+        _ret = _loop(i);
+        if (_ret === 0) continue;
       }
     }
 
@@ -21489,17 +21512,11 @@
      * @returns True if a command was found
      */;
     _proto7.parseCmd = function parseCmd(a, b) {
-      var cmdHistory = this.cmdHistory;
       var cond1 = (a === 0x14 || a === 0x1c || a === 0x15 || a === 0x1d) && b >= 0x20 && b <= 0x2f;
       var 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;
-      }
       var chNr = a === 0x14 || a === 0x15 || a === 0x17 ? 1 : 2;
       var channel = this.channels[chNr];
       if (a === 0x14 || a === 0x15 || a === 0x1c || a === 0x1d) {
@@ -21540,7 +21557,6 @@
         // a == 0x17 || a == 0x1F
         channel.ccTO(b - 0x20);
       }
-      setLastCmd(a, b, cmdHistory);
       this.currentChannel = chNr;
       return true;
     }
@@ -21565,7 +21581,9 @@
           return false;
         }
         channel.ccMIDROW(b);
-        this.logger.log(3, 'MIDROW (' + numArrayToHexArray([a, b]) + ')');
+        this.logger.log(3, function () {
+          return 'MIDROW (' + numArrayToHexArray([a, b]) + ')';
+        });
         return true;
       }
       return false;
@@ -21577,16 +21595,11 @@
      */;
     _proto7.parsePAC = function parsePAC(a, b) {
       var row;
-      var cmdHistory = this.cmdHistory;
       var case1 = (a >= 0x11 && a <= 0x17 || a >= 0x19 && a <= 0x1f) && b >= 0x40 && b <= 0x7f;
       var 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)
-      }
       var chNr = a <= 0x17 ? 1 : 2;
       if (b >= 0x40 && b <= 0x5f) {
         row = chNr === 1 ? rowsLowCh1[a] : rowsLowCh2[a];
@@ -21599,7 +21612,6 @@
         return false;
       }
       channel.setPAC(this.interpretPAC(row, b));
-      setLastCmd(a, b, cmdHistory);
       this.currentChannel = chNr;
       return true;
     }
@@ -21659,15 +21671,17 @@
         } else {
           oneCode = b + 0x90;
         }
-        this.logger.log(2, "Special char '" + getCharForByte(oneCode) + "' in channel " + channelNr);
+        this.logger.log(2, function () {
+          return "Special char '" + getCharForByte(oneCode) + "' in channel " + channelNr;
+        });
         charCodes = [oneCode];
       } else if (a >= 0x20 && a <= 0x7f) {
         charCodes = b === 0 ? [a] : [a, b];
       }
       if (charCodes) {
-        var hexCodes = numArrayToHexArray(charCodes);
-        this.logger.log(3, 'Char codes =  ' + hexCodes.join(','));
-        setLastCmd(a, b, this.cmdHistory);
+        this.logger.log(3, function () {
+          return 'Char codes =  ' + numArrayToHexArray(charCodes).join(',');
+        });
       }
       return charCodes;
     }
@@ -21701,7 +21715,6 @@
       var chNr = a <= 0x17 ? 1 : 2;
       var channel = this.channels[chNr];
       channel.setBkgData(bkgData);
-      setLastCmd(a, b, this.cmdHistory);
       return true;
     }
 
@@ -21715,7 +21728,7 @@
           channel.reset();
         }
       }
-      this.cmdHistory = createCmdHistory();
+      setLastCmd(null, null, this.cmdHistory);
     }
 
     /**
@@ -23204,16 +23217,15 @@
         var cea608Parser1 = this.cea608Parser1,
           cea608Parser2 = this.cea608Parser2,
           lastSn = this.lastSn;
-        if (!cea608Parser1 || !cea608Parser2) {
-          return;
-        }
         var _data$frag = data.frag,
           cc = _data$frag.cc,
           sn = _data$frag.sn;
         var 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;
@@ -30516,7 +30528,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.9-0.canary.10267";
+        return "1.5.9-0.canary.10269";
       }
     }, {
       key: "Events",