jmuxer 2.0.4 → 2.0.6

package/dist/jmuxer.js

@@ -2,7 +2,7 @@
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('stream')) :
   typeof define === 'function' && define.amd ? define(['stream'], factory) :
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.JMuxer = factory(global.stream));
-}(this, (function (stream) { 'use strict';
+})(this, (function (stream) { 'use strict';
 
   function _typeof(obj) {
     "@babel/helpers - typeof";
@@ -94,7 +94,7 @@
     if (typeof Proxy === "function") return true;
 
     try {
-      Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
+      Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
       return true;
     } catch (e) {
       return false;
@@ -112,6 +112,8 @@
   function _possibleConstructorReturn(self, call) {
     if (call && (typeof call === "object" || typeof call === "function")) {
       return call;
+    } else if (call !== void 0) {
+      throw new TypeError("Derived constructors may only return object or undefined");
     }
 
     return _assertThisInitialized(self);
@@ -145,14 +147,17 @@
   }
 
   function _iterableToArrayLimit(arr, i) {
-    if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+
+    if (_i == null) return;
     var _arr = [];
     var _n = true;
     var _d = false;
-    var _e = undefined;
+
+    var _s, _e;
 
     try {
-      for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+      for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
         _arr.push(_s.value);
 
         if (i && _arr.length === i) break;
@@ -193,9 +198,9 @@
   }
 
   function _createForOfIteratorHelper(o, allowArrayLike) {
-    var it;
+    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
 
-    if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
+    if (!it) {
       if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
         if (it) o = it;
         var i = 0;
@@ -228,7 +233,7 @@
         err;
     return {
       s: function () {
-        it = o[Symbol.iterator]();
+        it = it.call(o);
       },
       n: function () {
         var step = it.next();
@@ -277,54 +282,6 @@
   }
 
   var NALU = /*#__PURE__*/function () {
-    _createClass(NALU, null, [{
-      key: "type",
-      value: function type(nalu) {
-        if (nalu.ntype in NALU.TYPES) {
-          return NALU.TYPES[nalu.ntype];
-        } else {
-          return 'UNKNOWN';
-        }
-      }
-    }, {
-      key: "NDR",
-      get: function get() {
-        return 1;
-      }
-    }, {
-      key: "IDR",
-      get: function get() {
-        return 5;
-      }
-    }, {
-      key: "SEI",
-      get: function get() {
-        return 6;
-      }
-    }, {
-      key: "SPS",
-      get: function get() {
-        return 7;
-      }
-    }, {
-      key: "PPS",
-      get: function get() {
-        return 8;
-      }
-    }, {
-      key: "AUD",
-      get: function get() {
-        return 9;
-      }
-    }, {
-      key: "TYPES",
-      get: function get() {
-        var _ref;
-
-        return _ref = {}, _defineProperty(_ref, NALU.IDR, 'IDR'), _defineProperty(_ref, NALU.SEI, 'SEI'), _defineProperty(_ref, NALU.SPS, 'SPS'), _defineProperty(_ref, NALU.PPS, 'PPS'), _defineProperty(_ref, NALU.NDR, 'NDR'), _defineProperty(_ref, NALU.AUD, 'AUD'), _ref;
-      }
-    }]);
-
     function NALU(data) {
       _classCallCheck(this, NALU);
 
@@ -382,6 +339,52 @@
         result.set(this.getPayload(), 4);
         return result;
       }
+    }], [{
+      key: "NDR",
+      get: function get() {
+        return 1;
+      }
+    }, {
+      key: "IDR",
+      get: function get() {
+        return 5;
+      }
+    }, {
+      key: "SEI",
+      get: function get() {
+        return 6;
+      }
+    }, {
+      key: "SPS",
+      get: function get() {
+        return 7;
+      }
+    }, {
+      key: "PPS",
+      get: function get() {
+        return 8;
+      }
+    }, {
+      key: "AUD",
+      get: function get() {
+        return 9;
+      }
+    }, {
+      key: "TYPES",
+      get: function get() {
+        var _ref;
+
+        return _ref = {}, _defineProperty(_ref, NALU.IDR, 'IDR'), _defineProperty(_ref, NALU.SEI, 'SEI'), _defineProperty(_ref, NALU.SPS, 'SPS'), _defineProperty(_ref, NALU.PPS, 'PPS'), _defineProperty(_ref, NALU.NDR, 'NDR'), _defineProperty(_ref, NALU.AUD, 'AUD'), _ref;
+      }
+    }, {
+      key: "type",
+      value: function type(nalu) {
+        if (nalu.ntype in NALU.TYPES) {
+          return NALU.TYPES[nalu.ntype];
+        } else {
+          return 'UNKNOWN';
+        }
+      }
     }]);
 
     return NALU;
@@ -424,6 +427,18 @@
     }
 
     _createClass(ExpGolomb, [{
+      key: "setData",
+      value: function setData(data) {
+        this.data = data;
+        this.index = 0;
+        this.bitLength = data.byteLength * 8;
+      }
+    }, {
+      key: "bitsAvailable",
+      get: function get() {
+        return this.bitLength - this.index;
+      }
+    }, {
       key: "skipBits",
       value: function skipBits(size) {
         // console.log(`  skip bits: size=${size}, ${this.index}.`);
@@ -538,18 +553,93 @@
       value: function readUInt() {
         return this.readBits(32);
       }
-    }, {
-      key: "bitsAvailable",
-      get: function get() {
-        return this.bitLength - this.index;
-      }
     }]);
 
     return ExpGolomb;
   }();
 
   var H264Parser = /*#__PURE__*/function () {
-    _createClass(H264Parser, null, [{
+    function H264Parser(remuxer) {
+      _classCallCheck(this, H264Parser);
+
+      this.remuxer = remuxer;
+      this.track = remuxer.mp4track;
+    }
+
+    _createClass(H264Parser, [{
+      key: "parseSPS",
+      value: function parseSPS(sps) {
+        var config = H264Parser.readSPS(new Uint8Array(sps));
+        this.track.fps = config.fps;
+        this.track.width = config.width;
+        this.track.height = config.height;
+        this.track.sps = [new Uint8Array(sps)];
+        this.track.codec = 'avc1.';
+        var codecarray = new DataView(sps.buffer, sps.byteOffset + 1, 4);
+
+        for (var i = 0; i < 3; ++i) {
+          var h = codecarray.getUint8(i).toString(16);
+
+          if (h.length < 2) {
+            h = '0' + h;
+          }
+
+          this.track.codec += h;
+        }
+      }
+    }, {
+      key: "parsePPS",
+      value: function parsePPS(pps) {
+        this.track.pps = [new Uint8Array(pps)];
+      }
+    }, {
+      key: "parseNAL",
+      value: function parseNAL(unit) {
+        if (!unit) return false;
+        var push = false;
+
+        switch (unit.type()) {
+          case NALU.IDR:
+          case NALU.NDR:
+            push = true;
+            break;
+
+          case NALU.PPS:
+            if (!this.track.pps) {
+              this.parsePPS(unit.getPayload());
+
+              if (!this.remuxer.readyToDecode && this.track.pps && this.track.sps) {
+                this.remuxer.readyToDecode = true;
+              }
+            }
+
+            push = true;
+            break;
+
+          case NALU.SPS:
+            if (!this.track.sps) {
+              this.parseSPS(unit.getPayload());
+
+              if (!this.remuxer.readyToDecode && this.track.pps && this.track.sps) {
+                this.remuxer.readyToDecode = true;
+              }
+            }
+
+            push = true;
+            break;
+
+          case NALU.AUD:
+            log('AUD - ignoing');
+            break;
+
+          case NALU.SEI:
+            log('SEI - ignoing');
+            break;
+        }
+
+        return push;
+      }
+    }], [{
       key: "extractNALu",
       value: function extractNALu(buffer) {
         var i = 0,
@@ -650,21 +740,40 @@
             frameCropBottomOffset = 0,
             sarScale = 1,
             profileIdc,
-            profileCompat,
-            levelIdc,
             numRefFramesInPicOrderCntCycle,
             picWidthInMbsMinus1,
             picHeightInMapUnitsMinus1,
             frameMbsOnlyFlag,
-            scalingListCount;
-        decoder.readUByte();
+            scalingListCount,
+            fps = 0;
+        decoder.readUByte(); // skip NAL header
+        // rewrite NAL
+
+        var rbsp = [],
+            hdr_bytes = 1,
+            nal_bytes = data.byteLength;
+
+        for (var i = hdr_bytes; i < nal_bytes; i++) {
+          if (i + 2 < nal_bytes && decoder.readBits(24, false) === 0x000003) {
+            rbsp.push(decoder.readBits(8));
+            rbsp.push(decoder.readBits(8));
+            i += 2; // emulation_prevention_three_byte
+
+            decoder.readBits(8);
+          } else {
+            rbsp.push(decoder.readBits(8));
+          }
+        }
+
+        decoder.setData(new Uint8Array(rbsp)); // end of rewrite data
+
         profileIdc = decoder.readUByte(); // profile_idc
 
-        profileCompat = decoder.readBits(5); // constraint_set[0-4]_flag, u(5)
+        decoder.readBits(5); // constraint_set[0-4]_flag, u(5)
 
         decoder.skipBits(3); // reserved_zero_3bits u(3),
 
-        levelIdc = decoder.readUByte(); // level_idc u(8)
+        decoder.readUByte(); // level_idc u(8)
 
         decoder.skipUEG(); // seq_parameter_set_id
         // some profiles have more optional data we don't need
@@ -686,10 +795,10 @@
             // seq_scaling_matrix_present_flag
             scalingListCount = chromaFormatIdc !== 3 ? 8 : 12;
 
-            for (var i = 0; i < scalingListCount; ++i) {
+            for (var _i = 0; _i < scalingListCount; ++_i) {
               if (decoder.readBoolean()) {
                 // seq_scaling_list_present_flag[ i ]
-                if (i < 6) {
+                if (_i < 6) {
                   H264Parser.skipScalingList(decoder, 16);
                 } else {
                   H264Parser.skipScalingList(decoder, 64);
@@ -714,7 +823,7 @@
 
           numRefFramesInPicOrderCntCycle = decoder.readUEG();
 
-          for (var _i = 0; _i < numRefFramesInPicOrderCntCycle; ++_i) {
+          for (var _i2 = 0; _i2 < numRefFramesInPicOrderCntCycle; ++_i2) {
             decoder.skipEG(); // offset_for_ref_frame[ i ]
           }
         }
@@ -820,7 +929,7 @@
                 }
             }
 
-            if (sarRatio) {
+            if (sarRatio && sarRatio[0] > 0 && sarRatio[1] > 0) {
               sarScale = sarRatio[0] / sarRatio[1];
             }
           }
@@ -846,10 +955,16 @@
             var unitsInTick = decoder.readUInt();
             var timeScale = decoder.readUInt();
             var fixedFrameRate = decoder.readBoolean();
+            var frameDuration = timeScale / (2 * unitsInTick);
+
+            if (fixedFrameRate) {
+              fps = frameDuration;
+            }
           }
         }
 
         return {
+          fps: fps > 0 ? fps : undefined,
           width: Math.ceil(((picWidthInMbsMinus1 + 1) * 16 - frameCropLeftOffset * 2 - frameCropRightOffset * 2) * sarScale),
           height: (2 - frameMbsOnlyFlag) * (picHeightInMapUnitsMinus1 + 1) * 16 - (frameMbsOnlyFlag ? 2 : 4) * (frameCropTopOffset + frameCropBottomOffset)
         };
@@ -865,108 +980,18 @@
       }
     }]);
 
-    function H264Parser(remuxer) {
-      _classCallCheck(this, H264Parser);
+    return H264Parser;
+  }();
+
+  var AACParser = /*#__PURE__*/function () {
+    function AACParser(remuxer) {
+      _classCallCheck(this, AACParser);
 
       this.remuxer = remuxer;
       this.track = remuxer.mp4track;
     }
 
-    _createClass(H264Parser, [{
-      key: "parseSPS",
-      value: function parseSPS(sps) {
-        var config = H264Parser.readSPS(new Uint8Array(sps));
-        this.track.width = config.width;
-        this.track.height = config.height;
-        this.track.sps = [new Uint8Array(sps)];
-        this.track.codec = 'avc1.';
-        var codecarray = new DataView(sps.buffer, sps.byteOffset + 1, 4);
-
-        for (var i = 0; i < 3; ++i) {
-          var h = codecarray.getUint8(i).toString(16);
-
-          if (h.length < 2) {
-            h = '0' + h;
-          }
-
-          this.track.codec += h;
-        }
-      }
-    }, {
-      key: "parsePPS",
-      value: function parsePPS(pps) {
-        this.track.pps = [new Uint8Array(pps)];
-      }
-    }, {
-      key: "parseNAL",
-      value: function parseNAL(unit) {
-        if (!unit) return false;
-        var push = false;
-
-        switch (unit.type()) {
-          case NALU.IDR:
-          case NALU.NDR:
-            push = true;
-            break;
-
-          case NALU.PPS:
-            if (!this.track.pps) {
-              this.parsePPS(unit.getPayload());
-
-              if (!this.remuxer.readyToDecode && this.track.pps && this.track.sps) {
-                this.remuxer.readyToDecode = true;
-              }
-            }
-
-            push = true;
-            break;
-
-          case NALU.SPS:
-            if (!this.track.sps) {
-              this.parseSPS(unit.getPayload());
-
-              if (!this.remuxer.readyToDecode && this.track.pps && this.track.sps) {
-                this.remuxer.readyToDecode = true;
-              }
-            }
-
-            push = true;
-            break;
-
-          case NALU.AUD:
-            log('AUD - ignoing');
-            break;
-
-          case NALU.SEI:
-            log('SEI - ignoing');
-            break;
-        }
-
-        return push;
-      }
-    }]);
-
-    return H264Parser;
-  }();
-
-  var aacHeader;
-  var AACParser = /*#__PURE__*/function () {
-    _createClass(AACParser, null, [{
-      key: "getHeaderLength",
-      value: function getHeaderLength(data) {
-        return data[1] & 0x01 ? 7 : 9; // without CRC 7 and with CRC 9 Refs: https://wiki.multimedia.cx/index.php?title=ADTS
-      }
-    }, {
-      key: "getFrameLength",
-      value: function getFrameLength(data) {
-        return (data[3] & 0x03) << 11 | data[4] << 3 | (data[5] & 0xE0) >>> 5; // 13 bits length ref: https://wiki.multimedia.cx/index.php?title=ADTS
-      }
-    }, {
-      key: "isAACPattern",
-      value: function isAACPattern(data) {
-        return data[0] === 0xff && (data[1] & 0xf0) === 0xf0 && (data[1] & 0x06) === 0x00;
-      }
-    }, {
+    _createClass(AACParser, [{
       key: "extractAAC",
       value: function extractAAC(buffer) {
         var i = 0,
@@ -982,8 +1007,8 @@
 
         headerLength = AACParser.getHeaderLength(buffer);
 
-        if (!aacHeader) {
-          aacHeader = buffer.subarray(0, headerLength);
+        if (!this.aacHeader) {
+          this.aacHeader = buffer.subarray(0, headerLength);
         }
 
         while (i < length) {
@@ -996,32 +1021,13 @@
         return result;
       }
     }, {
-      key: "samplingRateMap",
-      get: function get() {
-        return [96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350];
-      }
-    }, {
-      key: "getAACHeaderData",
-      get: function get() {
-        return aacHeader;
-      }
-    }]);
-
-    function AACParser(remuxer) {
-      _classCallCheck(this, AACParser);
-
-      this.remuxer = remuxer;
-      this.track = remuxer.mp4track;
-    }
-
-    _createClass(AACParser, [{
       key: "setAACConfig",
       value: function setAACConfig() {
         var objectType,
             sampleIndex,
             channelCount,
             config = new Uint8Array(2),
-            headerData = AACParser.getAACHeaderData;
+            headerData = this.aacHeader;
         if (!headerData) return;
         objectType = ((headerData[2] & 0xC0) >>> 6) + 1;
         sampleIndex = (headerData[2] & 0x3C) >>> 2;
@@ -1038,6 +1044,26 @@
         this.track.config = config;
         this.remuxer.readyToDecode = true;
       }
+    }], [{
+      key: "samplingRateMap",
+      get: function get() {
+        return [96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350];
+      }
+    }, {
+      key: "getHeaderLength",
+      value: function getHeaderLength(data) {
+        return data[1] & 0x01 ? 7 : 9; // without CRC 7 and with CRC 9 Refs: https://wiki.multimedia.cx/index.php?title=ADTS
+      }
+    }, {
+      key: "getFrameLength",
+      value: function getFrameLength(data) {
+        return (data[3] & 0x03) << 11 | data[4] << 3 | (data[5] & 0xE0) >>> 5; // 13 bits length ref: https://wiki.multimedia.cx/index.php?title=ADTS
+      }
+    }, {
+      key: "isAACPattern",
+      value: function isAACPattern(data) {
+        return data[0] === 0xff && (data[1] & 0xf0) === 0xf0 && (data[1] & 0x06) === 0x00;
+      }
     }]);
 
     return AACParser;
@@ -1719,8 +1745,8 @@
         this.dts = this.nextDts;
 
         while (this.samples.length) {
-          var sample = this.samples.shift(),
-              units = sample.units;
+          var sample = this.samples.shift();
+              sample.units;
           duration = sample.duration;
 
           if (duration <= 0) {
@@ -1750,6 +1776,11 @@
         if (!samples.length) return null;
         return new Uint8Array(payload.buffer, 0, this.mp4track.len);
       }
+    }, {
+      key: "getAacParser",
+      value: function getAacParser() {
+        return this.aac;
+      }
     }]);
 
     return AACRemuxer;
@@ -1776,6 +1807,7 @@
         fragmented: true,
         sps: '',
         pps: '',
+        fps: 30,
         width: 0,
         height: 0,
         timescale: timescale,
@@ -1832,7 +1864,8 @@
                 units: units,
                 size: size,
                 keyFrame: frame.keyFrame,
-                duration: frame.duration
+                duration: frame.duration,
+                compositionTimeOffset: frame.compositionTimeOffset
               });
             }
           }
@@ -1870,7 +1903,7 @@
           mp4Sample = {
             size: sample.size,
             duration: duration,
-            cts: 0,
+            cts: sample.compositionTimeOffset || 0,
             flags: {
               isLeading: 0,
               isDependedOn: 0,
@@ -1925,6 +1958,7 @@
       _this.env = env;
       _this.timescale = 1000;
       _this.mediaDuration = 0;
+      _this.aacParser = null;
       return _this;
     }
 
@@ -1937,7 +1971,9 @@
         }
 
         if (type === 'audio' || type === 'both') {
-          this.tracks.audio = new AACRemuxer(this.timescale);
+          var aacRemuxer = new AACRemuxer(this.timescale);
+          this.aacParser = aacRemuxer.getAacParser();
+          this.tracks.audio = aacRemuxer;
           this.trackTypes.push('audio');
         }
       }
@@ -1995,6 +2031,11 @@
                   payload: payload,
                   dts: track.dts
                 };
+
+                if (type === 'video') {
+                  data.fps = track.mp4track.fps;
+                }
+
                 this.dispatch('buffer', data);
                 var duration = secToTime(track.dts / this.timescale);
                 log("put segment (".concat(type, "): dts: ").concat(track.dts, " frames: ").concat(track.mp4track.samples.length, " second: ").concat(duration));
@@ -2166,55 +2207,55 @@
     }, {
       key: "initCleanup",
       value: function initCleanup(cleanMaxLimit) {
-        if (this.sourceBuffer.updating) {
-          this.pendingCleaning = cleanMaxLimit;
-          return;
-        }
+        try {
+          if (this.sourceBuffer.updating) {
+            this.pendingCleaning = cleanMaxLimit;
+            return;
+          }
 
-        if (this.sourceBuffer.buffered && this.sourceBuffer.buffered.length && !this.cleaning) {
-          for (var i = 0; i < this.sourceBuffer.buffered.length; ++i) {
-            var start = this.sourceBuffer.buffered.start(i);
-            var end = this.sourceBuffer.buffered.end(i);
+          if (this.sourceBuffer.buffered && this.sourceBuffer.buffered.length && !this.cleaning) {
+            for (var i = 0; i < this.sourceBuffer.buffered.length; ++i) {
+              var start = this.sourceBuffer.buffered.start(i);
+              var end = this.sourceBuffer.buffered.end(i);
 
-            if (cleanMaxLimit - start > this.cleanOffset) {
-              end = cleanMaxLimit - this.cleanOffset;
+              if (cleanMaxLimit - start > this.cleanOffset) {
+                end = cleanMaxLimit - this.cleanOffset;
 
-              if (start < end) {
-                this.cleanRanges.push([start, end]);
+                if (start < end) {
+                  this.cleanRanges.push([start, end]);
+                }
               }
             }
-          }
 
-          this.doCleanup();
+            this.doCleanup();
+          }
+        } catch (e) {
+          error("Error occured while cleaning ".concat(this.type, " buffer - ").concat(e.name, ": ").concat(e.message));
         }
       }
     }, {
       key: "doAppend",
       value: function doAppend() {
         if (!this.queue.length) return;
-
-        if (this.sourceBuffer.updating) {
-          return;
-        }
+        if (!this.sourceBuffer || this.sourceBuffer.updating) return;
 
         try {
           this.sourceBuffer.appendBuffer(this.queue);
           this.queue = new Uint8Array();
         } catch (e) {
+          var name = 'unexpectedError';
+
           if (e.name === 'QuotaExceededError') {
             log("".concat(this.type, " buffer quota full"));
-            this.dispatch('error', {
-              type: this.type,
-              name: 'QuotaExceeded',
-              error: 'buffer error'
-            });
-            return;
+            name = 'QuotaExceeded';
+          } else {
+            error("Error occured while appending ".concat(this.type, " buffer - ").concat(e.name, ": ").concat(e.message));
+            name = 'InvalidStateError';
           }
 
-          error("Error occured while appending ".concat(this.type, " buffer -  ").concat(e.name, ": ").concat(e.message));
           this.dispatch('error', {
             type: this.type,
-            name: 'unexpectedError',
+            name: name,
             error: 'buffer error'
           });
         }
@@ -2234,26 +2275,23 @@
 
     var _super = _createSuper(JMuxer);
 
-    _createClass(JMuxer, null, [{
-      key: "isSupported",
-      value: function isSupported(codec) {
-        return window.MediaSource && window.MediaSource.isTypeSupported(codec);
-      }
-    }]);
-
     function JMuxer(options) {
       var _this;
 
       _classCallCheck(this, JMuxer);
 
       _this = _super.call(this, 'jmuxer');
+      _this.isReset = false;
       var defaults = {
         node: '',
         mode: 'both',
         // both, audio, video
-        flushingTime: 1500,
+        flushingTime: 500,
+        maxDelay: 500,
         clearBuffer: true,
         fps: 30,
+        readFpsFromTrack: false,
+        // set true to fetch fps value from NALu
         debug: false,
         onReady: function onReady() {},
         // function called when MSE is ready to accept frames
@@ -2276,13 +2314,10 @@
 
       _this.remuxController.addTrack(_this.options.mode);
 
-      _this.lastCleaningTime = Date.now();
-      _this.kfPosition = [];
-      _this.kfCounter = 0;
-      _this.pendingUnits = {};
-      _this.remainingData = new Uint8Array();
+      _this.initData();
       /* events callback */
 
+
       _this.remuxController.on('buffer', _this.onBuffer.bind(_assertThisInitialized(_this)));
 
       if (_this.env == 'browser') {
@@ -2291,12 +2326,20 @@
         _this.initBrowser();
       }
 
-      _this.startInterval();
-
       return _this;
     }
 
     _createClass(JMuxer, [{
+      key: "initData",
+      value: function initData() {
+        this.lastCleaningTime = Date.now();
+        this.kfPosition = [];
+        this.kfCounter = 0;
+        this.pendingUnits = {};
+        this.remainingData = new Uint8Array();
+        this.startInterval();
+      }
+    }, {
       key: "initBrowser",
       value: function initBrowser() {
         if (typeof this.options.node === 'string' && this.options.node == '') {
@@ -2380,21 +2423,26 @@
 
           slices = _H264Parser$extractNA2[0];
           left = _H264Parser$extractNA2[1];
+          this.remainingData = left || new Uint8Array();
 
           if (slices.length > 0) {
-            chunks.video = this.getVideoFrames(slices, duration);
+            chunks.video = this.getVideoFrames(slices, duration, data.compositionTimeOffset);
             remux = true;
+          } else {
+            error('Failed to extract any NAL units from video data:', left);
+            return;
           }
-
-          this.remainingData = left || new Uint8Array();
         }
 
         if (data.audio) {
-          slices = AACParser.extractAAC(data.audio);
+          slices = this.remuxController.aacParser.extractAAC(data.audio);
 
           if (slices.length > 0) {
             chunks.audio = this.getAudioFrames(slices, duration);
             remux = true;
+          } else {
+            error('Failed to extract audio data from:', data.audio);
+            return;
           }
         }
 
@@ -2407,7 +2455,7 @@
       }
     }, {
       key: "getVideoFrames",
-      value: function getVideoFrames(nalus, duration) {
+      value: function getVideoFrames(nalus, duration, compositionTimeOffset) {
         var _this2 = this;
 
         var units = [],
@@ -2471,7 +2519,10 @@
             });
           } else {
             var last = frames.length - 1;
-            frames[last].units = frames[last].units.concat(units);
+
+            if (last >= 0) {
+              frames[last].units = frames[last].units.concat(units);
+            }
           }
         }
 
@@ -2479,6 +2530,7 @@
         tt = duration ? duration - fd * frames.length : 0;
         frames.map(function (frame) {
           frame.duration = fd;
+          frame.compositionTimeOffset = compositionTimeOffset;
 
           if (tt > 0) {
             frame.duration++;
@@ -2562,6 +2614,8 @@
     }, {
       key: "reset",
       value: function reset() {
+        this.stopInterval();
+        this.isReset = true;
         this.node.pause();
 
         if (this.remuxController) {
@@ -2577,6 +2631,8 @@
           this.endMSE();
         }
 
+        this.initData();
+
         if (this.env == 'browser') {
           this.initBrowser();
         }
@@ -2608,12 +2664,12 @@
         var _this3 = this;
 
         this.interval = setInterval(function () {
-          if (_this3.bufferControllers) {
-            _this3.releaseBuffer();
-
-            _this3.clearBuffer();
+          if (_this3.options.flushingTime) {
+            _this3.applyAndClearBuffer();
+          } else if (_this3.bufferControllers) {
+            _this3.cancelDelay();
           }
-        }, this.options.flushingTime);
+        }, this.options.flushingTime || 1000);
       }
     }, {
       key: "stopInterval",
@@ -2622,6 +2678,18 @@
           clearInterval(this.interval);
         }
       }
+    }, {
+      key: "cancelDelay",
+      value: function cancelDelay() {
+        if (this.node.buffered && this.node.buffered.length > 0 && !this.node.seeking) {
+          var end = this.node.buffered.end(0);
+
+          if (end - this.node.currentTime > this.options.maxDelay / 1000) {
+            console.log('delay');
+            this.node.currentTime = end - 0.001;
+          }
+        }
+      }
     }, {
       key: "releaseBuffer",
       value: function releaseBuffer() {
@@ -2629,6 +2697,14 @@
           this.bufferControllers[type].doAppend();
         }
       }
+    }, {
+      key: "applyAndClearBuffer",
+      value: function applyAndClearBuffer() {
+        if (this.bufferControllers) {
+          this.releaseBuffer();
+          this.clearBuffer();
+        }
+      }
     }, {
       key: "getSafeClearOffsetOfBuffer",
       value: function getSafeClearOffsetOfBuffer(offset) {
@@ -2670,6 +2746,12 @@
     }, {
       key: "onBuffer",
       value: function onBuffer(data) {
+        if (this.options.readFpsFromTrack && typeof data.fps !== 'undefined' && this.options.fps != data.fps) {
+          this.options.fps = data.fps;
+          this.frameDuration = Math.ceil(1000 / data.fps);
+          log("JMuxer changed FPS to ".concat(data.fps, " from track data"));
+        }
+
         if (this.env == 'browser') {
           if (this.bufferControllers && this.bufferControllers[data.type]) {
             this.bufferControllers[data.type].feed(data.payload);
@@ -2677,6 +2759,10 @@
         } else if (this.stream) {
           this.stream.push(data.payload);
         }
+
+        if (this.options.flushingTime === 0) {
+          this.applyAndClearBuffer();
+        }
       }
       /* Events on MSE */
 
@@ -2684,13 +2770,11 @@
       key: "onMSEOpen",
       value: function onMSEOpen() {
         this.mseReady = true;
+        URL.revokeObjectURL(this.url); // this.createBuffer();
 
         if (typeof this.options.onReady === 'function') {
-          this.options.onReady.call(null);
+          this.options.onReady.call(null, this.isReset);
         }
-
-        URL.revokeObjectURL(this.url);
-        this.createBuffer();
       }
     }, {
       key: "onMSEClose",
@@ -2702,8 +2786,12 @@
       key: "onBufferError",
       value: function onBufferError(data) {
         if (data.name == 'QuotaExceeded') {
+          log("JMuxer cleaning ".concat(data.type, " buffer due to QuotaExceeded error"));
           this.bufferControllers[data.type].initCleanup(this.node.currentTime);
           return;
+        } else if (data.name == 'InvalidStateError') {
+          log('JMuxer is reseting due to InvalidStateError');
+          this.reset();
         } else {
           this.endMSE();
         }
@@ -2712,6 +2800,11 @@
           this.options.onError.call(null, data);
         }
       }
+    }], [{
+      key: "isSupported",
+      value: function isSupported(codec) {
+        return window.MediaSource && window.MediaSource.isTypeSupported(codec);
+      }
     }]);
 
     return JMuxer;
@@ -2719,4 +2812,4 @@
 
   return JMuxer;
 
-})));
+}));