eyevinn-channel-engine 4.0.1 → 4.0.3

package/dist/engine/session.js

@@ -783,7 +783,7 @@ var Session = /** @class */ (function () {
     };
     Session.prototype.getCurrentMediaManifestAsync = function (bw, playbackSessionId) {
         return __awaiter(this, void 0, void 0, function () {
-            var tries, sessionState, playheadState, state, m3u8_1, isLeader, diffMs, currentVod, manifestMseq, manifestDseq, mediaSequenceValue, m3u8_2, err_4;
+            var tries, sessionState, playheadState, state, isLeader, diffMs, currentVod, manifestMseq, manifestDseq, mediaSequenceValue, m3u8_1, err_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -828,17 +828,10 @@ var Session = /** @class */ (function () {
                         playheadState = _a.sent();
                         return [3 /*break*/, 11];
                     case 9:
-                        debug("[".concat(this._sessionId, "]: Recently Loaded Next Vod. PlayheadState not up-to-date. Return the last generated m3u8"));
-                        return [4 /*yield*/, this._playheadState.getLastM3u8()];
+                        debug("[".concat(this._sessionId, "]: Recently Loaded Next Vod. PlayheadState not up-to-date. Delay media-m3u8 Response by 1000ms"));
+                        return [4 /*yield*/, timer(1000)];
                     case 10:
-                        m3u8_1 = _a.sent();
-                        if (m3u8_1) {
-                            this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
-                            return [2 /*return*/, m3u8_1];
-                        }
-                        else {
-                            debug("[".concat(this._sessionId, "]: We don't have any previously generated m3u8"));
-                        }
+                        _a.sent();
                         _a.label = 11;
                     case 11:
                         if (!(playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video)) return [3 /*break*/, 16];
@@ -891,11 +884,11 @@ var Session = /** @class */ (function () {
                             manifestMseq = playheadState.mediaSeq + mediaSequenceValue;
                         }
                         debug("[".concat(this._sessionId, "]: [").concat(playheadState.vodMediaSeqVideo, "]_[").concat(currentVod.getLiveMediaSequencesCount(), "]"));
-                        m3u8_2 = currentVod.getLiveMediaSequences(playheadState.mediaSeq, bw, playheadState.vodMediaSeqVideo, sessionState.discSeq, this.targetDurationPadding, this.forceTargetDuration);
+                        m3u8_1 = currentVod.getLiveMediaSequences(playheadState.mediaSeq, bw, playheadState.vodMediaSeqVideo, sessionState.discSeq, this.targetDurationPadding, this.forceTargetDuration);
                         debug("[".concat(this._sessionId, "]: [").concat(manifestMseq, "][").concat(manifestDseq, "][+").concat(this.targetDurationPadding || 0, "] Current media manifest for ").concat(bw, " requested"));
                         this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
                         this.prevMediaSeqOffset.video = playheadState.mediaSeq;
-                        return [2 /*return*/, m3u8_2];
+                        return [2 /*return*/, m3u8_1];
                     case 20:
                         err_4 = _a.sent();
                         logerror(this._sessionId, err_4);
@@ -912,50 +905,109 @@ var Session = /** @class */ (function () {
     };
     Session.prototype.getCurrentAudioManifestAsync = function (audioGroupId, audioLanguage, playbackSessionId) {
         return __awaiter(this, void 0, void 0, function () {
-            var sessionState, playheadState, currentVod, m3u8_3, err_5;
+            var currentVod, sessionState, playheadState, state, AGE_THRESH, cacheAge, manifestMseq, manifestDseq, mediaSequenceValue, m3u8_2, err_5;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this._sessionState) {
                             throw new Error('Session not ready');
                         }
-                        return [4 /*yield*/, this._sessionState.getValues(["discSeqAudio"])];
+                        currentVod = null;
+                        return [4 /*yield*/, this._sessionState.getValues(["discSeqAudio", "vodMediaSeqAudio"])];
                     case 1:
                         sessionState = _a.sent();
                         return [4 /*yield*/, this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"])];
                     case 2:
                         playheadState = _a.sent();
-                        return [4 /*yield*/, this._sessionState.getCurrentVod()];
+                        if (!(playheadState.vodMediaSeqAudio > sessionState.vodMediaSeqAudio ||
+                            (playheadState.vodMediaSeqAudio < sessionState.vodMediaSeqAudio && playheadState.mediaSeqAudio === this.prevMediaSeqOffset.audio))) return [3 /*break*/, 9];
+                        return [4 /*yield*/, this._sessionState.get("state")];
                     case 3:
-                        currentVod = _a.sent();
-                        if (!currentVod) return [3 /*break*/, 8];
-                        _a.label = 4;
+                        state = _a.sent();
+                        if (![SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state)) return [3 /*break*/, 6];
+                        debug("[".concat(this._sessionId, "]: Recently reloaded Vod. PlayheadState not up-to-date (").concat(playheadState.vodMediaSeqAudio, "_").concat(sessionState.vodMediaSeqAudio, ") AUDIO. Waiting 500ms before reading from store again"));
+                        return [4 /*yield*/, timer(500)];
                     case 4:
-                        _a.trys.push([4, 5, , 7]);
-                        m3u8_3 = currentVod.getLiveMediaAudioSequences(playheadState.mediaSeqAudio, audioGroupId, audioLanguage, playheadState.vodMediaSeqAudio, sessionState.discSeqAudio, this.targetDurationPadding, this.forceTargetDuration);
+                        _a.sent();
+                        return [4 /*yield*/, this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"])];
+                    case 5:
+                        playheadState = _a.sent();
+                        return [3 /*break*/, 9];
+                    case 6:
+                        debug("[".concat(this._sessionId, "]: Recently Loaded Next Vod. PlayheadState not up-to-date. Delay audio-m3u8 Response by 1000ms"));
+                        return [4 /*yield*/, timer(1000)];
+                    case 7:
+                        _a.sent();
+                        return [4 /*yield*/, this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"])];
+                    case 8:
+                        playheadState = _a.sent();
+                        _a.label = 9;
+                    case 9:
+                        // local store the prev values
+                        if (this.prevVodMediaSeq.audio === null) {
+                            this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
+                        }
+                        if (this.prevMediaSeqOffset.audio === null) {
+                            this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
+                        }
+                        return [4 /*yield*/, this._sessionState.getCurrentVod()];
+                    case 10:
+                        currentVod = _a.sent();
+                        if (!currentVod) return [3 /*break*/, 18];
+                        if (!(playheadState.vodMediaSeqAudio < 2 || playheadState.mediaSeqAudio !== this.prevMediaSeqOffset.audio)) return [3 /*break*/, 14];
+                        AGE_THRESH = 20 * 1000;
+                        cacheAge = null;
+                        if (this._sessionState.cache && this._sessionState.cache.currentVod.ts) {
+                            cacheAge = Date.now() - this._sessionState.cache.currentVod.ts;
+                        }
+                        if (!(cacheAge !== null && cacheAge > AGE_THRESH)) return [3 /*break*/, 14];
+                        return [4 /*yield*/, timer(500)];
+                    case 11:
+                        _a.sent();
+                        debug("[".concat(this._sessionId, "]: While requesting audio manifest for ").concat(audioGroupId, "-").concat(audioLanguage, ", (mseq=").concat(playheadState.vodMediaSeqAudio, ")(vod cache age=").concat(cacheAge, ")"));
+                        return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
+                    case 12:
+                        _a.sent(); // force reading up from shared store
+                        return [4 /*yield*/, this._sessionState.getCurrentVod()];
+                    case 13:
+                        currentVod = _a.sent();
+                        _a.label = 14;
+                    case 14:
+                        _a.trys.push([14, 15, , 17]);
+                        manifestMseq = playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio;
+                        manifestDseq = sessionState.discSeqAudio + currentVod.discontinuitiesAudio[playheadState.vodMediaSeqAudio];
+                        if (currentVod.sequenceAlwaysContainNewSegments) {
+                            mediaSequenceValue = currentVod.mediaSequenceValuesAudio[playheadState.vodMediaSeqAudio];
+                            debug("[".concat(this._sessionId, "]: {").concat(mediaSequenceValue, "}_{").concat(currentVod.getLastSequenceMediaSequenceValueAudio(), "} AUDIO"));
+                            manifestMseq = playheadState.mediaSeqAudio + mediaSequenceValue;
+                        }
+                        debug("[".concat(this._sessionId, "]: [").concat(playheadState.vodMediaSeqAudio, "]_[").concat(currentVod.getLiveMediaSequencesCount("audio"), "] AUDIO"));
+                        m3u8_2 = currentVod.getLiveMediaAudioSequences(playheadState.mediaSeqAudio, audioGroupId, audioLanguage, playheadState.vodMediaSeqAudio, sessionState.discSeqAudio, this.targetDurationPadding, this.forceTargetDuration);
                         // # Case: current VOD does not have the selected track.
-                        if (!m3u8_3) {
+                        if (!m3u8_2) {
                             debug("[".concat(this._sessionId, "]: [").concat(playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio, "] Request Failed for current audio manifest for ").concat(audioGroupId, "-").concat(audioLanguage));
                         }
-                        debug("[".concat(this._sessionId, "]: [").concat(playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio, "] Current audio manifest for ").concat(audioGroupId, "-").concat(audioLanguage, " requested"));
-                        return [2 /*return*/, m3u8_3];
-                    case 5:
+                        debug("[".concat(this._sessionId, "]: [").concat(manifestMseq, "][").concat(manifestDseq, "] Current audio manifest for ").concat(audioGroupId, "-").concat(audioLanguage, " requested"));
+                        this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
+                        this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
+                        return [2 /*return*/, m3u8_2];
+                    case 15:
                         err_5 = _a.sent();
                         logerror(this._sessionId, err_5);
                         return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 6:
+                    case 16:
                         _a.sent(); // force reading up from shared store
                         throw new Error("Failed to generate audio manifest: " + JSON.stringify(playheadState));
-                    case 7: return [3 /*break*/, 9];
-                    case 8: throw new Error("Engine not ready");
-                    case 9: return [2 /*return*/];
+                    case 17: return [3 /*break*/, 19];
+                    case 18: throw new Error("Engine not ready");
+                    case 19: return [2 /*return*/];
                 }
             });
         });
     };
     Session.prototype.incrementAsync = function (incOpts) {
         return __awaiter(this, void 0, void 0, function () {
-            var isLeader, sessionState, playheadState, currentVod, _a, leaderAction, _b, m3u8_4, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, mediaSequenceValue, diffMs, m3u8;
+            var isLeader, sessionState, playheadState, currentVod, _a, leaderAction, _b, m3u8_3, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, mediaSequenceValue, diffMs, m3u8;
             return __generator(this, function (_o) {
                 switch (_o.label) {
                     case 0: return [4 /*yield*/, this._tickAsync()];
@@ -1006,9 +1058,9 @@ var Session = /** @class */ (function () {
                         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 = _o.sent();
-                        if (m3u8_4) {
-                            return [2 /*return*/, m3u8_4];
+                        m3u8_3 = _o.sent();
+                        if (m3u8_3) {
+                            return [2 /*return*/, m3u8_3];
                         }
                         else {
                             debug("[".concat(this._sessionId, "]: We don't have any previously generated m3u8"));
@@ -1110,6 +1162,10 @@ var Session = /** @class */ (function () {
                         // Update Value for Previous Sequence
                         this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
                         this.prevMediaSeqOffset.video = playheadState.mediaSeq;
+                        if (this.use_demuxed_audio) {
+                            this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
+                            this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
+                        }
                         m3u8 = currentVod.getLiveMediaSequences(playheadState.mediaSeq, 180000, playheadState.vodMediaSeqVideo, sessionState.discSeq);
                         return [4 /*yield*/, this._playheadState.setLastM3u8(m3u8)];
                     case 34:
@@ -1303,7 +1359,7 @@ var Session = /** @class */ (function () {
     };
     Session.prototype.getMasterManifestAsync = function (filter) {
         return __awaiter(this, void 0, void 0, function () {
-            var m3u8, currentVod, audioGroupIds, defaultAudioGroupId, hasClosedCaptions, i, audioGroupId, j, audioTrack, sessionProfile, i, audioGroupId, j, audioTrack;
+            var m3u8, currentVod, audioGroupIds, defaultAudioGroupId, hasClosedCaptions, i, audioGroupId, j, audioTrack, sessionProfile;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -1359,16 +1415,6 @@ var Session = /** @class */ (function () {
                                 m3u8 += "master" + profile.bw + ".m3u8;session=" + _this._sessionId + "\n";
                             });
                         }
-                        if (this.use_demuxed_audio === true && this._audioTracks) {
-                            for (i = 0; i < audioGroupIds.length; i++) {
-                                audioGroupId = audioGroupIds[i];
-                                for (j = 0; j < this._audioTracks.length; j++) {
-                                    audioTrack = this._audioTracks[j];
-                                    m3u8 += "#EXT-X-STREAM-INF:BANDWIDTH=97000,CODECS=\"mp4a.40.2\",AUDIO=\"".concat(audioGroupId, "\"\n");
-                                    m3u8 += "master-".concat(audioGroupId, "_").concat(audioTrack.language, ".m3u8;session=").concat(this._sessionId, "\n");
-                                }
-                            }
-                        }
                         this.produceEvent({
                             type: 'NOW_PLAYING',
                             data: {
@@ -1659,6 +1705,14 @@ var Session = /** @class */ (function () {
                         if (this.prevMediaSeqOffset.video === null) {
                             this.prevMediaSeqOffset.video = sessionState.mediaSeq;
                         }
+                        if (this.use_demuxed_audio) {
+                            if (this.prevVodMediaSeq.audio === null) {
+                                this.prevVodMediaSeq.audio = sessionState.vodMediaSeqAudio;
+                            }
+                            if (this.prevMediaSeqOffset.audio === null) {
+                                this.prevMediaSeqOffset.audio = sessionState.mediaSeqAudio;
+                            }
+                        }
                         if (!(sessionState.vodMediaSeqVideo < this.prevVodMediaSeq.video)) return [3 /*break*/, 30];
                         debug("[".concat(this._sessionId, "]: state=VOD_PLAYING, current[").concat(sessionState.vodMediaSeqVideo, "], prev[").concat(this.prevVodMediaSeq.video, "], total[").concat(currentVod.getLiveMediaSequencesCount(), "]"));
                         return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
@@ -1668,11 +1722,12 @@ var Session = /** @class */ (function () {
                     case 29:
                         currentVod = _2.sent();
                         this.prevVodMediaSeq.video = sessionState.vodMediaSeqVideo;
+                        this.prevVodMediaSeq.audio = sessionState.vodMediaSeqAudio;
                         _2.label = 30;
                     case 30: return [3 /*break*/, 32];
                     case 31:
                         // Handle edge case where Leader loaded next vod but Follower remained in state=VOD_PLAYING
-                        if (this.prevMediaSeqOffset.video !== null & sessionState.mediaSeq !== this.prevMediaSeqOffset.video) {
+                        if ((this.prevMediaSeqOffset.video !== null) & (sessionState.mediaSeq !== this.prevMediaSeqOffset.video)) {
                             debug("[".concat(this._sessionId, "]: state=VOD_PLAYING, current[").concat(sessionState.vodMediaSeqVideo, "], prev[").concat(this.prevVodMediaSeq.video, "], total[").concat(currentVod.getLiveMediaSequencesCount(), "]"));
                             debug("[".concat(this._sessionId, "]: mediaSeq offsets -> current[").concat(sessionState.vodMediaSeqVideo, "], prev[").concat(this.prevVodMediaSeq.video, "]"));
                             // Allow Follower to clear VodCache...

package/dist/package.json

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

package/dist/server-demux.js

@@ -10,8 +10,8 @@ var RefAssetManager = /** @class */ (function () {
             1: [
                 {
                     id: 1,
-                    title: "Elephants Dream",
-                    uri: "https://playertest.longtailvideo.com/adaptive/elephants_dream_v4/index.m3u8",
+                    title: "Sintel",
+                    uri: "https://cdn.bitmovin.com/content/assets/sintel/hls/playlist.m3u8",
                 },
                 {
                     id: 2,
@@ -21,7 +21,7 @@ var RefAssetManager = /** @class */ (function () {
             ],
         };
         this.pos = {
-            1: 1,
+            1: 0,
         };
     }
     /**
@@ -80,7 +80,10 @@ var RefChannelManager = /** @class */ (function () {
         ];
     };
     RefChannelManager.prototype._getAudioTracks = function () {
-        return [{ language: "Swedish", name: "Swedish" }];
+        return [
+            { language: "en", name: "English" },
+            { language: "sp", name: "Spanish" }
+        ];
     };
     return RefChannelManager;
 }());

package/engine/session.js

@@ -207,10 +207,10 @@ class Session {
             let incrementValue = 1;
             let index = 0;
             const audioSeqLastIdx = currentVod.getLiveMediaSequencesCount("audio") - 1;
-            const thresh = 0.5
+            const thresh = 0.5;
             let direction = 0;
             do {
-              const audioPosition = (await this._getAudioPlayheadPosition(sessionState.vodMediaSeqAudio + index)) * 1000; // PUT REAL WHEN DONE
+              const audioPosition = (await this._getAudioPlayheadPosition(sessionState.vodMediaSeqAudio + index)) * 1000;
               posDiff = position - audioPosition;
               if (posDiff > thresh && direction >= 0) {
                 index++;
@@ -582,14 +582,8 @@ class Session {
         await timer(500);
         playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"]);
       } else {
-        debug(`[${this._sessionId}]: Recently Loaded Next Vod. PlayheadState not up-to-date. Return the last generated m3u8`);
-        const m3u8 = await this._playheadState.getLastM3u8();
-        if (m3u8) {
-          this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
-          return m3u8;
-        } else {
-          debug(`[${this._sessionId}]: We don't have any previously generated m3u8`);
-        }
+        debug(`[${this._sessionId}]: Recently Loaded Next Vod. PlayheadState not up-to-date. Delay media-m3u8 Response by 1000ms`);
+        await timer(1000);
       }
     }
 
@@ -654,18 +648,76 @@ class Session {
     if (!this._sessionState) {
       throw new Error('Session not ready');
     }
+    let currentVod = null;
+    const sessionState = await this._sessionState.getValues(["discSeqAudio", "vodMediaSeqAudio"]);
+    let playheadState = await this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"]);
+
+    if (
+      playheadState.vodMediaSeqAudio > sessionState.vodMediaSeqAudio ||
+      (playheadState.vodMediaSeqAudio < sessionState.vodMediaSeqAudio && playheadState.mediaSeqAudio === this.prevMediaSeqOffset.audio)
+    ) {
+      const state = await this._sessionState.get("state");
+      if ([SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state)) {
+        debug(
+          `[${this._sessionId}]: Recently reloaded Vod. PlayheadState not up-to-date (${playheadState.vodMediaSeqAudio}_${sessionState.vodMediaSeqAudio}) AUDIO. Waiting 500ms before reading from store again`
+        );
+        await timer(500);
+        playheadState = await this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"]);
+      } else {
+        debug(`[${this._sessionId}]: Recently Loaded Next Vod. PlayheadState not up-to-date. Delay audio-m3u8 Response by 1000ms`);
+        await timer(1000);
+        playheadState = await this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"]);
+      }
+    }
 
-    const sessionState = await this._sessionState.getValues(["discSeqAudio"]);
-    const playheadState = await this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"]);
-    const currentVod = await this._sessionState.getCurrentVod();
+    // local store the prev values
+    if (this.prevVodMediaSeq.audio === null) {
+      this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
+    }
+    if (this.prevMediaSeqOffset.audio === null) {
+      this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
+    }
+    currentVod = await this._sessionState.getCurrentVod();
     if (currentVod) {
+      // condition suggesting that a new vod should exist
+      if (playheadState.vodMediaSeqAudio < 2 || playheadState.mediaSeqAudio !== this.prevMediaSeqOffset.audio) {
+        const AGE_THRESH = 20 * 1000;
+        let cacheAge = null;
+        if (this._sessionState.cache && this._sessionState.cache.currentVod.ts) {
+          cacheAge = Date.now() - this._sessionState.cache.currentVod.ts;
+        }
+        if (cacheAge !== null && cacheAge > AGE_THRESH) {
+          await timer(500);
+          debug(`[${this._sessionId}]: While requesting audio manifest for ${audioGroupId}-${audioLanguage}, (mseq=${playheadState.vodMediaSeqAudio})(vod cache age=${cacheAge})`);
+          await this._sessionState.clearCurrentVodCache(); // force reading up from shared store
+          currentVod = await this._sessionState.getCurrentVod();
+        }
+      }
       try {
-        const m3u8 = currentVod.getLiveMediaAudioSequences(playheadState.mediaSeqAudio, audioGroupId, audioLanguage, playheadState.vodMediaSeqAudio, sessionState.discSeqAudio, this.targetDurationPadding, this.forceTargetDuration);
+        let manifestMseq = playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio;
+        let manifestDseq = sessionState.discSeqAudio + currentVod.discontinuitiesAudio[playheadState.vodMediaSeqAudio];
+        if (currentVod.sequenceAlwaysContainNewSegments) {
+          const mediaSequenceValue = currentVod.mediaSequenceValuesAudio[playheadState.vodMediaSeqAudio];
+          debug(`[${this._sessionId}]: {${mediaSequenceValue}}_{${currentVod.getLastSequenceMediaSequenceValueAudio()}} AUDIO`);
+          manifestMseq = playheadState.mediaSeqAudio + mediaSequenceValue;
+        }
+        debug(`[${this._sessionId}]: [${playheadState.vodMediaSeqAudio}]_[${currentVod.getLiveMediaSequencesCount("audio")}] AUDIO`);
+        const m3u8 = currentVod.getLiveMediaAudioSequences(
+          playheadState.mediaSeqAudio,
+          audioGroupId,
+          audioLanguage,
+          playheadState.vodMediaSeqAudio,
+          sessionState.discSeqAudio,
+          this.targetDurationPadding,
+          this.forceTargetDuration
+        );
         // # Case: current VOD does not have the selected track.
         if (!m3u8) {
           debug(`[${this._sessionId}]: [${playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio}] Request Failed for current audio manifest for ${audioGroupId}-${audioLanguage}`);
         }
-        debug(`[${this._sessionId}]: [${playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio}] Current audio manifest for ${audioGroupId}-${audioLanguage} requested`);
+        debug(`[${this._sessionId}]: [${manifestMseq}][${manifestDseq}] Current audio manifest for ${audioGroupId}-${audioLanguage} requested`);
+        this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
+        this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
         return m3u8;
       } catch (err) {
         logerror(this._sessionId, err);
@@ -715,7 +767,7 @@ class Session {
         }
         this.isAllowedToClearVodCache = true;
       }
-    } else { // TODO ADD BETTER INCREMENT
+    } else {
       sessionState.vodMediaSeqVideo = await this._sessionState.increment("vodMediaSeqVideo");
       if (incOpts) {
         sessionState.vodMediaSeqAudio = await this._sessionState.increment("vodMediaSeqAudio", incOpts.audio);
@@ -776,6 +828,10 @@ class Session {
     // Update Value for Previous Sequence
     this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
     this.prevMediaSeqOffset.video = playheadState.mediaSeq;
+    if (this.use_demuxed_audio) {
+      this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
+      this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
+    }
 
     let m3u8 = currentVod.getLiveMediaSequences(playheadState.mediaSeq, 180000, playheadState.vodMediaSeqVideo, sessionState.discSeq);
     await this._playheadState.setLastM3u8(m3u8);
@@ -941,16 +997,7 @@ class Session {
         m3u8 += "master" + profile.bw + ".m3u8;session=" + this._sessionId + "\n";
       });
     }
-    if (this.use_demuxed_audio === true && this._audioTracks) {
-      for (let i = 0; i < audioGroupIds.length; i++) {
-        let audioGroupId = audioGroupIds[i];
-        for (let j = 0; j < this._audioTracks.length; j++) {
-          let audioTrack = this._audioTracks[j];
-          m3u8 += `#EXT-X-STREAM-INF:BANDWIDTH=97000,CODECS="mp4a.40.2",AUDIO="${audioGroupId}"\n`;
-          m3u8 += `master-${audioGroupId}_${audioTrack.language}.m3u8;session=${this._sessionId}\n`;
-        }
-      }
-    }
+
     this.produceEvent({
       type: 'NOW_PLAYING',
       data: {
@@ -1145,16 +1192,25 @@ class Session {
           if (this.prevMediaSeqOffset.video === null) {
             this.prevMediaSeqOffset.video = sessionState.mediaSeq;
           }
+          if (this.use_demuxed_audio) {
+            if (this.prevVodMediaSeq.audio === null) {
+              this.prevVodMediaSeq.audio = sessionState.vodMediaSeqAudio;
+            }
+            if (this.prevMediaSeqOffset.audio === null) {
+              this.prevMediaSeqOffset.audio = sessionState.mediaSeqAudio;
+            }
+          }
           // Clear Cache if prev count is HIGHER than current...
           if (sessionState.vodMediaSeqVideo < this.prevVodMediaSeq.video) {
             debug(`[${this._sessionId}]: state=VOD_PLAYING, current[${sessionState.vodMediaSeqVideo}], prev[${this.prevVodMediaSeq.video}], total[${currentVod.getLiveMediaSequencesCount()}]`);
             await this._sessionState.clearCurrentVodCache();
             currentVod = await this._sessionState.getCurrentVod();
             this.prevVodMediaSeq.video = sessionState.vodMediaSeqVideo;
+            this.prevVodMediaSeq.audio = sessionState.vodMediaSeqAudio;
           }
         } else {
           // Handle edge case where Leader loaded next vod but Follower remained in state=VOD_PLAYING
-          if (this.prevMediaSeqOffset.video !== null & sessionState.mediaSeq !== this.prevMediaSeqOffset.video) {
+          if ((this.prevMediaSeqOffset.video !== null) & (sessionState.mediaSeq !== this.prevMediaSeqOffset.video)) {
             debug(`[${this._sessionId}]: state=VOD_PLAYING, current[${sessionState.vodMediaSeqVideo}], prev[${this.prevVodMediaSeq.video}], total[${currentVod.getLiveMediaSequencesCount()}]`);
             debug(`[${this._sessionId}]: mediaSeq offsets -> current[${sessionState.vodMediaSeqVideo}], prev[${this.prevVodMediaSeq.video}]`);
             // Allow Follower to clear VodCache...

package/package.json

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

package/server-demux.ts

@@ -22,8 +22,8 @@ class RefAssetManager implements IAssetManager {
       1: [
         {
           id: 1,
-          title: "Elephants Dream",
-          uri: "https://playertest.longtailvideo.com/adaptive/elephants_dream_v4/index.m3u8",
+          title: "Sintel",
+          uri: "https://cdn.bitmovin.com/content/assets/sintel/hls/playlist.m3u8",
         },
         {
           id: 2,
@@ -33,7 +33,7 @@ class RefAssetManager implements IAssetManager {
       ],
     };
     this.pos = {
-      1: 1,
+      1: 0,
     };
   }
 
@@ -90,7 +90,10 @@ class RefChannelManager implements IChannelManager {
     ];
   }
   _getAudioTracks(): AudioTracks[] {
-    return [{ language: "Swedish", name: "Swedish" }];
+    return [
+      { language: "en", name: "English" },
+      { language: "sp", name: "Spanish" }
+    ];
   }
 }