eyevinn-channel-engine 4.3.7 → 4.3.8

package/dist/engine/session.d.ts

@@ -123,4 +123,9 @@ declare class Session {
     _getLastDuration(manifest: any): Promise<any>;
     _getPlayheadDiffCompensationValue(diffMs: any, thresholdMs: any): number;
     _isOldVod(refTs: any, vodDur: any): boolean;
+    _determineExtraMediaIncrement(_extraType: any, _currentPosVideo: any, _extraSeqFinalIndex: any, _vodMediaSeqExtra: any, _getExtraPlayheadPositionAsyncFn: any): Promise<{
+        increment: number;
+        position: number;
+        diff: string;
+    }>;
 }

package/dist/engine/session.js

@@ -1087,24 +1087,24 @@ var Session = /** @class */ (function () {
     };
     Session.prototype.incrementAsync = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var isLeader, sessionState, playheadState, currentVod, _a, isOldVod, nextState, leaderAction, leaderState, _b, m3u8_4, _c, audioIncrement, positionV, positionA, position, currentVod_1, sessionState_1, posDiff, incrementValue, index, audioSeqLastIdx, thresh, maxAcceptableDiff, audioPosition, _d, _e, newSessionState, updatedValues, updatedPlayhead, mediaSequenceValue, audioInfo, mediaSequenceValueAudio, diffMs, m3u8;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
+            var isLeader, sessionState, playheadState, currentVod, _a, isOldVod, nextState, leaderAction, leaderState, _b, m3u8_4, _c, playheadPosVideoMs, playheadAudio, playheadSubtitle, audioSeqLastIdx, sessionStateObj, _d, playheadPosVideo, _e, subtitleSeqLastIdx, sessionStateObj, _f, newSessionState, updatedValues, updatedPlayhead, mediaSequenceValue, audioInfo, mediaSequenceValueAudio, diffMs, m3u8;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0: return [4 /*yield*/, this._tickAsync()];
                     case 1:
-                        _f.sent();
+                        _g.sent();
                         return [4 /*yield*/, this._sessionStateStore.isLeader(this._instanceId)];
                     case 2:
-                        isLeader = _f.sent();
+                        isLeader = _g.sent();
                         return [4 /*yield*/, this._sessionState.getValues(["state", "mediaSeq", "mediaSeqAudio", "mediaSeqSubtitle", "discSeq", "discSeqAudio", "discSeqSubtitle", "vodMediaSeqVideo", "vodMediaSeqAudio", "vodMediaSeqSubtitle"])];
                     case 3:
-                        sessionState = _f.sent();
+                        sessionState = _g.sent();
                         return [4 /*yield*/, this._playheadState.getValues(["mediaSeq", "mediaSeqAudio", "mediaSeqSubtitle", "vodMediaSeqVideo", "vodMediaSeqAudio", "vodMediaSubtitle", "playheadRef"])];
                     case 4:
-                        playheadState = _f.sent();
+                        playheadState = _g.sent();
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
                     case 5:
-                        currentVod = _f.sent();
+                        currentVod = _g.sent();
                         if (!(!currentVod ||
                             sessionState.vodMediaSeqVideo === null ||
                             sessionState.vodMediaSeqAudio === null ||
@@ -1116,14 +1116,14 @@ var Session = /** @class */ (function () {
                         debug(sessionState);
                         return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
                     case 6:
-                        _f.sent();
+                        _g.sent();
                         if (!isLeader) return [3 /*break*/, 8];
                         debug("[".concat(this._sessionId, "]: I am the leader, trying to initiate the session"));
                         _a = sessionState;
                         return [4 /*yield*/, this._sessionState.set("state", SessionState.VOD_INIT)];
                     case 7:
-                        _a.state = _f.sent();
-                        _f.label = 8;
+                        _a.state = _g.sent();
+                        _g.label = 8;
                     case 8: return [2 /*return*/, null];
                     case 9:
                         if (!(sessionState.state === SessionState.VOD_NEXT_INITIATING || sessionState.state === SessionState.VOD_RELOAD_INITIATING)) return [3 /*break*/, 14];
@@ -1139,13 +1139,13 @@ var Session = /** @class */ (function () {
                         _b = sessionState;
                         return [4 /*yield*/, this._sessionState.set("state", nextState)];
                     case 10:
-                        _b.state = _f.sent();
+                        _b.state = _g.sent();
                         return [3 /*break*/, 13];
                     case 11:
                         debug("[".concat(this._sessionId, "]: Return the last generated m3u8 to give the leader some time"));
                         return [4 /*yield*/, this._playheadState.getLastM3u8()];
                     case 12:
-                        m3u8_4 = _f.sent();
+                        m3u8_4 = _g.sent();
                         if (m3u8_4) {
                             return [2 /*return*/, m3u8_4];
                         }
@@ -1153,78 +1153,65 @@ var Session = /** @class */ (function () {
                             debug("[".concat(this._sessionId, "]: We don't have any previously generated m3u8"));
                         }
                         this.isAllowedToClearVodCache = true;
-                        _f.label = 13;
-                    case 13: return [3 /*break*/, 26];
+                        _g.label = 13;
+                    case 13: return [3 /*break*/, 28];
                     case 14:
                         _c = sessionState;
                         return [4 /*yield*/, this._sessionState.increment("vodMediaSeqVideo", 1)];
                     case 15:
-                        _c.vodMediaSeqVideo = _f.sent();
-                        audioIncrement = void 0;
-                        if (!this.use_demuxed_audio) return [3 /*break*/, 23];
-                        positionV = 0;
-                        positionA = 0;
+                        _c.vodMediaSeqVideo = _g.sent();
+                        playheadPosVideoMs = void 0;
+                        playheadAudio = void 0;
+                        playheadSubtitle = void 0;
+                        if (!(this.use_demuxed_audio || this.use_vtt_subtitles)) return [3 /*break*/, 17];
                         return [4 /*yield*/, this._getCurrentPlayheadPosition()];
                     case 16:
-                        position = (_f.sent()) * 1000;
-                        positionV = position ? position / 1000 : 0;
-                        return [4 /*yield*/, this._sessionState.getCurrentVod()];
+                        playheadPosVideoMs = (_g.sent()) * 1000;
+                        _g.label = 17;
                     case 17:
-                        currentVod_1 = _f.sent();
+                        if (!this.use_demuxed_audio) return [3 /*break*/, 21];
+                        audioSeqLastIdx = currentVod.getLiveMediaSequencesCount("audio") - 1;
                         return [4 /*yield*/, this._sessionState.getValues(["vodMediaSeqAudio"])];
                     case 18:
-                        sessionState_1 = _f.sent();
-                        posDiff = void 0;
-                        incrementValue = 1;
-                        index = 0;
-                        audioSeqLastIdx = currentVod_1.getLiveMediaSequencesCount("audio") - 1;
-                        thresh = 0.5;
-                        maxAcceptableDiff = 0.001;
-                        debug("[".concat(this._sessionId, "]: About to determine audio increment"));
-                        _f.label = 19;
-                    case 19: return [4 /*yield*/, this._getAudioPlayheadPosition(sessionState_1.vodMediaSeqAudio + index)];
+                        sessionStateObj = _g.sent();
+                        return [4 /*yield*/, this._determineExtraMediaIncrement("audio", playheadPosVideoMs, audioSeqLastIdx, sessionStateObj.vodMediaSeqAudio, this._getAudioPlayheadPosition.bind(this))];
+                    case 19:
+                        playheadAudio = _g.sent();
+                        // Perform the Increment
+                        debug("[".concat(this._sessionId, "]: Will increment audio with ").concat(playheadAudio.increment));
+                        _d = sessionState;
+                        return [4 /*yield*/, this._sessionState.increment("vodMediaSeqAudio", playheadAudio.increment)];
                     case 20:
-                        audioPosition = (_f.sent()) * 1000;
-                        positionA = audioPosition ? audioPosition / 1000 : 0;
-                        posDiff = (positionV - positionA).toFixed(3);
-                        debug("[".concat(this._sessionId, "]: positionV=").concat(positionV, ";positionA=").concat(positionA, ";posDiff=").concat(posDiff));
-                        if (posDiff <= maxAcceptableDiff) {
-                            return [3 /*break*/, 22];
-                        }
-                        if (posDiff > thresh) {
-                            index++;
-                            incrementValue++;
-                        }
-                        else if (posDiff > maxAcceptableDiff) {
-                            index = incrementValue;
-                            debug("[".concat(this._sessionId, "]: Audio Stepping index set to = ").concat(index));
-                            return [3 /*break*/, 22];
-                        }
-                        if (sessionState_1.vodMediaSeqAudio + index > audioSeqLastIdx) {
-                            return [3 /*break*/, 22];
-                        }
-                        _f.label = 21;
+                        _d.vodMediaSeqAudio = _g.sent();
+                        _g.label = 21;
                     case 21:
-                        if (!(-thresh < posDiff && posDiff < thresh) && !isNaN(posDiff)) return [3 /*break*/, 19];
-                        _f.label = 22;
+                        if (!this.use_vtt_subtitles) return [3 /*break*/, 27];
+                        _e = playheadPosVideo;
+                        if (_e) return [3 /*break*/, 23];
+                        return [4 /*yield*/, this._getCurrentPlayheadPosition()];
                     case 22:
-                        audioIncrement = index;
-                        debug("[".concat(this._sessionId, "]: Current VOD Playhead Positions are to be: [").concat(positionV.toFixed(3), "][").concat(positionA.toFixed(3), "] (").concat(posDiff, ")"));
-                        _f.label = 23;
+                        _e = (_g.sent()) * 1000;
+                        _g.label = 23;
                     case 23:
-                        debug("[".concat(this._sessionId, "]: Will increment audio with ").concat(audioIncrement));
-                        _d = sessionState;
-                        return [4 /*yield*/, this._sessionState.increment("vodMediaSeqAudio", audioIncrement)];
+                        playheadPosVideo = _e;
+                        subtitleSeqLastIdx = currentVod.getLiveMediaSequencesCount("subtitle") - 1;
+                        return [4 /*yield*/, this._sessionState.getValues(["vodMediaSeqSubtitle"])];
                     case 24:
-                        _d.vodMediaSeqAudio = _f.sent();
-                        if (!this.use_vtt_subtitles) return [3 /*break*/, 26];
-                        debug("[".concat(this._sessionId, "]: Will increment subtitle with 1"));
-                        _e = sessionState;
-                        return [4 /*yield*/, this._sessionState.increment("vodMediaSeqSubtitle", 1)];
+                        sessionStateObj = _g.sent();
+                        return [4 /*yield*/, this._determineExtraMediaIncrement("subtitle", playheadPosVideoMs, subtitleSeqLastIdx, sessionStateObj.vodMediaSeqSubtitle, this._getSubtitlePlayheadPosition.bind(this))];
                     case 25:
-                        _e.vodMediaSeqSubtitle = _f.sent();
-                        _f.label = 26;
+                        playheadSubtitle = _g.sent();
+                        // Perform the Increment
+                        debug("[".concat(this._sessionId, "]: Will increment subtitle with ").concat(playheadSubtitle.increment));
+                        _f = sessionState;
+                        return [4 /*yield*/, this._sessionState.increment("vodMediaSeqSubtitle", playheadSubtitle.increment)];
                     case 26:
+                        _f.vodMediaSeqSubtitle = _g.sent();
+                        _g.label = 27;
+                    case 27:
+                        debug("[".concat(this._sessionId, "]: Current VOD Playhead Positions are to be V[").concat((playheadPosVideoMs / 1000).toFixed(3), "]").concat(playheadAudio ? "A[".concat((playheadAudio.position).toFixed(3), "]") : "").concat(playheadSubtitle ? "S[".concat((playheadSubtitle.position).toFixed(3), ")]") : "").concat(playheadAudio ? " (".concat(playheadAudio.diff, ")") : "").concat(playheadSubtitle ? " (".concat(playheadSubtitle.diff, ")") : ""));
+                        _g.label = 28;
+                    case 28:
                         newSessionState = {};
                         if (sessionState.vodMediaSeqVideo >= currentVod.getLiveMediaSequencesCount() - 1) {
                             newSessionState.vodMediaSeqVideo = currentVod.getLiveMediaSequencesCount() - 1;
@@ -1241,8 +1228,8 @@ var Session = /** @class */ (function () {
                             this.isSwitchingBackToV2L = false;
                         }
                         return [4 /*yield*/, this._sessionState.setValues(newSessionState)];
-                    case 27:
-                        updatedValues = _f.sent();
+                    case 29:
+                        updatedValues = _g.sent();
                         sessionState = __assign(__assign({}, sessionState), updatedValues);
                         if (isLeader) {
                             debug("[".concat(this._sessionId, "]: I am the leader, updating PlayheadState values"));
@@ -1255,8 +1242,8 @@ var Session = /** @class */ (function () {
                                 "vodMediaSeqAudio": sessionState.vodMediaSeqAudio,
                                 "vodMediaSeqSubtitle": sessionState.vodMediaSeqSubtitle
                             }, isLeader)];
-                    case 28:
-                        updatedPlayhead = _f.sent();
+                    case 30:
+                        updatedPlayhead = _g.sent();
                         playheadState = __assign(__assign({}, playheadState), updatedPlayhead);
                         if (currentVod.sequenceAlwaysContainNewSegments) {
                             mediaSequenceValue = currentVod.mediaSequenceValues[playheadState.vodMediaSeqVideo];
@@ -1268,23 +1255,23 @@ var Session = /** @class */ (function () {
                             debug("[".concat(this._sessionId, "]: Session can now serve mseq[V]={").concat(playheadState.mediaSeq + mediaSequenceValue, "}") + audioInfo);
                         }
                         debug("[".concat(this._sessionId, "]: INCREMENT (mseq=").concat(playheadState.mediaSeq + playheadState.vodMediaSeqVideo, ") vodMediaSeq=(").concat(playheadState.vodMediaSeqVideo, "_").concat(playheadState.vodMediaSeqAudio, " of ").concat(currentVod.getLiveMediaSequencesCount(), "_").concat(currentVod.getLiveMediaSequencesCount("audio"), ")"));
-                        if (!(playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video)) return [3 /*break*/, 33];
+                        if (!(playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video)) return [3 /*break*/, 35];
                         debug("[".concat(this._sessionId, "]: current[").concat(playheadState.vodMediaSeqVideo, "]_prev[").concat(this.prevVodMediaSeq.video, "]"));
                         debug("[".concat(this._sessionId, "]: current-offset[").concat(playheadState.mediaSeq, "]_prev-offset[").concat(this.prevMediaSeqOffset.video, "]"));
                         if (playheadState.vodMediaSeqVideo < this.prevVodMediaSeq.video || playheadState.mediaSeq !== this.prevMediaSeqOffset.video) {
                             this.isAllowedToClearVodCache = true;
                         }
-                        if (!(!isLeader && this.isAllowedToClearVodCache)) return [3 /*break*/, 32];
+                        if (!(!isLeader && this.isAllowedToClearVodCache)) return [3 /*break*/, 34];
                         debug("[".concat(this._sessionId, "]: Not a leader and have just set 'playheadState.vodMediaSeqVideo' to 0|1. Invalidate cache to ensure having the correct VOD."));
                         return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 29:
-                        _f.sent();
+                    case 31:
+                        _g.sent();
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 30:
-                        currentVod = _f.sent();
+                    case 32:
+                        currentVod = _g.sent();
                         return [4 /*yield*/, this._playheadState.get("diffCompensation")];
-                    case 31:
-                        diffMs = _f.sent();
+                    case 33:
+                        diffMs = _g.sent();
                         if (diffMs) {
                             this.diffCompensation = diffMs;
                             debug("[".concat(this._sessionId, "]: Setting diffCompensation->").concat(this.diffCompensation));
@@ -1297,12 +1284,12 @@ var Session = /** @class */ (function () {
                             }
                         }
                         this.isAllowedToClearVodCache = false;
-                        _f.label = 32;
-                    case 32: return [3 /*break*/, 34];
-                    case 33:
+                        _g.label = 34;
+                    case 34: return [3 /*break*/, 36];
+                    case 35:
                         this.isAllowedToClearVodCache = true;
-                        _f.label = 34;
-                    case 34:
+                        _g.label = 36;
+                    case 36:
                         // Update Value for Previous Sequence
                         this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
                         this.prevMediaSeqOffset.video = playheadState.mediaSeq;
@@ -1316,8 +1303,8 @@ var Session = /** @class */ (function () {
                         }
                         m3u8 = currentVod.getLiveMediaSequences(playheadState.mediaSeq, 180000, playheadState.vodMediaSeqVideo, sessionState.discSeq);
                         return [4 /*yield*/, this._playheadState.setLastM3u8(m3u8)];
-                    case 35:
-                        _f.sent();
+                    case 37:
+                        _g.sent();
                         return [2 /*return*/, m3u8];
                 }
             });
@@ -1325,7 +1312,7 @@ var Session = /** @class */ (function () {
     };
     Session.prototype.getMediaManifestAsync = function (bw, opts) {
         return __awaiter(this, void 0, void 0, function () {
-            var tsLastRequestVideo, timeSinceLastRequest, sessionState, currentVod, _a, sequencesToIncrement, _b, _c, _d, m3u8, lastM3u8, _e, _f, _g, tsLastRequestVideo_1, timeSinceLastRequest_1, sessionState_2, _h, lastM3u8_1, _j, _k, _l;
+            var tsLastRequestVideo, timeSinceLastRequest, sessionState, currentVod, _a, sequencesToIncrement, _b, _c, _d, m3u8, lastM3u8, _e, _f, _g, tsLastRequestVideo_1, timeSinceLastRequest_1, sessionState_1, _h, lastM3u8_1, _j, _k, _l;
             return __generator(this, function (_m) {
                 switch (_m.label) {
                     case 0: // this function is no longer used and should be removed comment added 5/5-2023
@@ -1407,38 +1394,38 @@ var Session = /** @class */ (function () {
                         timeSinceLastRequest_1 = (tsLastRequestVideo_1 === null) ? 0 : Date.now() - tsLastRequestVideo_1;
                         return [4 /*yield*/, this._sessionState.getValues(["state", "vodMediaSeqVideo", "mediaSeq", "discSeq", "lastM3u8"])];
                     case 17:
-                        sessionState_2 = _m.sent();
-                        if (!(sessionState_2.state === SessionState.VOD_NEXT_INITIATING)) return [3 /*break*/, 19];
-                        _h = sessionState_2;
+                        sessionState_1 = _m.sent();
+                        if (!(sessionState_1.state === SessionState.VOD_NEXT_INITIATING)) return [3 /*break*/, 19];
+                        _h = sessionState_1;
                         return [4 /*yield*/, this._sessionState.set("state", SessionState.VOD_PLAYING)];
                     case 18:
                         _h.state = _m.sent();
                         _m.label = 19;
                     case 19:
-                        debug("[".concat(this._sessionId, "]: VIDEO ").concat(timeSinceLastRequest_1, " (").concat(this.averageSegmentDuration, ") bandwidth=").concat(bw, " vodMediaSeq=(").concat(sessionState_2.vodMediaSeqVideo, "_").concat(sessionState_2.vodMediaSeqAudio, ")"));
+                        debug("[".concat(this._sessionId, "]: VIDEO ").concat(timeSinceLastRequest_1, " (").concat(this.averageSegmentDuration, ") bandwidth=").concat(bw, " vodMediaSeq=(").concat(sessionState_1.vodMediaSeqVideo, "_").concat(sessionState_1.vodMediaSeqAudio, ")"));
                         try {
-                            m3u8 = currentVod.getLiveMediaSequences(sessionState_2.mediaSeq, bw, sessionState_2.vodMediaSeqVideo, sessionState_2.discSeq);
+                            m3u8 = currentVod.getLiveMediaSequences(sessionState_1.mediaSeq, bw, sessionState_1.vodMediaSeqVideo, sessionState_1.discSeq);
                         }
                         catch (exc) {
-                            if (sessionState_2.lastM3u8[bw]) {
-                                m3u8 = sessionState_2.lastM3u8[bw];
+                            if (sessionState_1.lastM3u8[bw]) {
+                                m3u8 = sessionState_1.lastM3u8[bw];
                             }
                             else {
                                 logerror(this._sessionId, exc);
                                 throw new Error('Failed to generate media manifest');
                             }
                         }
-                        lastM3u8_1 = sessionState_2.lastM3u8;
+                        lastM3u8_1 = sessionState_1.lastM3u8;
                         lastM3u8_1[bw] = m3u8;
-                        _j = sessionState_2;
+                        _j = sessionState_1;
                         return [4 /*yield*/, this._sessionState.set("lastM3u8", lastM3u8_1)];
                     case 20:
                         _j.lastM3u8 = _m.sent();
-                        _k = sessionState_2;
+                        _k = sessionState_1;
                         return [4 /*yield*/, this._sessionState.set("lastServedM3u8", m3u8)];
                     case 21:
                         _k.lastServedM3u8 = _m.sent();
-                        _l = sessionState_2;
+                        _l = sessionState_1;
                         return [4 /*yield*/, this._sessionState.set("tsLastRequestVideo", Date.now())];
                     case 22:
                         _l.tsLastRequestVideo = _m.sent();
@@ -1764,7 +1751,7 @@ var Session = /** @class */ (function () {
     };
     Session.prototype._tickAsync = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var newVod, sessionState, isLeader, currentVod, vodResponse, _a, nextVodPromise, nextVodStart, _b, loadPromise, hlsOpts, _c, mediaManifestLoader, audioManifestLoader, loadStart, updatedSessionState, _d, _e, _f, _g, err_7, _h, length_1, endMseqValue, endMseqValueAudio, endMseqValueSubtitle, lastDiscontinuity, lastDiscontinuityAudio, lastDiscontinuitySubtitle, _j, vodPromise, gracePeriod, nextVodStart, _k, loadPromise, hlsOpts, _l, mediaManifestLoader, audioManifestLoader, loadStart, _m, _o, updatedSessionState, _p, _q, diffMs, err_8, startTS, _r, mSeq, currentVod_2, dSeq, mSeqOffset, reloadBehind, segments, playheadState, nextMseq, _s, _t, err_9;
+            var newVod, sessionState, isLeader, currentVod, vodResponse, _a, nextVodPromise, nextVodStart, _b, loadPromise, hlsOpts, _c, mediaManifestLoader, audioManifestLoader, loadStart, updatedSessionState, _d, _e, _f, _g, err_7, _h, length_1, endMseqValue, endMseqValueAudio, endMseqValueSubtitle, lastDiscontinuity, lastDiscontinuityAudio, lastDiscontinuitySubtitle, _j, vodPromise, gracePeriod, nextVodStart, _k, loadPromise, hlsOpts, _l, mediaManifestLoader, audioManifestLoader, loadStart, _m, _o, updatedSessionState, _p, _q, diffMs, err_8, startTS, _r, mSeq, currentVod_1, dSeq, mSeqOffset, reloadBehind, segments, playheadState, nextMseq, _s, _t, err_9;
             var _this = this;
             return __generator(this, function (_u) {
                 switch (_u.label) {
@@ -1870,6 +1857,7 @@ var Session = /** @class */ (function () {
                         debug("[".concat(this._sessionId, "]: ").concat(currentVod.getDeltaTimes()));
                         debug("[".concat(this._sessionId, "]: playhead positions [V]=").concat(currentVod.getPlayheadPositions("video")));
                         debug("[".concat(this._sessionId, "]: playhead positions [A]=").concat(currentVod.getPlayheadPositions("audio")));
+                        debug("[".concat(this._sessionId, "]: playhead positions [S]=").concat(currentVod.getPlayheadPositions("subtitle")));
                         return [4 /*yield*/, this._sessionState.setValues({
                                 "mediaSeq": 0,
                                 "mediaSeqAudio": 0,
@@ -2110,6 +2098,7 @@ var Session = /** @class */ (function () {
                         debug("[".concat(this._sessionId, "]: next VOD loaded (").concat(newVod.getDeltaTimes(), ")"));
                         debug("[".concat(this._sessionId, "]: playhead positions [V]=").concat(newVod.getPlayheadPositions("video")));
                         debug("[".concat(this._sessionId, "]: playhead positions [A]=").concat(newVod.getPlayheadPositions("audio")));
+                        debug("[".concat(this._sessionId, "]: playhead positions [S]=").concat(newVod.getPlayheadPositions("subtitle")));
                         currentVod = newVod;
                         debug("[".concat(this._sessionId, "]: msequences=").concat(currentVod.getLiveMediaSequencesCount(), "; audio msequences=").concat(currentVod.getLiveMediaSequencesCount("audio"), "; subtitle msequences=").concat(currentVod.getLiveMediaSequencesCount("subtitle")));
                         _m = sessionState;
@@ -2216,8 +2205,8 @@ var Session = /** @class */ (function () {
                         mSeq = this.switchDataForSession.mediaSeq;
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
                     case 63:
-                        currentVod_2 = _u.sent();
-                        if (currentVod_2.sequenceAlwaysContainNewSegments) {
+                        currentVod_1 = _u.sent();
+                        if (currentVod_1.sequenceAlwaysContainNewSegments) {
                             // (!) will need to compensate if using this setting on HLSVod Object.
                             Object.keys(this.switchDataForSession.transitionSegments).forEach(function (bw) {
                                 var shiftedSeg = _this.switchDataForSession.transitionSegments[bw].shift();
@@ -2251,19 +2240,19 @@ var Session = /** @class */ (function () {
                     case 67:
                         playheadState = _u.sent();
                         nextMseq = playheadState.vodMediaSeqVideo + 1;
-                        if (nextMseq > currentVod_2.getLiveMediaSequencesCount() - 1) {
-                            nextMseq = currentVod_2.getLiveMediaSequencesCount() - 1;
+                        if (nextMseq > currentVod_1.getLiveMediaSequencesCount() - 1) {
+                            nextMseq = currentVod_1.getLiveMediaSequencesCount() - 1;
                         }
                         // ---------------------------------------------------.
                         // TODO: Support reloading with audioSegments and SubtitleSegments as well |
                         // ---------------------------------------------------'
-                        return [4 /*yield*/, currentVod_2.reload(nextMseq, segments, null, reloadBehind)];
+                        return [4 /*yield*/, currentVod_1.reload(nextMseq, segments, null, reloadBehind)];
                     case 68:
                         // ---------------------------------------------------.
                         // TODO: Support reloading with audioSegments and SubtitleSegments as well |
                         // ---------------------------------------------------'
                         _u.sent();
-                        return [4 /*yield*/, this._sessionState.setCurrentVod(currentVod_2, { ttl: currentVod_2.getDuration() * 1000 })];
+                        return [4 /*yield*/, this._sessionState.setCurrentVod(currentVod_1, { ttl: currentVod_1.getDuration() * 1000 })];
                     case 69:
                         _u.sent();
                         return [4 /*yield*/, this._sessionState.set("vodReloaded", 1)];
@@ -2293,9 +2282,9 @@ var Session = /** @class */ (function () {
                         _s.currentPlayheadRef = _u.sent();
                         // 4) Log to debug and cloudwatch
                         debug("[".concat(this._sessionId, "]: LEADER: Set new Reloaded VOD and vodMediaSeq counts in store."));
-                        debug("[".concat(this._sessionId, "]: next VOD Reloaded (").concat(currentVod_2.getDeltaTimes(), ")"));
-                        debug("[".concat(this._sessionId, "]: ").concat(currentVod_2.getPlayheadPositions()));
-                        debug("[".concat(this._sessionId, "]: msequences=").concat(currentVod_2.getLiveMediaSequencesCount()));
+                        debug("[".concat(this._sessionId, "]: next VOD Reloaded (").concat(currentVod_1.getDeltaTimes(), ")"));
+                        debug("[".concat(this._sessionId, "]: ").concat(currentVod_1.getPlayheadPositions()));
+                        debug("[".concat(this._sessionId, "]: msequences=").concat(currentVod_1.getLiveMediaSequencesCount()));
                         cloudWatchLog(!this.cloudWatchLogging, "engine-session", { event: "switchback", channel: this._sessionId, reqTimeMs: Date.now() - startTS });
                         return [2 /*return*/];
                     case 78:
@@ -2727,6 +2716,50 @@ var Session = /** @class */ (function () {
         }
         return false;
     };
+    Session.prototype._determineExtraMediaIncrement = function (_extraType, _currentPosVideo, _extraSeqFinalIndex, _vodMediaSeqExtra, _getExtraPlayheadPositionAsyncFn) {
+        return __awaiter(this, void 0, void 0, function () {
+            var extraMediaIncrement, positionV, positionX, posDiff, threshold, currentPosExtraMedia, difference;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        debug("[".concat(this._sessionId, "]: About to determine ").concat(_extraType, " increment. Video increment has already been executed."));
+                        extraMediaIncrement = 0;
+                        positionV = _currentPosVideo ? _currentPosVideo / 1000 : 0;
+                        threshold = 0.250;
+                        _a.label = 1;
+                    case 1:
+                        if (!(extraMediaIncrement < _extraSeqFinalIndex)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, _getExtraPlayheadPositionAsyncFn(_vodMediaSeqExtra + extraMediaIncrement)];
+                    case 2:
+                        currentPosExtraMedia = (_a.sent()) * 1000;
+                        positionX = currentPosExtraMedia ? currentPosExtraMedia / 1000 : 0;
+                        posDiff = (positionV - positionX).toFixed(3);
+                        debug("[".concat(this._sessionId, "]: positionV=").concat(positionV, ";position").concat(_extraType === "audio" ? "A" : "S", "=").concat(positionX, ";posDiff=").concat(posDiff));
+                        if (isNaN(posDiff)) {
+                            return [3 /*break*/, 3];
+                        }
+                        if (positionX >= positionV) {
+                            return [3 /*break*/, 3];
+                        }
+                        difference = Math.abs(posDiff);
+                        if (difference > threshold && difference > Number.EPSILON) {
+                            // Video position ahead of audio|sub position, further increment needed...
+                            extraMediaIncrement++;
+                        }
+                        else {
+                            debug("[".concat(this._sessionId, "]: Difference(").concat(difference, ") is acceptable; IncrementValue=").concat(extraMediaIncrement));
+                            return [3 /*break*/, 3];
+                        }
+                        return [3 /*break*/, 1];
+                    case 3: return [2 /*return*/, {
+                            increment: extraMediaIncrement,
+                            position: positionX,
+                            diff: posDiff
+                        }];
+                }
+            });
+        });
+    };
     return Session;
 }());
 module.exports = Session;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.3.7",
+  "version": "4.3.8",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/engine/session.js

@@ -834,51 +834,51 @@ class Session {
       }
     } else {
       sessionState.vodMediaSeqVideo = await this._sessionState.increment("vodMediaSeqVideo", 1);
-      let audioIncrement;
+      let playheadPosVideoMs;
+      let playheadAudio;
+      let playheadSubtitle;
+      if (this.use_demuxed_audio || this.use_vtt_subtitles) {
+        playheadPosVideoMs = (await this._getCurrentPlayheadPosition()) * 1000;
+      }
+
       if (this.use_demuxed_audio) {
-        let positionV = 0;
-        let positionA = 0;
-        const position = (await this._getCurrentPlayheadPosition()) * 1000;
-        positionV = position ? position / 1000 : 0;
-        let currentVod = await this._sessionState.getCurrentVod();
-        const sessionState = await this._sessionState.getValues(["vodMediaSeqAudio"]);
-        let posDiff;
-        let incrementValue = 1;
-        let index = 0;
         const audioSeqLastIdx = currentVod.getLiveMediaSequencesCount("audio") - 1;
-        const thresh = 0.5;
-        const maxAcceptableDiff = 0.001;
-        debug(`[${this._sessionId}]: About to determine audio increment`);
-        do {
-          const audioPosition = (await this._getAudioPlayheadPosition(sessionState.vodMediaSeqAudio + index)) * 1000;
-          positionA = audioPosition ? audioPosition / 1000 : 0;
-          posDiff = (positionV - positionA).toFixed(3);
-          debug(`[${this._sessionId}]: positionV=${positionV};positionA=${positionA};posDiff=${posDiff}`);
-          if (posDiff <= maxAcceptableDiff) {
-            break;
-          }
-          if (posDiff > thresh) {
-            index++;
-            incrementValue++;
-          } else if (posDiff > maxAcceptableDiff) {
-            index = incrementValue;
-            debug(`[${this._sessionId}]: Audio Stepping index set to = ${index}`);
-            break;
-          }
-          if (sessionState.vodMediaSeqAudio + index > audioSeqLastIdx) {
-            break;
-          }
-        } while (!(-thresh < posDiff && posDiff < thresh) && !isNaN(posDiff));
-        audioIncrement = index;
-        debug(`[${this._sessionId}]: Current VOD Playhead Positions are to be: [${positionV.toFixed(3)}][${positionA.toFixed(3)}] (${posDiff})`);
+        const sessionStateObj = await this._sessionState.getValues(["vodMediaSeqAudio"]);
+        playheadAudio = await this._determineExtraMediaIncrement(
+          "audio",
+          playheadPosVideoMs,
+          audioSeqLastIdx,
+          sessionStateObj.vodMediaSeqAudio,
+          this._getAudioPlayheadPosition.bind(this)
+        );
+        // Perform the Increment
+        debug(`[${this._sessionId}]: Will increment audio with ${playheadAudio.increment}`);
+        sessionState.vodMediaSeqAudio = await this._sessionState.increment("vodMediaSeqAudio", playheadAudio.increment);
       }
-      debug(`[${this._sessionId}]: Will increment audio with ${audioIncrement}`);
-      sessionState.vodMediaSeqAudio = await this._sessionState.increment("vodMediaSeqAudio", audioIncrement);
-
       if (this.use_vtt_subtitles) {
-        debug(`[${this._sessionId}]: Will increment subtitle with 1`);
-        sessionState.vodMediaSeqSubtitle = await this._sessionState.increment("vodMediaSeqSubtitle", 1);
+        const playheadPosVideo = playheadPosVideo || (await this._getCurrentPlayheadPosition()) * 1000;
+        const subtitleSeqLastIdx = currentVod.getLiveMediaSequencesCount("subtitle") - 1;
+        const sessionStateObj = await this._sessionState.getValues(["vodMediaSeqSubtitle"]);
+        playheadSubtitle = await this._determineExtraMediaIncrement(
+          "subtitle",
+          playheadPosVideoMs,
+          subtitleSeqLastIdx,
+          sessionStateObj.vodMediaSeqSubtitle,
+          this._getSubtitlePlayheadPosition.bind(this)
+        );
+        // Perform the Increment
+        debug(`[${this._sessionId}]: Will increment subtitle with ${playheadSubtitle.increment}`);
+        sessionState.vodMediaSeqSubtitle = await this._sessionState.increment("vodMediaSeqSubtitle", playheadSubtitle.increment);
       }
+      debug(`[${this._sessionId}]: Current VOD Playhead Positions are to be V[${(playheadPosVideoMs/1000).toFixed(3)}]${
+        playheadAudio ? `A[${(playheadAudio.position).toFixed(3)}]` : ""
+      }${
+        playheadSubtitle ? `S[${(playheadSubtitle.position).toFixed(3)})]` : ""
+      }${
+        playheadAudio ? ` (${playheadAudio.diff})` : ""
+      }${
+        playheadSubtitle ? ` (${playheadSubtitle.diff})` : ""
+      }`);
     }
 
     let newSessionState = {};
@@ -1388,6 +1388,7 @@ class Session {
             debug(`[${this._sessionId}]: ${currentVod.getDeltaTimes()}`);
             debug(`[${this._sessionId}]: playhead positions [V]=${currentVod.getPlayheadPositions("video")}`);
             debug(`[${this._sessionId}]: playhead positions [A]=${currentVod.getPlayheadPositions("audio")}`);
+            debug(`[${this._sessionId}]: playhead positions [S]=${currentVod.getPlayheadPositions("subtitle")}`);
             //debug(newVod);
             const updatedSessionState = await this._sessionState.setValues({
               "mediaSeq": 0,
@@ -1584,6 +1585,7 @@ class Session {
             debug(`[${this._sessionId}]: next VOD loaded (${newVod.getDeltaTimes()})`);
             debug(`[${this._sessionId}]: playhead positions [V]=${newVod.getPlayheadPositions("video")}`);
             debug(`[${this._sessionId}]: playhead positions [A]=${newVod.getPlayheadPositions("audio")}`);
+            debug(`[${this._sessionId}]: playhead positions [S]=${newVod.getPlayheadPositions("subtitle")}`);
             currentVod = newVod;
             debug(`[${this._sessionId}]: msequences=${currentVod.getLiveMediaSequencesCount()}; audio msequences=${currentVod.getLiveMediaSequencesCount("audio")}; subtitle msequences=${currentVod.getLiveMediaSequencesCount("subtitle")}`);
             sessionState.currentVod = await this._sessionState.setCurrentVod(currentVod, { ttl: currentVod.getDuration() * 1000 });
@@ -2089,6 +2091,40 @@ class Session {
     }
     return false;
   }
+  
+  async _determineExtraMediaIncrement(_extraType, _currentPosVideo, _extraSeqFinalIndex, _vodMediaSeqExtra, _getExtraPlayheadPositionAsyncFn) {
+    debug(`[${this._sessionId}]: About to determine ${_extraType} increment. Video increment has already been executed.`);
+    let extraMediaIncrement = 0;
+    let positionV = _currentPosVideo ? _currentPosVideo / 1000 : 0;
+    let positionX;
+    let posDiff;
+    const threshold = 0.250;
+    while (extraMediaIncrement < _extraSeqFinalIndex) {
+     const currentPosExtraMedia = (await _getExtraPlayheadPositionAsyncFn(_vodMediaSeqExtra + extraMediaIncrement)) * 1000;
+     positionX = currentPosExtraMedia ? currentPosExtraMedia / 1000 : 0;
+     posDiff = (positionV - positionX).toFixed(3);
+     debug(`[${this._sessionId}]: positionV=${positionV};position${_extraType === "audio" ? "A" : "S"}=${positionX};posDiff=${posDiff}`);
+     if (isNaN(posDiff)) {
+      break;
+     }
+     if (positionX >= positionV) {
+      break;
+     }
+      const difference = Math.abs(posDiff);
+      if (difference > threshold && difference > Number.EPSILON) {
+        // Video position ahead of audio|sub position, further increment needed...
+        extraMediaIncrement++;
+      } else {
+        debug(`[${this._sessionId}]: Difference(${difference}) is acceptable; IncrementValue=${extraMediaIncrement}`);
+        break;
+      }
+    }
+    return {
+      increment: extraMediaIncrement,
+      position: positionX,
+      diff: posDiff
+    };
+  }
 }
 
 module.exports = Session;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.3.7",
+  "version": "4.3.8",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/spec/engine/session_spec.js

@@ -1,20 +1,116 @@
-const Session = require('../../engine/session.js');
+const Session = require("../../engine/session.js");
 
-const { SessionStateStore } = require('../../engine/session_state.js');
-const { PlayheadStateStore } = require('../../engine/playhead_state.js');
+const { SessionStateStore } = require("../../engine/session_state.js");
+const { PlayheadStateStore } = require("../../engine/playhead_state.js");
 
 describe("Session", () => {
   let sessionLiveStore = undefined;
   beforeEach(() => {
     sessionLiveStore = {
       sessionStateStore: new SessionStateStore(),
-      playheadStateStore: new PlayheadStateStore()
-    };  
+      playheadStateStore: new PlayheadStateStore(),
+    };
   });
 
   it("creates a unique session ID", () => {
-    const id1 = new Session('dummy', null, sessionLiveStore).sessionId;
-    const id2 = new Session('dummy', null, sessionLiveStore).sessionId;
+    const id1 = new Session("dummy", null, sessionLiveStore).sessionId;
+    const id2 = new Session("dummy", null, sessionLiveStore).sessionId;
     expect(id1).not.toEqual(id2);
   });
-});
+
+  it("for demuxed, returns the appropriate audio increment value when desync is within acceptable limit, case I", async () => {
+    const session = new Session("dummy", null, sessionLiveStore);
+    const mockFinalAudioIdx = 50; // current Vod has 50 media sequences to serve.
+    const mockCurrentVideoPosition = 200.0 * 1000; // Video is 200s deep into its content.
+    const mockMseqAudio = 25; // current mseq for audio on vod, 25 out of 50.
+    const mock_getAudioPlayheadPosition = async (pos_n_current) => {
+      const mockPositions = [196.0, 199.84, 203.68, 207.52];
+      return mockPositions[pos_n_current - mockMseqAudio];
+    };
+    const output = await session._determineExtraMediaIncrement(
+      "audio",
+      mockCurrentVideoPosition,
+      mockFinalAudioIdx,
+      mockMseqAudio,
+      mock_getAudioPlayheadPosition,
+      24
+    );
+    expect(output.increment).toBe(1);
+  });
+
+  it("for demuxed, returns the appropriate audio increment value when desync is within acceptable limit, case II", async () => {
+    const session = new Session("dummy", null, sessionLiveStore);
+    const mockFinalAudioIdx = 50; // current Vod has 50 media sequences to serve.
+    const mockCurrentVideoPosition = 200.0 * 1000; // Video is 200s deep into its content.
+    const mockMseqAudio = 25; // current mseq for audio on vod, 25 out of 50.
+    const mock_getAudioPlayheadPosition = async (pos_n_current) => {
+      const mockPositions = [192.16, 196.0, 199.84, 203.68, 207.52];
+      return mockPositions[pos_n_current - mockMseqAudio];
+    };
+    const output = await session._determineExtraMediaIncrement(
+      "audio",
+      mockCurrentVideoPosition,
+      mockFinalAudioIdx,
+      mockMseqAudio,
+      mock_getAudioPlayheadPosition,
+      24
+    );
+    expect(output.increment).toBe(2);
+  });
+
+  it("for demuxed, returns the appropriate audio increment value when they are in sync but there is a floating point error", async () => {
+    const session = new Session("dummy", null, sessionLiveStore);
+    const mockFinalAudioIdx = 50;
+    const mockCurrentVideoPosition = 441.7599999999981697 * 1000; 
+    const mockMseqAudio = 25;
+    const mock_getAudioPlayheadPosition = async (pos_n_current) => {
+      const mockPositions = [437.919999999999, 441.75999999999897];
+      return mockPositions[pos_n_current - mockMseqAudio];
+    };
+    const output = await session._determineExtraMediaIncrement(
+      "audio",
+      mockCurrentVideoPosition,
+      mockFinalAudioIdx,
+      mockMseqAudio,
+      mock_getAudioPlayheadPosition,
+      24
+    );
+    expect(output.increment).toBe(1);
+  });
+  it("for demuxed, returns the appropriate audio increment value, normal case I", async () => {
+    const session = new Session("dummy", null, sessionLiveStore);
+    const mockFinalAudioIdx = 50;
+    const mockCurrentVideoPosition = 3.840 * 8 * 1000;
+    const mockMseqAudio = 5;
+    const mock_getAudioPlayheadPosition = async (pos_n_current) => {
+      const mockPositions = [0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52];
+      return mockPositions[pos_n_current];
+    };
+    const output = await session._determineExtraMediaIncrement(
+      "audio",
+      mockCurrentVideoPosition,
+      mockFinalAudioIdx,
+      mockMseqAudio,
+      mock_getAudioPlayheadPosition
+    );
+    expect(output.increment).toBe(3);
+  });
+  it("for demuxed, returns the appropriate audio increment value, normal case II", async () => {
+    const session = new Session("dummy", null, sessionLiveStore);
+    const mockFinalAudioIdx = 50;
+    const mockCurrentVideoPosition = 14 * 1000;
+    const mockMseqAudio = 0;
+    const mock_getAudioPlayheadPosition = async (pos_n_current) => {
+      const mockPositions = [0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52];
+      return mockPositions[pos_n_current];
+    };
+    const output = await session._determineExtraMediaIncrement(
+      "subtitle",
+      mockCurrentVideoPosition,
+      mockFinalAudioIdx,
+      mockMseqAudio,
+      mock_getAudioPlayheadPosition
+    );
+    expect(output.increment).toBe(4);
+  });
+});