stormcloud-video-player 0.3.57 → 0.3.59

package/lib/index.cjs

@@ -3450,6 +3450,12 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         this.adRequestQueue = [];
         this.maxPlaceholderDurationMs = 5e3;
         this.isShowingPlaceholder = false;
+        this.tsScte35Pids = /* @__PURE__ */ new Set();
+        this.pmtPids = /* @__PURE__ */ new Set();
+        this.processedTsScte35Sections = /* @__PURE__ */ new Set();
+        this.pendingScte35Cues = /* @__PURE__ */ new Map();
+        this.recentScte35CueKeys = /* @__PURE__ */ new Map();
+        this.recentScte35CueLimit = 200;
         this.totalAdRequestsInBreak = 0;
         this.maxTotalAdRequestsPerBreak = 10;
         this.pendingAdBreak = null;
@@ -3719,7 +3725,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                                         if (_this.config.debugAdTiming) {
                                                             console.log("[StormcloudVideoPlayer] \uD83C\uDFAF EARLY SCTE-35 DETECTION: Ad break marker found in fragment", i, "- starting pre-fetch (NOT playing yet)");
                                                         }
-                                                        _this.startAdPrefetch(marker, frag === null || frag === void 0 ? void 0 : frag.sn);
+                                                        _this.onScte35Cue(marker, _object_spread({}, _this.createScte35CueContext("manifest", "early", frag)));
                                                         return;
                                                     }
                                                 }
@@ -3800,10 +3806,21 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                         return _this.onId3Tag(tag);
                                     });
                                 });
+                                this.hls.on(import_hls2.default.Events.FRAG_LOADED, function(_evt, data) {
+                                    var _data_frag;
+                                    _this.processFragmentScte35Payload(data === null || data === void 0 ? void 0 : data.payload, typeof (data === null || data === void 0 ? void 0 : (_data_frag = data.frag) === null || _data_frag === void 0 ? void 0 : _data_frag.sn) === "number" ? data.frag.sn : void 0, _this.getFragmentStartSeconds(data === null || data === void 0 ? void 0 : data.frag));
+                                });
+                                this.hls.on(import_hls2.default.Events.FRAG_DECRYPTED, function(_evt, data) {
+                                    var _data_frag;
+                                    _this.processFragmentScte35Payload(data === null || data === void 0 ? void 0 : data.payload, typeof (data === null || data === void 0 ? void 0 : (_data_frag = data.frag) === null || _data_frag === void 0 ? void 0 : _data_frag.sn) === "number" ? data.frag.sn : void 0, _this.getFragmentStartSeconds(data === null || data === void 0 ? void 0 : data.frag));
+                                });
                                 this.hls.on(import_hls2.default.Events.FRAG_CHANGED, function(_evt, data) {
                                     var frag = data === null || data === void 0 ? void 0 : data.frag;
                                     var tagList = frag === null || frag === void 0 ? void 0 : frag.tagList;
-                                    if (!Array.isArray(tagList)) return;
+                                    if (!Array.isArray(tagList)) {
+                                        _this.activatePendingScte35CuesForFragment(frag);
+                                        return;
+                                    }
                                     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                                     try {
                                         for(var _iterator = tagList[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
@@ -3839,7 +3856,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                                         value: value
                                                     }
                                                 });
-                                                _this.onScte35Marker(marker);
+                                                _this.onScte35Cue(marker, _object_spread({}, _this.createScte35CueContext("manifest", "playback", frag)));
                                             } else if (tag.includes("EXT-X-CUE-OUT")) {
                                                 var durationSeconds = _this.parseCueOutDuration(value);
                                                 var marker1 = _object_spread_props(_object_spread({
@@ -3852,15 +3869,15 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                                         value: value
                                                     }
                                                 });
-                                                _this.onScte35Marker(marker1);
+                                                _this.onScte35Cue(marker1, _object_spread({}, _this.createScte35CueContext("manifest", "playback", frag)));
                                             } else if (tag.includes("EXT-X-CUE-IN")) {
-                                                _this.onScte35Marker({
+                                                _this.onScte35Cue({
                                                     type: "end",
                                                     raw: {
                                                         tag: tag,
                                                         value: value
                                                     }
-                                                });
+                                                }, _object_spread({}, _this.createScte35CueContext("manifest", "playback", frag)));
                                             } else if (tag.includes("EXT-X-DATERANGE")) {
                                                 var _attrs_CLASS;
                                                 var attrs = _this.parseAttributeList(value);
@@ -3880,17 +3897,17 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                                             attrs: attrs
                                                         }
                                                     });
-                                                    _this.onScte35Marker(marker2);
+                                                    _this.onScte35Cue(marker2, _object_spread({}, _this.createScte35CueContext("manifest", "playback", frag)));
                                                 }
                                                 if (hasScteIn) {
-                                                    _this.onScte35Marker({
+                                                    _this.onScte35Cue({
                                                         type: "end",
                                                         raw: {
                                                             tag: tag,
                                                             value: value,
                                                             attrs: attrs
                                                         }
-                                                    });
+                                                    }, _object_spread({}, _this.createScte35CueContext("manifest", "playback", frag)));
                                                 }
                                             }
                                         }
@@ -3908,6 +3925,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                             }
                                         }
                                     }
+                                    _this.activatePendingScte35CuesForFragment(frag);
                                 });
                                 this.hls.on(import_hls2.default.Events.ERROR, function(_evt, data) {
                                     if (data === null || data === void 0 ? void 0 : data.fatal) {
@@ -4213,7 +4231,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }
                 var marker = this.parseScte35FromId3(tag);
                 if (marker) {
-                    this.onScte35Marker(marker);
+                    this.onScte35Cue(marker, {
+                        source: "id3",
+                        readiness: "playback"
+                    });
                 }
             }
         },
@@ -4357,9 +4378,251 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }
             }
         },
+        {
+            key: "createScte35CueContext",
+            value: function createScte35CueContext(source, readiness, frag) {
+                var context = {
+                    source: source,
+                    readiness: readiness
+                };
+                if (typeof (frag === null || frag === void 0 ? void 0 : frag.sn) === "number") {
+                    context.fragmentSn = frag.sn;
+                }
+                var fragmentStartSeconds = this.getFragmentStartSeconds(frag);
+                if (fragmentStartSeconds !== void 0) {
+                    context.fragmentStartSeconds = fragmentStartSeconds;
+                }
+                return context;
+            }
+        },
+        {
+            key: "getFragmentStartSeconds",
+            value: function getFragmentStartSeconds(frag) {
+                var candidates = [
+                    frag === null || frag === void 0 ? void 0 : frag.start,
+                    frag === null || frag === void 0 ? void 0 : frag.startPTS
+                ];
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = candidates[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var candidate = _step.value;
+                        if (typeof candidate === "number" && Number.isFinite(candidate)) {
+                            return candidate;
+                        }
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
+                }
+                return void 0;
+            }
+        },
+        {
+            key: "onScte35Cue",
+            value: function onScte35Cue(marker, context) {
+                var cue = this.createScte35Cue(marker, context);
+                var pendingKey = this.getPendingScte35CueKey(cue);
+                if (context.readiness === "early") {
+                    this.pendingScte35Cues.set(pendingKey, cue);
+                    this.trimRecentScte35CueMaps();
+                    if (marker.type === "start") {
+                        this.startAdPrefetch(marker, context.fragmentSn, cue.key);
+                    }
+                    return;
+                }
+                if (marker.type === "end" && !this.shouldAcceptScte35EndCue(cue)) {
+                    if (this.config.debugAdTiming) {
+                        console.log("[StormcloudVideoPlayer] Ignoring SCTE-35 end cue", {
+                            key: cue.key,
+                            activeScte35BreakKey: this.activeScte35BreakKey,
+                            inAdBreak: this.inAdBreak,
+                            source: cue.source
+                        });
+                    }
+                    return;
+                }
+                if (marker.type === "start" && this.hasRecentlyHandledScte35Cue(cue)) {
+                    if (this.config.debugAdTiming) {
+                        console.log("[StormcloudVideoPlayer] Ignoring duplicate SCTE-35 start cue", {
+                            key: cue.key,
+                            source: cue.source
+                        });
+                    }
+                    return;
+                }
+                this.pendingScte35Cues.delete(pendingKey);
+                this.markScte35CueHandled(cue);
+                this.onScte35Marker(marker, cue.key);
+            }
+        },
+        {
+            key: "createScte35Cue",
+            value: function createScte35Cue(marker, context) {
+                var cue = {
+                    marker: marker,
+                    source: context.source,
+                    readiness: context.readiness,
+                    key: this.getScte35CueKey(marker, context)
+                };
+                if (context.fragmentSn !== void 0) {
+                    cue.fragmentSn = context.fragmentSn;
+                }
+                if (context.fragmentStartSeconds !== void 0) {
+                    cue.fragmentStartSeconds = context.fragmentStartSeconds;
+                }
+                return cue;
+            }
+        },
+        {
+            key: "getScte35CueKey",
+            value: function getScte35CueKey(marker, context) {
+                var _raw_attrs, _raw_attrs1, _raw_attrs2;
+                var raw = this.getScte35MarkerRaw(marker);
+                var spliceEventId = this.toIdentityString(raw === null || raw === void 0 ? void 0 : raw.splice_event_id);
+                if (spliceEventId) {
+                    return "splice:".concat(spliceEventId);
+                }
+                var segmentationEventId = this.toIdentityString(raw === null || raw === void 0 ? void 0 : raw.segmentation_event_id);
+                if (segmentationEventId) {
+                    return "segmentation:".concat(segmentationEventId);
+                }
+                var daterangeId = this.toIdentityString(raw === null || raw === void 0 ? void 0 : (_raw_attrs = raw.attrs) === null || _raw_attrs === void 0 ? void 0 : _raw_attrs.ID);
+                if (daterangeId) {
+                    return "daterange:".concat(daterangeId);
+                }
+                var scteValue = this.toIdentityString(raw === null || raw === void 0 ? void 0 : (_raw_attrs1 = raw.attrs) === null || _raw_attrs1 === void 0 ? void 0 : _raw_attrs1["SCTE35-OUT"]) || this.toIdentityString(raw === null || raw === void 0 ? void 0 : (_raw_attrs2 = raw.attrs) === null || _raw_attrs2 === void 0 ? void 0 : _raw_attrs2["SCTE35-IN"]);
+                if (scteValue) {
+                    return "daterange-scte:".concat(scteValue);
+                }
+                if (typeof marker.ptsSeconds === "number" && Number.isFinite(marker.ptsSeconds)) {
+                    return "pts:".concat(Math.round(marker.ptsSeconds * 2) / 2);
+                }
+                if (context.fragmentSn !== void 0) {
+                    return "fragment:".concat(context.fragmentSn);
+                }
+                return "".concat(context.source, ":wallclock:").concat(Math.floor(Date.now() / 1e3));
+            }
+        },
+        {
+            key: "getPendingScte35CueKey",
+            value: function getPendingScte35CueKey(cue) {
+                return "".concat(cue.marker.type, ":").concat(cue.key, ":").concat(cue.fragmentSn !== void 0 ? cue.fragmentSn : "unknown");
+            }
+        },
+        {
+            key: "getScte35MarkerRaw",
+            value: function getScte35MarkerRaw(marker) {
+                return _type_of(marker.raw) === "object" && marker.raw !== null ? marker.raw : {};
+            }
+        },
+        {
+            key: "toIdentityString",
+            value: function toIdentityString(value) {
+                if (typeof value === "number" && Number.isFinite(value)) {
+                    return String(value);
+                }
+                if (typeof value === "string" && value.trim().length > 0) {
+                    return value.trim();
+                }
+                return void 0;
+            }
+        },
+        {
+            key: "isStrongScte35CueKey",
+            value: function isStrongScte35CueKey(key) {
+                return !!(key && (key.startsWith("splice:") || key.startsWith("segmentation:") || key.startsWith("daterange:") || key.startsWith("daterange-scte:")));
+            }
+        },
+        {
+            key: "hasRecentlyHandledScte35Cue",
+            value: function hasRecentlyHandledScte35Cue(cue) {
+                if (this.activeScte35BreakKey === cue.key || this.scheduledScte35BreakKey === cue.key) {
+                    return true;
+                }
+                var recentKey = "".concat(cue.marker.type, ":").concat(cue.key);
+                return this.recentScte35CueKeys.has(recentKey);
+            }
+        },
+        {
+            key: "markScte35CueHandled",
+            value: function markScte35CueHandled(cue) {
+                this.recentScte35CueKeys.set("".concat(cue.marker.type, ":").concat(cue.key), Date.now());
+                this.trimRecentScte35CueMaps();
+            }
+        },
+        {
+            key: "trimRecentScte35CueMaps",
+            value: function trimRecentScte35CueMaps() {
+                while(this.recentScte35CueKeys.size > this.recentScte35CueLimit){
+                    var firstKey = this.recentScte35CueKeys.keys().next().value;
+                    if (!firstKey) {
+                        break;
+                    }
+                    this.recentScte35CueKeys.delete(firstKey);
+                }
+                while(this.pendingScte35Cues.size > this.recentScte35CueLimit){
+                    var firstKey1 = this.pendingScte35Cues.keys().next().value;
+                    if (!firstKey1) {
+                        break;
+                    }
+                    this.pendingScte35Cues.delete(firstKey1);
+                }
+            }
+        },
+        {
+            key: "shouldAcceptScte35EndCue",
+            value: function shouldAcceptScte35EndCue(cue) {
+                if (!this.inAdBreak) {
+                    return false;
+                }
+                if (this.isStrongScte35CueKey(this.activeScte35BreakKey) && this.isStrongScte35CueKey(cue.key) && this.activeScte35BreakKey !== cue.key) {
+                    return false;
+                }
+                return true;
+            }
+        },
+        {
+            key: "activatePendingScte35CuesForFragment",
+            value: function activatePendingScte35CuesForFragment(frag) {
+                var _this = this;
+                var fragmentSn = typeof (frag === null || frag === void 0 ? void 0 : frag.sn) === "number" ? frag.sn : void 0;
+                if (fragmentSn === void 0) {
+                    return;
+                }
+                var matchingCues = Array.from(this.pendingScte35Cues.entries()).filter(function(param) {
+                    var _param = _sliced_to_array(param, 2), cue = _param[1];
+                    return cue.fragmentSn === fragmentSn;
+                });
+                matchingCues.forEach(function(param) {
+                    var _param = _sliced_to_array(param, 2), pendingKey = _param[0], cue = _param[1];
+                    var _cue_fragmentStartSeconds;
+                    _this.pendingScte35Cues.delete(pendingKey);
+                    var context = {
+                        source: cue.source,
+                        readiness: "playback"
+                    };
+                    context.fragmentSn = fragmentSn;
+                    var fragmentStartSeconds = (_cue_fragmentStartSeconds = cue.fragmentStartSeconds) !== null && _cue_fragmentStartSeconds !== void 0 ? _cue_fragmentStartSeconds : _this.getFragmentStartSeconds(frag);
+                    if (fragmentStartSeconds !== void 0) {
+                        context.fragmentStartSeconds = fragmentStartSeconds;
+                    }
+                    _this.onScte35Cue(cue.marker, context);
+                });
+            }
+        },
         {
             key: "onScte35Marker",
-            value: function onScte35Marker(marker) {
+            value: function onScte35Marker(marker, cueKey) {
                 if (this.config.debugAdTiming) {
                     console.log("[StormcloudVideoPlayer] SCTE-35 marker detected:", {
                         type: marker.type,
@@ -4373,13 +4636,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 if (marker.type === "start") {
                     var _this_config_immediateManifestAds;
                     var _this_pendingAdBreak;
-                    if (!this.video.muted) {
-                        this.video.muted = true;
-                        this.video.volume = 0;
-                        if (this.config.debugAdTiming) {
-                            console.log("[StormcloudVideoPlayer] Muted video on SCTE start marker");
-                        }
-                    }
                     if (this.inAdBreak) {
                         if (marker.durationSeconds != null) {
                             var newDurationMs = marker.durationSeconds * 1e3;
@@ -4403,10 +4659,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         sendAdDetectTracking(this.config.licenseKey, detectPayload).catch(function() {});
                     }
                     var hasPrefetchedAds = this.pendingAdBreak && this.pendingAdBreak.vastUrls.length > 0;
-                    this.inAdBreak = true;
                     var durationMs = marker.durationSeconds != null ? marker.durationSeconds * 1e3 : ((_this_pendingAdBreak = this.pendingAdBreak) === null || _this_pendingAdBreak === void 0 ? void 0 : _this_pendingAdBreak.marker.durationSeconds) != null ? this.pendingAdBreak.marker.durationSeconds * 1e3 : void 0;
-                    this.expectedAdBreakDurationMs = durationMs;
-                    this.currentAdBreakStartWallClockMs = Date.now();
                     var isManifestMarker = this.isManifestBasedMarker(marker);
                     var forceImmediate = (_this_config_immediateManifestAds = this.config.immediateManifestAds) !== null && _this_config_immediateManifestAds !== void 0 ? _this_config_immediateManifestAds : true;
                     if (this.config.debugAdTiming) {
@@ -4422,7 +4675,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             console.log("[StormcloudVideoPlayer] Starting ad immediately (manifest-based)".concat(hasPrefetchedAds ? " with prefetched ads" : ""));
                         }
                         this.clearAdStartTimer();
-                        this.handleAdStart(marker);
+                        this.startScte35AdBreak(marker, cueKey, durationMs);
                     } else if (typeof marker.ptsSeconds === "number") {
                         var _this_config_driftToleranceMs;
                         var tol = (_this_config_driftToleranceMs = this.config.driftToleranceMs) !== null && _this_config_driftToleranceMs !== void 0 ? _this_config_driftToleranceMs : 1e3;
@@ -4442,23 +4695,22 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             if (this.config.debugAdTiming) {
                                 console.log("[StormcloudVideoPlayer] Scheduling ad start in ".concat(deltaMs, "ms"));
                             }
-                            this.scheduleAdStartIn(deltaMs);
+                            this.expectedAdBreakDurationMs = durationMs;
+                            this.scheduledScte35BreakKey = cueKey;
+                            this.scheduleAdStartIn(deltaMs, marker, cueKey);
                         } else {
                             if (this.config.debugAdTiming) {
                                 console.log("[StormcloudVideoPlayer] Starting ad immediately (within tolerance)");
                             }
                             this.clearAdStartTimer();
-                            this.handleAdStart(marker);
+                            this.startScte35AdBreak(marker, cueKey, durationMs);
                         }
                     } else {
                         if (this.config.debugAdTiming) {
                             console.log("[StormcloudVideoPlayer] Starting ad immediately (fallback)");
                         }
                         this.clearAdStartTimer();
-                        this.handleAdStart(marker);
-                    }
-                    if (this.expectedAdBreakDurationMs != null) {
-                        this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
+                        this.startScte35AdBreak(marker, cueKey, durationMs);
                     }
                     return;
                 }
@@ -4514,6 +4766,27 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }
             }
         },
+        {
+            key: "startScte35AdBreak",
+            value: function startScte35AdBreak(marker, cueKey, durationMs) {
+                if (!this.video.muted) {
+                    this.video.muted = true;
+                    this.video.volume = 0;
+                    if (this.config.debugAdTiming) {
+                        console.log("[StormcloudVideoPlayer] Muted video on SCTE start marker");
+                    }
+                }
+                this.inAdBreak = true;
+                this.activeScte35BreakKey = cueKey !== null && cueKey !== void 0 ? cueKey : this.pendingScte35CueKey;
+                this.scheduledScte35BreakKey = void 0;
+                this.expectedAdBreakDurationMs = durationMs;
+                this.currentAdBreakStartWallClockMs = Date.now();
+                this.handleAdStart(marker);
+                if (this.expectedAdBreakDurationMs != null) {
+                    this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
+                }
+            }
+        },
         {
             key: "parseCueOutDuration",
             value: function parseCueOutDuration(value) {
@@ -4597,6 +4870,336 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 return false;
             }
         },
+        {
+            key: "normalizeFragmentPayload",
+            value: function normalizeFragmentPayload(payload) {
+                if (_instanceof(payload, Uint8Array)) {
+                    return payload;
+                }
+                if (_instanceof(payload, ArrayBuffer)) {
+                    return new Uint8Array(payload);
+                }
+                if (ArrayBuffer.isView(payload)) {
+                    var view = payload;
+                    return new Uint8Array(view.buffer, view.byteOffset, view.byteLength);
+                }
+                return void 0;
+            }
+        },
+        {
+            key: "processFragmentScte35Payload",
+            value: function processFragmentScte35Payload(payloadData, fragmentSn, fragmentStartSeconds) {
+                var _this = this;
+                var payload = this.normalizeFragmentPayload(payloadData);
+                if (!payload) {
+                    return;
+                }
+                var markers = this.parseScte35FromTsPackets(payload);
+                markers.forEach(function(marker) {
+                    var context = {
+                        source: "ts",
+                        readiness: "early"
+                    };
+                    if (fragmentSn !== void 0) {
+                        context.fragmentSn = fragmentSn;
+                    }
+                    if (fragmentStartSeconds !== void 0) {
+                        context.fragmentStartSeconds = fragmentStartSeconds;
+                    }
+                    _this.onScte35Cue(marker, context);
+                });
+            }
+        },
+        {
+            key: "parseScte35FromTsPackets",
+            value: function parseScte35FromTsPackets(data) {
+                var packetInfo = this.detectTsPacketFormat(data);
+                if (!packetInfo) {
+                    return [];
+                }
+                var markers = [];
+                var sectionAssemblers = /* @__PURE__ */ new Map();
+                for(var packetStart = packetInfo.offset; packetStart + packetInfo.packetSize <= data.length; packetStart += packetInfo.packetSize){
+                    var tsStart = packetStart + packetInfo.tsPayloadOffset;
+                    if (data[tsStart] !== 71) {
+                        continue;
+                    }
+                    var secondByte = data[tsStart + 1];
+                    var thirdByte = data[tsStart + 2];
+                    var fourthByte = data[tsStart + 3];
+                    if (secondByte == null || thirdByte == null || fourthByte == null || (secondByte & 128) !== 0) {
+                        continue;
+                    }
+                    var payloadUnitStart = (secondByte & 64) !== 0;
+                    var pid = (secondByte & 31) << 8 | thirdByte;
+                    var adaptationFieldControl = fourthByte >> 4 & 3;
+                    var hasPayload = adaptationFieldControl === 1 || adaptationFieldControl === 3;
+                    if (!hasPayload) {
+                        continue;
+                    }
+                    var payloadStart = tsStart + 4;
+                    if (adaptationFieldControl === 3) {
+                        var adaptationLength = data[payloadStart];
+                        if (adaptationLength == null) {
+                            continue;
+                        }
+                        payloadStart += 1 + adaptationLength;
+                    }
+                    var payloadEnd = Math.min(tsStart + 188, data.length);
+                    if (payloadStart >= payloadEnd || payloadStart >= data.length) {
+                        continue;
+                    }
+                    var payload = data.subarray(payloadStart, payloadEnd);
+                    if (pid === 0) {
+                        this.parsePatSection(payload, payloadUnitStart);
+                    } else if (this.pmtPids.has(pid)) {
+                        this.parsePmtSection(payload, payloadUnitStart);
+                    } else if (this.tsScte35Pids.has(pid)) {
+                        this.collectScte35SectionsFromPayload(pid, payload, payloadUnitStart, sectionAssemblers, markers);
+                    }
+                }
+                return markers;
+            }
+        },
+        {
+            key: "detectTsPacketFormat",
+            value: function detectTsPacketFormat(data) {
+                var packetSizes = [
+                    188,
+                    192,
+                    204
+                ];
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = packetSizes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var packetSize = _step.value;
+                        var tsPayloadOffset = packetSize === 192 ? 4 : 0;
+                        for(var offset = 0; offset < packetSize; offset++){
+                            var matchedPackets = 0;
+                            for(var packetStart = offset; packetStart + tsPayloadOffset < data.length && matchedPackets < 5; packetStart += packetSize){
+                                if (data[packetStart + tsPayloadOffset] !== 71) {
+                                    break;
+                                }
+                                matchedPackets++;
+                            }
+                            if (matchedPackets >= 2) {
+                                return {
+                                    offset: offset,
+                                    packetSize: packetSize,
+                                    tsPayloadOffset: tsPayloadOffset
+                                };
+                            }
+                        }
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
+                }
+                return void 0;
+            }
+        },
+        {
+            key: "parsePatSection",
+            value: function parsePatSection(payload, payloadUnitStart) {
+                var sectionStart = this.getPsiSectionStart(payload, payloadUnitStart);
+                if (sectionStart == null || sectionStart + 8 >= payload.length) {
+                    return;
+                }
+                if (payload[sectionStart] !== 0) {
+                    return;
+                }
+                var sectionLength = this.getPsiSectionLength(payload, sectionStart);
+                var sectionEnd = Math.min(payload.length, sectionStart + 3 + sectionLength);
+                for(var offset = sectionStart + 8; offset + 4 <= sectionEnd - 4; offset += 4){
+                    var _payload_offset, _payload_, _payload_1, _payload_2;
+                    var programNumber = ((_payload_offset = payload[offset]) !== null && _payload_offset !== void 0 ? _payload_offset : 0) << 8 | ((_payload_ = payload[offset + 1]) !== null && _payload_ !== void 0 ? _payload_ : 0);
+                    var pid = (((_payload_1 = payload[offset + 2]) !== null && _payload_1 !== void 0 ? _payload_1 : 0) & 31) << 8 | ((_payload_2 = payload[offset + 3]) !== null && _payload_2 !== void 0 ? _payload_2 : 0);
+                    if (programNumber !== 0) {
+                        this.pmtPids.add(pid);
+                    }
+                }
+            }
+        },
+        {
+            key: "parsePmtSection",
+            value: function parsePmtSection(payload, payloadUnitStart) {
+                var _payload_, _payload_1;
+                var sectionStart = this.getPsiSectionStart(payload, payloadUnitStart);
+                if (sectionStart == null || sectionStart + 12 >= payload.length) {
+                    return;
+                }
+                if (payload[sectionStart] !== 2) {
+                    return;
+                }
+                var sectionLength = this.getPsiSectionLength(payload, sectionStart);
+                var sectionEnd = Math.min(payload.length, sectionStart + 3 + sectionLength);
+                var programInfoLength = (((_payload_ = payload[sectionStart + 10]) !== null && _payload_ !== void 0 ? _payload_ : 0) & 15) << 8 | ((_payload_1 = payload[sectionStart + 11]) !== null && _payload_1 !== void 0 ? _payload_1 : 0);
+                var offset = sectionStart + 12 + programInfoLength;
+                while(offset + 5 <= sectionEnd - 4){
+                    var _payload_offset, _payload_2, _payload_3, _payload_4, _payload_5;
+                    var streamType = (_payload_offset = payload[offset]) !== null && _payload_offset !== void 0 ? _payload_offset : 0;
+                    var elementaryPid = (((_payload_2 = payload[offset + 1]) !== null && _payload_2 !== void 0 ? _payload_2 : 0) & 31) << 8 | ((_payload_3 = payload[offset + 2]) !== null && _payload_3 !== void 0 ? _payload_3 : 0);
+                    var esInfoLength = (((_payload_4 = payload[offset + 3]) !== null && _payload_4 !== void 0 ? _payload_4 : 0) & 15) << 8 | ((_payload_5 = payload[offset + 4]) !== null && _payload_5 !== void 0 ? _payload_5 : 0);
+                    var descriptorStart = offset + 5;
+                    var descriptorEnd = Math.min(descriptorStart + esInfoLength, sectionEnd - 4);
+                    if (streamType === 134 || streamType === 6 && this.descriptorsIdentifyScte35(payload, descriptorStart, descriptorEnd)) {
+                        this.tsScte35Pids.add(elementaryPid);
+                    }
+                    offset = descriptorStart + esInfoLength;
+                }
+            }
+        },
+        {
+            key: "descriptorsIdentifyScte35",
+            value: function descriptorsIdentifyScte35(data, start, end) {
+                var offset = start;
+                while(offset + 2 <= end){
+                    var _data_offset, _data_, _data_descriptorStart, _data_1, _data_2, _data_3;
+                    var tag = (_data_offset = data[offset]) !== null && _data_offset !== void 0 ? _data_offset : 0;
+                    var length = (_data_ = data[offset + 1]) !== null && _data_ !== void 0 ? _data_ : 0;
+                    var descriptorStart = offset + 2;
+                    var descriptorEnd = descriptorStart + length;
+                    if (descriptorEnd > end) {
+                        return false;
+                    }
+                    var registration = length >= 4 ? String.fromCharCode((_data_descriptorStart = data[descriptorStart]) !== null && _data_descriptorStart !== void 0 ? _data_descriptorStart : 0, (_data_1 = data[descriptorStart + 1]) !== null && _data_1 !== void 0 ? _data_1 : 0, (_data_2 = data[descriptorStart + 2]) !== null && _data_2 !== void 0 ? _data_2 : 0, (_data_3 = data[descriptorStart + 3]) !== null && _data_3 !== void 0 ? _data_3 : 0) : "";
+                    if (tag === 138 || registration === "CUEI" || registration === "SCTE") {
+                        return true;
+                    }
+                    offset = descriptorEnd;
+                }
+                return false;
+            }
+        },
+        {
+            key: "collectScte35SectionsFromPayload",
+            value: function collectScte35SectionsFromPayload(pid, payload, payloadUnitStart, assemblers, markers) {
+                if (payload.length === 0) {
+                    return;
+                }
+                var offset = 0;
+                if (payloadUnitStart) {
+                    var _payload_;
+                    var pointerField = (_payload_ = payload[0]) !== null && _payload_ !== void 0 ? _payload_ : 0;
+                    var previousAssembler = assemblers.get(pid);
+                    if (previousAssembler && pointerField > 0) {
+                        this.appendScte35Bytes(pid, payload.subarray(1, Math.min(1 + pointerField, payload.length)), assemblers, markers);
+                    }
+                    assemblers.delete(pid);
+                    offset = 1 + pointerField;
+                } else {
+                    this.appendScte35Bytes(pid, payload, assemblers, markers);
+                    return;
+                }
+                while(offset + 3 <= payload.length){
+                    var tableId = payload[offset];
+                    if (tableId == null || tableId === 255) {
+                        return;
+                    }
+                    var sectionLength = this.getPsiSectionLength(payload, offset);
+                    var totalLength = 3 + sectionLength;
+                    if (sectionLength <= 0 || totalLength <= 3) {
+                        return;
+                    }
+                    if (offset + totalLength <= payload.length) {
+                        this.addScte35SectionMarker(payload.subarray(offset, offset + totalLength), markers);
+                        offset += totalLength;
+                    } else {
+                        assemblers.set(pid, {
+                            bytes: Array.from(payload.subarray(offset)),
+                            expectedLength: totalLength
+                        });
+                        return;
+                    }
+                }
+            }
+        },
+        {
+            key: "appendScte35Bytes",
+            value: function appendScte35Bytes(pid, bytes, assemblers, markers) {
+                var assembler = assemblers.get(pid);
+                if (!assembler) {
+                    return;
+                }
+                for(var i = 0; i < bytes.length && assembler.bytes.length < assembler.expectedLength; i++){
+                    var _bytes_i;
+                    assembler.bytes.push((_bytes_i = bytes[i]) !== null && _bytes_i !== void 0 ? _bytes_i : 0);
+                }
+                if (assembler.bytes.length >= assembler.expectedLength) {
+                    assemblers.delete(pid);
+                    this.addScte35SectionMarker(new Uint8Array(assembler.bytes), markers);
+                }
+            }
+        },
+        {
+            key: "addScte35SectionMarker",
+            value: function addScte35SectionMarker(section, markers) {
+                if (section[0] !== 252 || this.hasProcessedTsScte35Section(section)) {
+                    return;
+                }
+                var marker = this.parseScte35Binary(section);
+                if (!marker) {
+                    return;
+                }
+                marker.raw = _object_spread_props(_object_spread({}, _type_of(marker.raw) === "object" && marker.raw ? marker.raw : {}), {
+                    source: "ts-packet"
+                });
+                markers.push(marker);
+            }
+        },
+        {
+            key: "hasProcessedTsScte35Section",
+            value: function hasProcessedTsScte35Section(section) {
+                var checksum = 0;
+                for(var i = 0; i < section.length; i++){
+                    var _section_i;
+                    checksum = checksum * 31 + ((_section_i = section[i]) !== null && _section_i !== void 0 ? _section_i : 0) >>> 0;
+                }
+                var key = "".concat(section.length, ":").concat(checksum);
+                if (this.processedTsScte35Sections.has(key)) {
+                    return true;
+                }
+                this.processedTsScte35Sections.add(key);
+                if (this.processedTsScte35Sections.size > 200) {
+                    var firstKey = this.processedTsScte35Sections.values().next().value;
+                    if (firstKey) {
+                        this.processedTsScte35Sections.delete(firstKey);
+                    }
+                }
+                return false;
+            }
+        },
+        {
+            key: "getPsiSectionStart",
+            value: function getPsiSectionStart(payload, payloadUnitStart) {
+                if (!payloadUnitStart) {
+                    return void 0;
+                }
+                var pointerField = payload[0];
+                if (pointerField == null) {
+                    return void 0;
+                }
+                var sectionStart = 1 + pointerField;
+                return sectionStart < payload.length ? sectionStart : void 0;
+            }
+        },
+        {
+            key: "getPsiSectionLength",
+            value: function getPsiSectionLength(data, offset) {
+                var _data_, _data_1;
+                return (((_data_ = data[offset + 1]) !== null && _data_ !== void 0 ? _data_ : 0) & 15) << 8 | ((_data_1 = data[offset + 2]) !== null && _data_1 !== void 0 ? _data_1 : 0);
+            }
+        },
         {
             key: "parseScte35Binary",
             value: function parseScte35Binary(data) {
@@ -4636,10 +5239,28 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             value: function skipBits(n) {
                                 this.readBits(n);
                             }
+                        },
+                        {
+                            key: "bytePosition",
+                            get: function get() {
+                                return this.bitPos === 0 ? this.bytePos : this.bytePos + 1;
+                            }
                         }
                     ]);
                     return BitReader;
                 }();
+                var readSpliceTime = function readSpliceTime(r2, ptsAdjustmentTicks2) {
+                    var timeSpecifiedFlag = r2.readBits(1) === 1;
+                    if (!timeSpecifiedFlag) {
+                        r2.readBits(7);
+                        return void 0;
+                    }
+                    r2.readBits(6);
+                    var high = r2.readBits(1);
+                    var low = r2.readBits(32);
+                    var ptsTicks = (high * 4294967296 + low + ptsAdjustmentTicks2) % 8589934592;
+                    return ptsTicks / 9e4;
+                };
                 var r = new BitReader(data);
                 var tableId = r.readBits(8);
                 if (tableId !== 252) return void 0;
@@ -4647,77 +5268,206 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 r.readBits(1);
                 r.readBits(2);
                 var sectionLength = r.readBits(12);
+                if (sectionLength <= 0 || data.length < 3 + sectionLength) {
+                    return void 0;
+                }
                 r.readBits(8);
                 r.readBits(1);
                 r.readBits(6);
                 var ptsAdjHigh = r.readBits(1);
                 var ptsAdjLow = r.readBits(32);
-                void ptsAdjHigh;
-                void ptsAdjLow;
+                var ptsAdjustmentTicks = ptsAdjHigh * 4294967296 + ptsAdjLow;
                 r.readBits(8);
                 r.readBits(12);
                 var spliceCommandLength = r.readBits(12);
                 var spliceCommandType = r.readBits(8);
-                if (spliceCommandType !== 5) {
+                var markerType;
+                var durationSeconds = void 0;
+                var ptsSeconds = void 0;
+                var spliceEventId = void 0;
+                var commandBodyStart = r.bytePosition;
+                if (spliceCommandType === 5) {
+                    spliceEventId = r.readBits(32);
+                    var cancel = r.readBits(1) === 1;
+                    r.readBits(7);
+                    if (cancel) return void 0;
+                    var outOfNetwork = r.readBits(1) === 1;
+                    var programSpliceFlag = r.readBits(1) === 1;
+                    var durationFlag = r.readBits(1) === 1;
+                    var spliceImmediateFlag = r.readBits(1) === 1;
+                    r.readBits(4);
+                    markerType = outOfNetwork ? "start" : "end";
+                    if (programSpliceFlag && !spliceImmediateFlag) {
+                        ptsSeconds = readSpliceTime(r, ptsAdjustmentTicks);
+                    } else if (!programSpliceFlag) {
+                        var componentCount = r.readBits(8);
+                        for(var i = 0; i < componentCount; i++){
+                            r.readBits(8);
+                            if (!spliceImmediateFlag) {
+                                var componentPtsSeconds = readSpliceTime(r, ptsAdjustmentTicks);
+                                if (ptsSeconds === void 0) {
+                                    ptsSeconds = componentPtsSeconds;
+                                }
+                            }
+                        }
+                    }
+                    if (durationFlag) {
+                        r.readBits(6);
+                        r.readBits(1);
+                        var high = r.readBits(1);
+                        var low = r.readBits(32);
+                        var durationTicks = high * 4294967296 + low;
+                        durationSeconds = durationTicks / 9e4;
+                    }
+                    r.readBits(16);
+                    r.readBits(8);
+                    r.readBits(8);
+                } else if (spliceCommandType === 6) {
+                    ptsSeconds = readSpliceTime(r, ptsAdjustmentTicks);
+                } else {
                     return void 0;
                 }
-                r.readBits(32);
-                var cancel = r.readBits(1) === 1;
-                r.readBits(7);
-                if (cancel) return void 0;
-                var outOfNetwork = r.readBits(1) === 1;
-                var programSpliceFlag = r.readBits(1) === 1;
-                var durationFlag = r.readBits(1) === 1;
-                var spliceImmediateFlag = r.readBits(1) === 1;
-                r.readBits(4);
-                if (programSpliceFlag && !spliceImmediateFlag) {
-                    var timeSpecifiedFlag = r.readBits(1) === 1;
-                    if (timeSpecifiedFlag) {
-                        r.readBits(6);
-                        r.readBits(33);
-                    } else {
-                        r.readBits(7);
-                    }
-                } else if (!programSpliceFlag) {
-                    var componentCount = r.readBits(8);
-                    for(var i = 0; i < componentCount; i++){
-                        r.readBits(8);
-                        if (!spliceImmediateFlag) {
-                            var timeSpecifiedFlag1 = r.readBits(1) === 1;
-                            if (timeSpecifiedFlag1) {
-                                r.readBits(6);
-                                r.readBits(33);
-                            } else {
-                                r.readBits(7);
-                            }
+                var expectedDescriptorOffset = spliceCommandLength === 4095 ? r.bytePosition : commandBodyStart + spliceCommandLength;
+                var descriptorMarker = this.parseScte35SegmentationDescriptors(data, expectedDescriptorOffset);
+                if (descriptorMarker) {
+                    markerType = descriptorMarker.type;
+                    if (durationSeconds === void 0) {
+                        durationSeconds = descriptorMarker.durationSeconds;
+                    }
+                }
+                if (!markerType) {
+                    return void 0;
+                }
+                var marker = _object_spread_props(_object_spread({
+                    type: markerType
+                }, ptsSeconds !== void 0 ? {
+                    ptsSeconds: ptsSeconds
+                } : {}, durationSeconds !== void 0 ? {
+                    durationSeconds: durationSeconds
+                } : {}), {
+                    raw: _object_spread({
+                        splice_command_type: spliceCommandType
+                    }, spliceEventId !== void 0 ? {
+                        splice_event_id: spliceEventId
+                    } : {}, (descriptorMarker === null || descriptorMarker === void 0 ? void 0 : descriptorMarker.segmentationEventId) !== void 0 ? {
+                        segmentation_event_id: descriptorMarker.segmentationEventId
+                    } : {})
+                });
+                return marker;
+            }
+        },
+        {
+            key: "parseScte35SegmentationDescriptors",
+            value: function parseScte35SegmentationDescriptors(data, offset) {
+                var _data_offset, _data_;
+                if (offset + 2 > data.length) {
+                    return void 0;
+                }
+                var descriptorLoopLength = ((_data_offset = data[offset]) !== null && _data_offset !== void 0 ? _data_offset : 0) << 8 | ((_data_ = data[offset + 1]) !== null && _data_ !== void 0 ? _data_ : 0);
+                var descriptorOffset = offset + 2;
+                var descriptorEnd = Math.min(data.length, descriptorOffset + descriptorLoopLength);
+                while(descriptorOffset + 2 <= descriptorEnd){
+                    var _data_descriptorOffset, _data_1;
+                    var descriptorTag = (_data_descriptorOffset = data[descriptorOffset]) !== null && _data_descriptorOffset !== void 0 ? _data_descriptorOffset : 0;
+                    var descriptorLength = (_data_1 = data[descriptorOffset + 1]) !== null && _data_1 !== void 0 ? _data_1 : 0;
+                    var descriptorDataStart = descriptorOffset + 2;
+                    var descriptorDataEnd = descriptorDataStart + descriptorLength;
+                    if (descriptorDataEnd > descriptorEnd) {
+                        return void 0;
+                    }
+                    if (descriptorTag === 2) {
+                        var descriptorMarker = this.parseScte35SegmentationDescriptor(data.subarray(descriptorDataStart, descriptorDataEnd));
+                        if (descriptorMarker) {
+                            return descriptorMarker;
                         }
                     }
+                    descriptorOffset = descriptorDataEnd;
+                }
+                return void 0;
+            }
+        },
+        {
+            key: "parseScte35SegmentationDescriptor",
+            value: function parseScte35SegmentationDescriptor(descriptor) {
+                var _descriptor_, _descriptor_1, _descriptor_2, _descriptor_3, _descriptor_4, _descriptor_5, _descriptor_6, _descriptor_7, _descriptor_8, _descriptor_9, _descriptor_offset, _descriptor_offset1;
+                if (descriptor.length < 11) {
+                    return void 0;
+                }
+                var identifier = String.fromCharCode((_descriptor_ = descriptor[0]) !== null && _descriptor_ !== void 0 ? _descriptor_ : 0, (_descriptor_1 = descriptor[1]) !== null && _descriptor_1 !== void 0 ? _descriptor_1 : 0, (_descriptor_2 = descriptor[2]) !== null && _descriptor_2 !== void 0 ? _descriptor_2 : 0, (_descriptor_3 = descriptor[3]) !== null && _descriptor_3 !== void 0 ? _descriptor_3 : 0);
+                if (identifier !== "CUEI") {
+                    return void 0;
+                }
+                var segmentationEventId = ((_descriptor_4 = descriptor[4]) !== null && _descriptor_4 !== void 0 ? _descriptor_4 : 0) * 16777216 + (((_descriptor_5 = descriptor[5]) !== null && _descriptor_5 !== void 0 ? _descriptor_5 : 0) << 16) + (((_descriptor_6 = descriptor[6]) !== null && _descriptor_6 !== void 0 ? _descriptor_6 : 0) << 8) + ((_descriptor_7 = descriptor[7]) !== null && _descriptor_7 !== void 0 ? _descriptor_7 : 0);
+                var cancelIndicator = (((_descriptor_8 = descriptor[8]) !== null && _descriptor_8 !== void 0 ? _descriptor_8 : 0) & 128) !== 0;
+                if (cancelIndicator) {
+                    return void 0;
+                }
+                var flags = (_descriptor_9 = descriptor[9]) !== null && _descriptor_9 !== void 0 ? _descriptor_9 : 0;
+                var programSegmentationFlag = (flags & 128) !== 0;
+                var segmentationDurationFlag = (flags & 64) !== 0;
+                var offset = 10;
+                if (!programSegmentationFlag) {
+                    var _descriptor_offset2;
+                    var componentCount = (_descriptor_offset2 = descriptor[offset]) !== null && _descriptor_offset2 !== void 0 ? _descriptor_offset2 : 0;
+                    offset += 1 + componentCount * 6;
+                    if (offset > descriptor.length) {
+                        return void 0;
+                    }
                 }
                 var durationSeconds = void 0;
-                if (durationFlag) {
-                    r.readBits(6);
-                    r.readBits(1);
-                    var high = r.readBits(1);
-                    var low = r.readBits(32);
-                    var durationTicks = high * 4294967296 + low;
+                if (segmentationDurationFlag) {
+                    var _descriptor_offset3, _descriptor_10, _descriptor_11, _descriptor_12, _descriptor_13;
+                    if (offset + 5 > descriptor.length) {
+                        return void 0;
+                    }
+                    var durationTicks = ((_descriptor_offset3 = descriptor[offset]) !== null && _descriptor_offset3 !== void 0 ? _descriptor_offset3 : 0) * 4294967296 + ((_descriptor_10 = descriptor[offset + 1]) !== null && _descriptor_10 !== void 0 ? _descriptor_10 : 0) * 16777216 + (((_descriptor_11 = descriptor[offset + 2]) !== null && _descriptor_11 !== void 0 ? _descriptor_11 : 0) << 16) + (((_descriptor_12 = descriptor[offset + 3]) !== null && _descriptor_12 !== void 0 ? _descriptor_12 : 0) << 8) + ((_descriptor_13 = descriptor[offset + 4]) !== null && _descriptor_13 !== void 0 ? _descriptor_13 : 0);
                     durationSeconds = durationTicks / 9e4;
+                    offset += 5;
                 }
-                r.readBits(16);
-                r.readBits(8);
-                r.readBits(8);
-                if (outOfNetwork) {
-                    var marker = _object_spread_props(_object_spread({
-                        type: "start"
-                    }, durationSeconds !== void 0 ? {
-                        durationSeconds: durationSeconds
-                    } : {}), {
-                        raw: {
-                            splice_command_type: 5
-                        }
-                    });
-                    return marker;
+                if (offset + 2 > descriptor.length) {
+                    return void 0;
+                }
+                offset += 1;
+                var segmentationUpidLength = (_descriptor_offset = descriptor[offset]) !== null && _descriptor_offset !== void 0 ? _descriptor_offset : 0;
+                offset += 1 + segmentationUpidLength;
+                if (offset >= descriptor.length) {
+                    return void 0;
+                }
+                var segmentationTypeId = (_descriptor_offset1 = descriptor[offset]) !== null && _descriptor_offset1 !== void 0 ? _descriptor_offset1 : 0;
+                var markerType = this.markerTypeFromSegmentationTypeId(segmentationTypeId);
+                if (!markerType) {
+                    return void 0;
+                }
+                return _object_spread_props(_object_spread({
+                    type: markerType
+                }, durationSeconds !== void 0 ? {
+                    durationSeconds: durationSeconds
+                } : {}), {
+                    segmentationEventId: segmentationEventId
+                });
+            }
+        },
+        {
+            key: "markerTypeFromSegmentationTypeId",
+            value: function markerTypeFromSegmentationTypeId(segmentationTypeId) {
+                switch(segmentationTypeId){
+                    case 16:
+                    case 34:
+                    case 48:
+                    case 50:
+                    case 52:
+                    case 54:
+                        return "start";
+                    case 17:
+                    case 35:
+                    case 49:
+                    case 51:
+                    case 53:
+                    case 55:
+                        return "end";
+                    default:
+                        return void 0;
                 }
-                return void 0;
             }
         },
         {
@@ -5114,7 +5864,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         },
         {
             key: "startAdPrefetch",
-            value: function startAdPrefetch(marker, fragmentSn) {
+            value: function startAdPrefetch(marker, fragmentSn, cueKey) {
                 if (this.pendingAdBreak || this.inAdBreak) {
                     return;
                 }
@@ -5142,6 +5892,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     isFetching: false,
                     fetchStartTime: Date.now()
                 });
+                this.pendingScte35CueKey = cueKey;
                 this.adDetectSentForCurrentBreak = true;
                 var detectPayload = {};
                 if (marker.durationSeconds != null) detectPayload.durationSeconds = marker.durationSeconds;
@@ -5163,6 +5914,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     this.prefetchTimerId = void 0;
                 }
                 this.pendingAdBreak = null;
+                this.pendingScte35CueKey = void 0;
             }
         },
         {
@@ -6646,18 +7398,17 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "scheduleAdStartIn",
             value: function scheduleAdStartIn(delayMs) {
                 var _this = this;
+                var marker = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {
+                    type: "start"
+                }, cueKey = arguments.length > 2 ? arguments[2] : void 0;
                 this.clearAdStartTimer();
                 var ms = Math.max(0, Math.floor(delayMs));
                 if (ms === 0) {
-                    this.handleAdStart({
-                        type: "start"
-                    }).catch(function() {});
+                    this.startScte35AdBreak(marker, cueKey, marker.durationSeconds != null ? marker.durationSeconds * 1e3 : void 0);
                     return;
                 }
                 this.adStartTimerId = window.setTimeout(function() {
-                    _this.handleAdStart({
-                        type: "start"
-                    }).catch(function() {});
+                    _this.startScte35AdBreak(marker, cueKey, marker.durationSeconds != null ? marker.durationSeconds * 1e3 : _this.expectedAdBreakDurationMs);
                 }, ms);
             }
         },
@@ -7088,6 +7839,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.adRequestQueue = [];
                 this.inAdBreak = false;
                 this.adDetectSentForCurrentBreak = false;
+                this.activeScte35BreakKey = void 0;
+                this.scheduledScte35BreakKey = void 0;
                 this.expectedAdBreakDurationMs = void 0;
                 this.currentAdBreakStartWallClockMs = void 0;
                 this.clearAdStartTimer();