eyevinn-channel-engine 4.0.5 → 4.0.7

package/dist/engine/server.d.ts

@@ -75,6 +75,8 @@ export interface ClosedCaptions {
 export interface AudioTracks {
     language: string;
     name: string;
+    channels?: number;
+    codecs?: string;
     default?: boolean;
 }
 export interface IChannelManager {

package/dist/engine/server.js

@@ -818,7 +818,7 @@ var ChannelEngine = /** @class */ (function () {
                             "Access-Control-Allow-Origin": "*",
                             "Access-Control-Allow-Headers": "X-Session-Id",
                             "Access-Control-Expose-Headers": "X-Session-Id",
-                            "Cache-Control": "no-cache",
+                            "Cache-Control": "max-age=300",
                             "X-Session-Id": session.sessionId,
                             "X-Instance-Id": this.instanceId + "<".concat(version, ">"),
                         });

package/dist/engine/session.d.ts

@@ -87,7 +87,7 @@ declare class Session {
     }>;
     getCurrentMediaManifestAsync(bw: any, playbackSessionId: any): Promise<any>;
     getCurrentAudioManifestAsync(audioGroupId: any, audioLanguage: any, playbackSessionId: any): Promise<any>;
-    incrementAsync(incOpts: any): Promise<any>;
+    incrementAsync(): Promise<any>;
     getMediaManifestAsync(bw: any, opts: any): Promise<any>;
     getAudioManifestAsync(audioGroupId: any, audioLanguage: any, opts: any): Promise<any>;
     getMasterManifestAsync(filter: any): Promise<string>;

package/dist/engine/session.js

@@ -193,7 +193,7 @@ var Session = /** @class */ (function () {
     });
     Session.prototype.startPlayheadAsync = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var playheadState, state, numberOfLargeTicks, audioIncrement, tsIncrementBegin, manifest, tsIncrementEnd, sessionState, isLeader, firstDuration, tickInterval, reqTickInterval, timeSpentInIncrement, tickInterval, delta, position, currentVod, sessionState_1, posDiff, incrementValue, index, audioSeqLastIdx, thresh, direction, audioPosition, timePosition, diff, timeToAdd, timeToAdd, DIFF_COMPENSATION, changeMaxTick, tsTickEnd, lastDuration, nextTickInterval, err_1;
+            var playheadState, state, numberOfLargeTicks, audioIncrement, tsIncrementBegin, manifest, tsIncrementEnd, sessionState, isLeader, firstDuration, tickInterval, reqTickInterval, timeSpentInIncrement, tickInterval, delta, position, timePosition, diff, timeToAdd, timeToAdd, DIFF_COMPENSATION, changeMaxTick, tsTickEnd, lastDuration, nextTickInterval, err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -212,14 +212,12 @@ var Session = /** @class */ (function () {
                         audioIncrement = 1;
                         _a.label = 3;
                     case 3:
-                        if (!(state !== PlayheadState.CRASHED)) return [3 /*break*/, 32];
+                        if (!(state !== PlayheadState.CRASHED)) return [3 /*break*/, 25];
                         _a.label = 4;
                     case 4:
-                        _a.trys.push([4, 29, , 31]);
+                        _a.trys.push([4, 22, , 24]);
                         tsIncrementBegin = Date.now();
-                        return [4 /*yield*/, this.incrementAsync({
-                                audio: audioIncrement
-                            })];
+                        return [4 /*yield*/, this.incrementAsync()];
                     case 5:
                         manifest = _a.sent();
                         if (!!manifest) return [3 /*break*/, 7];
@@ -256,7 +254,7 @@ var Session = /** @class */ (function () {
                         debug("[".concat(this._sessionId, "]: I am the leader and updated tick interval to ").concat(tickInterval, " sec"));
                         cloudWatchLog(!this.cloudWatchLogging, 'engine-session', { event: 'tickIntervalUpdated', channel: this._sessionId, tickIntervalSec: tickInterval });
                         this._playheadState.set("tickInterval", tickInterval);
-                        return [3 /*break*/, 28];
+                        return [3 /*break*/, 21];
                     case 13:
                         if (!(state == PlayheadState.STOPPED)) return [3 /*break*/, 14];
                         debug("[".concat(this._sessionId, "]: Stopping playhead"));
@@ -275,49 +273,6 @@ var Session = /** @class */ (function () {
                         return [4 /*yield*/, this._getCurrentPlayheadPosition()];
                     case 16:
                         position = (_a.sent()) * 1000;
-                        if (!this.use_demuxed_audio) return [3 /*break*/, 23];
-                        return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 17:
-                        currentVod = _a.sent();
-                        return [4 /*yield*/, this._sessionState.getValues(["vodMediaSeqAudio"])];
-                    case 18:
-                        sessionState_1 = _a.sent();
-                        posDiff = void 0;
-                        incrementValue = 1;
-                        index = 0;
-                        audioSeqLastIdx = currentVod.getLiveMediaSequencesCount("audio") - 1;
-                        thresh = 0.5;
-                        direction = 0;
-                        _a.label = 19;
-                    case 19: return [4 /*yield*/, this._getAudioPlayheadPosition(sessionState_1.vodMediaSeqAudio + index)];
-                    case 20:
-                        audioPosition = (_a.sent()) * 1000;
-                        posDiff = position - audioPosition;
-                        if (posDiff > thresh && direction >= 0) {
-                            index++;
-                            incrementValue++;
-                            direction = 1;
-                        }
-                        else if (posDiff < -thresh && direction <= 0) {
-                            incrementValue = 0;
-                            index--;
-                            direction = -1;
-                            return [3 /*break*/, 22];
-                        }
-                        else if (direction > 0 && posDiff < 0) {
-                            return [3 /*break*/, 22];
-                        }
-                        if (sessionState_1.vodMediaSeqAudio + index > audioSeqLastIdx || sessionState_1.vodMediaSeqAudio + index < 0) {
-                            return [3 /*break*/, 22];
-                        }
-                        _a.label = 21;
-                    case 21:
-                        if (!(-thresh < posDiff && posDiff < thresh)) return [3 /*break*/, 19];
-                        _a.label = 22;
-                    case 22:
-                        audioIncrement = incrementValue;
-                        _a.label = 23;
-                    case 23:
                         timePosition = Date.now() - playheadState.playheadRef;
                         // Apply time position offset if set, only after external diff compensation has concluded.
                         if (this.timePositionOffset && this.diffCompensation <= 0 && this.alwaysNewSegments) {
@@ -368,36 +323,36 @@ var Session = /** @class */ (function () {
                         }
                         debug("[".concat(this._sessionId, "]: (").concat((new Date()).toISOString(), ") ").concat(timeSpentInIncrement, "sec in increment. Next tick in ").concat(tickInterval, " seconds"));
                         return [4 /*yield*/, timer((tickInterval * 1000) - 50)];
-                    case 24:
+                    case 17:
                         _a.sent();
                         tsTickEnd = Date.now();
                         return [4 /*yield*/, this._playheadState.set("tickMs", (tsTickEnd - tsIncrementBegin))];
-                    case 25:
+                    case 18:
                         _a.sent();
                         cloudWatchLog(!this.cloudWatchLogging, 'engine-session', { event: 'tickInterval', channel: this._sessionId, tickTimeMs: (tsTickEnd - tsIncrementBegin) });
-                        if (!this.alwaysNewSegments) return [3 /*break*/, 28];
+                        if (!this.alwaysNewSegments) return [3 /*break*/, 21];
                         return [4 /*yield*/, this._getLastDuration(manifest)];
-                    case 26:
+                    case 19:
                         lastDuration = _a.sent();
                         nextTickInterval = lastDuration < 2 ? 2 : lastDuration;
                         return [4 /*yield*/, this._playheadState.set("tickInterval", nextTickInterval)];
-                    case 27:
+                    case 20:
                         _a.sent();
                         cloudWatchLog(!this.cloudWatchLogging, "engine-session", { event: "tickIntervalUpdated", channel: this._sessionId, tickIntervalSec: nextTickInterval });
-                        _a.label = 28;
-                    case 28: return [3 /*break*/, 31];
-                    case 29:
+                        _a.label = 21;
+                    case 21: return [3 /*break*/, 24];
+                    case 22:
                         err_1 = _a.sent();
                         debug("[".concat(this._sessionId, "]: Playhead consumer crashed (1)"));
                         console.error("[".concat(this._sessionId, "]: ").concat(err_1.message));
                         cloudWatchLog(!this.cloudWatchLogging, 'engine-session', { event: 'error', on: 'playhead', channel: this._sessionId, err: err_1 });
                         debug(err_1);
                         return [4 /*yield*/, this._playheadState.setState(PlayheadState.CRASHED)];
-                    case 30:
+                    case 23:
                         state = _a.sent();
-                        return [3 /*break*/, 31];
-                    case 31: return [3 /*break*/, 3];
-                    case 32: return [2 /*return*/];
+                        return [3 /*break*/, 24];
+                    case 24: return [3 /*break*/, 3];
+                    case 25: return [2 /*return*/];
                 }
             });
         });
@@ -786,7 +741,7 @@ var Session = /** @class */ (function () {
     };
     Session.prototype.getCurrentMediaManifestAsync = function (bw, playbackSessionId) {
         return __awaiter(this, void 0, void 0, function () {
-            var tries, sessionState, playheadState, state, isLeader, diffMs, currentVod, manifestMseq, manifestDseq, mediaSequenceValue, m3u8_1, err_4;
+            var tries, sessionState, playheadState, state, DELAY_TIME_MS, ACTION, isLeader, diffMs, currentVod, manifestMseq, manifestDseq, mediaSequenceValue, m3u8_1, err_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -815,29 +770,22 @@ var Session = /** @class */ (function () {
                         if (this.prevMediaSeqOffset.video === null) {
                             this.prevMediaSeqOffset.video = playheadState.mediaSeq;
                         }
-                        if (!(playheadState.vodMediaSeqVideo > sessionState.vodMediaSeqVideo ||
-                            (playheadState.vodMediaSeqVideo < sessionState.vodMediaSeqVideo &&
-                                playheadState.mediaSeq === this.prevMediaSeqOffset.video))) return [3 /*break*/, 11];
+                        if (!(playheadState.vodMediaSeqVideo > sessionState.vodMediaSeqVideo || (playheadState.vodMediaSeqVideo < sessionState.vodMediaSeqVideo && playheadState.mediaSeq === this.prevMediaSeqOffset.video))) return [3 /*break*/, 9];
                         return [4 /*yield*/, this._sessionState.get("state")];
                     case 6:
                         state = _a.sent();
-                        if (![SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state)) return [3 /*break*/, 9];
-                        debug("[".concat(this._sessionId, "]: Recently reloaded Vod. PlayheadState not up-to-date (").concat(playheadState.vodMediaSeqVideo, "_").concat(sessionState.vodMediaSeqVideo, "). Waiting 500ms before reading from store again"));
-                        return [4 /*yield*/, timer(500)];
+                        DELAY_TIME_MS = 1000;
+                        ACTION = [SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state) ? "Reloaded" : "Loaded Next";
+                        debug("[".concat(this._sessionId, "]: Recently ").concat(ACTION, " Vod. PlayheadState not up-to-date (").concat(playheadState.vodMediaSeqVideo, "_").concat(sessionState.vodMediaSeqVideo, "). Waiting ").concat(DELAY_TIME_MS, "ms before reading from store again"));
+                        return [4 /*yield*/, timer(DELAY_TIME_MS)];
                     case 7:
                         _a.sent();
                         return [4 /*yield*/, this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"])];
                     case 8:
                         playheadState = _a.sent();
-                        return [3 /*break*/, 11];
+                        _a.label = 9;
                     case 9:
-                        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:
-                        _a.sent();
-                        _a.label = 11;
-                    case 11:
-                        if (!(playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video)) return [3 /*break*/, 16];
+                        if (!(playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video)) return [3 /*break*/, 14];
                         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 true, then we have not updated the prev-values and not cleared the cache yet.
@@ -845,16 +793,16 @@ var Session = /** @class */ (function () {
                             this.isAllowedToClearVodCache = true;
                         }
                         return [4 /*yield*/, this._sessionStateStore.isLeader(this._instanceId)];
-                    case 12:
+                    case 10:
                         isLeader = _a.sent();
-                        if (!(!isLeader && this.isAllowedToClearVodCache)) return [3 /*break*/, 15];
+                        if (!(!isLeader && this.isAllowedToClearVodCache)) return [3 /*break*/, 13];
                         debug("[".concat(this._sessionId, "]: Not a leader and first|second media sequence in a VOD is requested. Invalidate cache to ensure having the correct VOD."));
                         return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 13:
+                    case 11:
                         _a.sent();
                         this.isAllowedToClearVodCache = false;
                         return [4 /*yield*/, this._playheadState.get("diffCompensation")];
-                    case 14:
+                    case 12:
                         diffMs = _a.sent();
                         if (diffMs) {
                             this.diffCompensation = diffMs;
@@ -867,18 +815,18 @@ var Session = /** @class */ (function () {
                                 this.timePositionOffset = 0;
                             }
                         }
+                        _a.label = 13;
+                    case 13: return [3 /*break*/, 15];
+                    case 14:
+                        this.isAllowedToClearVodCache = true;
                         _a.label = 15;
-                    case 15: return [3 /*break*/, 17];
+                    case 15: return [4 /*yield*/, this._sessionState.getCurrentVod()];
                     case 16:
-                        this.isAllowedToClearVodCache = true;
-                        _a.label = 17;
-                    case 17: return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 18:
                         currentVod = _a.sent();
-                        if (!currentVod) return [3 /*break*/, 23];
-                        _a.label = 19;
-                    case 19:
-                        _a.trys.push([19, 20, , 22]);
+                        if (!currentVod) return [3 /*break*/, 21];
+                        _a.label = 17;
+                    case 17:
+                        _a.trys.push([17, 18, , 20]);
                         manifestMseq = playheadState.mediaSeq + playheadState.vodMediaSeqVideo;
                         manifestDseq = sessionState.discSeq + currentVod.discontinuities[playheadState.vodMediaSeqVideo];
                         if (currentVod.sequenceAlwaysContainNewSegments) {
@@ -892,23 +840,23 @@ var Session = /** @class */ (function () {
                         this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
                         this.prevMediaSeqOffset.video = playheadState.mediaSeq;
                         return [2 /*return*/, m3u8_1];
-                    case 20:
+                    case 18:
                         err_4 = _a.sent();
                         logerror(this._sessionId, err_4);
                         return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 21:
+                    case 19:
                         _a.sent(); // force reading up from shared store
                         throw new Error("Failed to generate manifest: " + JSON.stringify(playheadState));
-                    case 22: return [3 /*break*/, 24];
-                    case 23: throw new Error("Engine not ready");
-                    case 24: return [2 /*return*/];
+                    case 20: return [3 /*break*/, 22];
+                    case 21: throw new Error("Engine not ready");
+                    case 22: return [2 /*return*/];
                 }
             });
         });
     };
     Session.prototype.getCurrentAudioManifestAsync = function (audioGroupId, audioLanguage, playbackSessionId) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentVod, sessionState, playheadState, state, AGE_THRESH, cacheAge, manifestMseq, manifestDseq, mediaSequenceValue, m3u8_2, err_5;
+            var currentVod, sessionState, playheadState, state, DELAY_TIME_MS, ACTION, AGE_THRESH, cacheAge, manifestMseq, manifestDseq, mediaSequenceValue, m3u8_2, err_5;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -922,30 +870,21 @@ var Session = /** @class */ (function () {
                         return [4 /*yield*/, this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"])];
                     case 2:
                         playheadState = _a.sent();
-                        if (!(playheadState.vodMediaSeqAudio > sessionState.vodMediaSeqAudio ||
-                            (playheadState.vodMediaSeqAudio < sessionState.vodMediaSeqAudio && playheadState.mediaSeqAudio === this.prevMediaSeqOffset.audio))) return [3 /*break*/, 9];
+                        if (!(playheadState.vodMediaSeqAudio > sessionState.vodMediaSeqAudio || (playheadState.vodMediaSeqAudio < sessionState.vodMediaSeqAudio && playheadState.mediaSeqAudio === this.prevMediaSeqOffset.audio))) return [3 /*break*/, 6];
                         return [4 /*yield*/, this._sessionState.get("state")];
                     case 3:
                         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)];
+                        DELAY_TIME_MS = 1000;
+                        ACTION = [SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state) ? "Reloaded" : "Loaded Next";
+                        debug("[".concat(this._sessionId, "]: Recently ").concat(ACTION, " Vod. PlayheadState not up-to-date (").concat(playheadState.vodMediaSeqAudio, "_").concat(sessionState.vodMediaSeqAudio, "). Waiting ").concat(DELAY_TIME_MS, "ms before reading from store again"));
+                        return [4 /*yield*/, timer(DELAY_TIME_MS)];
                     case 4:
                         _a.sent();
                         return [4 /*yield*/, this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"])];
                     case 5:
                         playheadState = _a.sent();
-                        return [3 /*break*/, 9];
+                        _a.label = 6;
                     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;
@@ -954,29 +893,29 @@ var Session = /** @class */ (function () {
                             this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
                         }
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 10:
+                    case 7:
                         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;
+                        if (!currentVod) return [3 /*break*/, 15];
+                        if (!(playheadState.vodMediaSeqAudio < 2 || playheadState.mediaSeqAudio !== this.prevMediaSeqOffset.audio)) return [3 /*break*/, 11];
+                        AGE_THRESH = this.averageSegmentDuration * 2;
                         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];
+                        if (!(cacheAge !== null && cacheAge > AGE_THRESH)) return [3 /*break*/, 11];
                         return [4 /*yield*/, timer(500)];
-                    case 11:
+                    case 8:
                         _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:
+                    case 9:
                         _a.sent(); // force reading up from shared store
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 13:
+                    case 10:
                         currentVod = _a.sent();
-                        _a.label = 14;
-                    case 14:
-                        _a.trys.push([14, 15, , 17]);
+                        _a.label = 11;
+                    case 11:
+                        _a.trys.push([11, 12, , 14]);
                         manifestMseq = playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio;
                         manifestDseq = sessionState.discSeqAudio + currentVod.discontinuitiesAudio[playheadState.vodMediaSeqAudio];
                         if (currentVod.sequenceAlwaysContainNewSegments) {
@@ -994,23 +933,23 @@ var Session = /** @class */ (function () {
                         this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
                         this.prevMediaSeqOffset.audio = playheadState.mediaSeqAudio;
                         return [2 /*return*/, m3u8_2];
-                    case 15:
+                    case 12:
                         err_5 = _a.sent();
                         logerror(this._sessionId, err_5);
                         return [4 /*yield*/, this._sessionState.clearCurrentVodCache()];
-                    case 16:
+                    case 13:
                         _a.sent(); // force reading up from shared store
                         throw new Error("Failed to generate audio manifest: " + JSON.stringify(playheadState));
-                    case 17: return [3 /*break*/, 19];
-                    case 18: throw new Error("Engine not ready");
-                    case 19: return [2 /*return*/];
+                    case 14: return [3 /*break*/, 16];
+                    case 15: throw new Error("Engine not ready");
+                    case 16: return [2 /*return*/];
                 }
             });
         });
     };
-    Session.prototype.incrementAsync = function (incOpts) {
+    Session.prototype.incrementAsync = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var isLeader, sessionState, playheadState, currentVod, _a, leaderAction, _b, m3u8_3, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, mediaSequenceValue, diffMs, m3u8;
+            var isLeader, sessionState, playheadState, currentVod, _a, leaderAction, _b, m3u8_3, _c, audioIncrement, position, currentVod_1, sessionState_1, posDiff, incrementValue, index, audioSeqLastIdx, thresh, audioPosition, _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()];
@@ -1070,82 +1009,124 @@ var Session = /** @class */ (function () {
                         }
                         this.isAllowedToClearVodCache = true;
                         _o.label = 13;
-                    case 13: return [3 /*break*/, 17];
+                    case 13: return [3 /*break*/, 25];
                     case 14:
                         _c = sessionState;
                         return [4 /*yield*/, this._sessionState.increment("vodMediaSeqVideo")];
                     case 15:
                         _c.vodMediaSeqVideo = _o.sent();
-                        if (!incOpts) return [3 /*break*/, 17];
-                        _d = sessionState;
-                        return [4 /*yield*/, this._sessionState.increment("vodMediaSeqAudio", incOpts.audio)];
+                        audioIncrement = void 0;
+                        if (!this.use_demuxed_audio) return [3 /*break*/, 23];
+                        return [4 /*yield*/, this._getCurrentPlayheadPosition()];
                     case 16:
-                        _d.vodMediaSeqAudio = _o.sent();
-                        _o.label = 17;
+                        position = (_o.sent()) * 1000;
+                        return [4 /*yield*/, this._sessionState.getCurrentVod()];
                     case 17:
-                        if (!(sessionState.vodMediaSeqVideo >= currentVod.getLiveMediaSequencesCount() - 1)) return [3 /*break*/, 20];
+                        currentVod_1 = _o.sent();
+                        return [4 /*yield*/, this._sessionState.getValues(["vodMediaSeqAudio"])];
+                    case 18:
+                        sessionState_1 = _o.sent();
+                        posDiff = void 0;
+                        incrementValue = 1;
+                        index = 0;
+                        audioSeqLastIdx = currentVod_1.getLiveMediaSequencesCount("audio") - 1;
+                        thresh = 0.5;
+                        _o.label = 19;
+                    case 19: return [4 /*yield*/, this._getAudioPlayheadPosition(sessionState_1.vodMediaSeqAudio + index)];
+                    case 20:
+                        audioPosition = (_o.sent()) * 1000;
+                        posDiff = position - audioPosition;
+                        if (posDiff < 0) {
+                            return [3 /*break*/, 22];
+                        }
+                        if (posDiff > thresh) {
+                            index++;
+                            incrementValue++;
+                        }
+                        else {
+                            index = incrementValue;
+                            return [3 /*break*/, 22];
+                        }
+                        if (sessionState_1.vodMediaSeqAudio + index > audioSeqLastIdx) {
+                            return [3 /*break*/, 22];
+                        }
+                        _o.label = 21;
+                    case 21:
+                        if (!(-thresh < posDiff && posDiff < thresh)) return [3 /*break*/, 19];
+                        _o.label = 22;
+                    case 22:
+                        audioIncrement = index;
+                        _o.label = 23;
+                    case 23:
+                        _d = sessionState;
+                        return [4 /*yield*/, this._sessionState.increment("vodMediaSeqAudio", audioIncrement)];
+                    case 24:
+                        _d.vodMediaSeqAudio = _o.sent();
+                        _o.label = 25;
+                    case 25:
+                        if (!(sessionState.vodMediaSeqVideo >= currentVod.getLiveMediaSequencesCount() - 1)) return [3 /*break*/, 28];
                         _e = sessionState;
                         return [4 /*yield*/, this._sessionState.set("vodMediaSeqVideo", currentVod.getLiveMediaSequencesCount() - 1)];
-                    case 18:
+                    case 26:
                         _e.vodMediaSeqVideo = _o.sent();
                         _f = sessionState;
                         return [4 /*yield*/, this._sessionState.set("state", SessionState.VOD_NEXT_INIT)];
-                    case 19:
+                    case 27:
                         _f.state = _o.sent();
-                        _o.label = 20;
-                    case 20:
-                        if (!(sessionState.vodMediaSeqAudio >= currentVod.getLiveMediaSequencesCount("audio") - 1)) return [3 /*break*/, 22];
+                        _o.label = 28;
+                    case 28:
+                        if (!(sessionState.vodMediaSeqAudio >= currentVod.getLiveMediaSequencesCount("audio") - 1)) return [3 /*break*/, 30];
                         _g = sessionState;
                         return [4 /*yield*/, this._sessionState.set("vodMediaSeqAudio", currentVod.getLiveMediaSequencesCount("audio") - 1)];
-                    case 21:
+                    case 29:
                         _g.vodMediaSeqAudio = _o.sent();
-                        _o.label = 22;
-                    case 22:
-                        if (!this.isSwitchingBackToV2L) return [3 /*break*/, 24];
+                        _o.label = 30;
+                    case 30:
+                        if (!this.isSwitchingBackToV2L) return [3 /*break*/, 32];
                         _h = sessionState;
                         return [4 /*yield*/, this._sessionState.set("state", SessionState.VOD_RELOAD_INIT)];
-                    case 23:
+                    case 31:
                         _h.state = _o.sent();
                         this.isSwitchingBackToV2L = false;
-                        _o.label = 24;
-                    case 24:
+                        _o.label = 32;
+                    case 32:
                         _j = playheadState;
                         return [4 /*yield*/, this._playheadState.set("mediaSeq", sessionState.mediaSeq)];
-                    case 25:
+                    case 33:
                         _j.mediaSeq = _o.sent();
                         _k = playheadState;
                         return [4 /*yield*/, this._playheadState.set("mediaSeqAudio", sessionState.mediaSeqAudio)];
-                    case 26:
+                    case 34:
                         _k.mediaSeqAudio = _o.sent();
                         _l = playheadState;
                         return [4 /*yield*/, this._playheadState.set("vodMediaSeqVideo", sessionState.vodMediaSeqVideo)];
-                    case 27:
+                    case 35:
                         _l.vodMediaSeqVideo = _o.sent();
                         _m = playheadState;
                         return [4 /*yield*/, this._playheadState.set("vodMediaSeqAudio", sessionState.vodMediaSeqAudio)];
-                    case 28:
+                    case 36:
                         _m.vodMediaSeqAudio = _o.sent();
                         if (currentVod.sequenceAlwaysContainNewSegments) {
                             mediaSequenceValue = currentVod.mediaSequenceValues[playheadState.vodMediaSeqVideo];
                             debug("[".concat(this._sessionId, "]: Session can now serve mseq={").concat(playheadState.mediaSeq + mediaSequenceValue, "}"));
                         }
                         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*/, 41];
                         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*/, 40];
                         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:
+                    case 37:
                         _o.sent();
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
-                    case 30:
+                    case 38:
                         currentVod = _o.sent();
                         return [4 /*yield*/, this._playheadState.get("diffCompensation")];
-                    case 31:
+                    case 39:
                         diffMs = _o.sent();
                         if (diffMs) {
                             this.diffCompensation = diffMs;
@@ -1159,12 +1140,12 @@ var Session = /** @class */ (function () {
                             }
                         }
                         this.isAllowedToClearVodCache = false;
-                        _o.label = 32;
-                    case 32: return [3 /*break*/, 34];
-                    case 33:
+                        _o.label = 40;
+                    case 40: return [3 /*break*/, 42];
+                    case 41:
                         this.isAllowedToClearVodCache = true;
-                        _o.label = 34;
-                    case 34:
+                        _o.label = 42;
+                    case 42:
                         // Update Value for Previous Sequence
                         this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
                         this.prevMediaSeqOffset.video = playheadState.mediaSeq;
@@ -1174,7 +1155,7 @@ var Session = /** @class */ (function () {
                         }
                         m3u8 = currentVod.getLiveMediaSequences(playheadState.mediaSeq, 180000, playheadState.vodMediaSeqVideo, sessionState.discSeq);
                         return [4 /*yield*/, this._playheadState.setLastM3u8(m3u8)];
-                    case 35:
+                    case 43:
                         _o.sent();
                         return [2 /*return*/, m3u8];
                 }
@@ -1365,7 +1346,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;
+            var m3u8, currentVod, audioGroupIds, defaultAudioGroupId, hasClosedCaptions, i, audioGroupId, j, audioTrack, channels, sessionProfile;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -1397,12 +1378,13 @@ var Session = /** @class */ (function () {
                                     audioGroupId = audioGroupIds[i];
                                     for (j = 0; j < this._audioTracks.length; j++) {
                                         audioTrack = this._audioTracks[j];
+                                        channels = this._audioTracks[j].channels ? this._audioTracks[j].channels : 2;
                                         // Make default track if set property is true.
                                         if (audioTrack.default) {
-                                            m3u8 += "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"".concat(audioGroupId, "\",LANGUAGE=\"").concat(audioTrack.language, "\", NAME=\"").concat(audioTrack.name, "\",AUTOSELECT=YES,DEFAULT=YES,CHANNELS=\"2\",URI=\"master-").concat(audioGroupId, "_").concat(audioTrack.language, ".m3u8;session=").concat(this._sessionId, "\"\n");
+                                            m3u8 += "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"".concat(audioGroupId, "\",LANGUAGE=\"").concat(audioTrack.language, "\", NAME=\"").concat(audioTrack.name, "\",AUTOSELECT=YES,DEFAULT=YES,CHANNELS=\"").concat(channels, "\",URI=\"master-").concat(audioGroupId, "_").concat(audioTrack.language, ".m3u8;session=").concat(this._sessionId, "\"\n");
                                         }
                                         else {
-                                            m3u8 += "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"".concat(audioGroupId, "\",LANGUAGE=\"").concat(audioTrack.language, "\", NAME=\"").concat(audioTrack.name, "\",AUTOSELECT=YES,DEFAULT=NO,CHANNELS=\"2\",URI=\"master-").concat(audioGroupId, "_").concat(audioTrack.language, ".m3u8;session=").concat(this._sessionId, "\"\n");
+                                            m3u8 += "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"".concat(audioGroupId, "\",LANGUAGE=\"").concat(audioTrack.language, "\", NAME=\"").concat(audioTrack.name, "\",AUTOSELECT=YES,DEFAULT=NO,CHANNELS=\"").concat(channels, "\",URI=\"master-").concat(audioGroupId, "_").concat(audioTrack.language, ".m3u8;session=").concat(this._sessionId, "\"\n");
                                         }
                                     }
                                 }
@@ -1537,7 +1519,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, loadStart, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, err_6, _o, length_1, endMseqValue, endMseqValueAudio, lastDiscontinuity, lastDiscontinuityAudio, _p, vodPromise, gracePeriod, nextVodStart, _q, loadPromise, hlsOpts, loadStart, _r, _s, _t, _u, _v, _w, _x, _y, _z, diffMs, err_7, startTS, _0, mSeq, currentVod_1, dSeq, mSeqOffset, reloadBehind, segments, playheadState, nextMseq, _1, err_8;
+            var newVod, sessionState, isLeader, currentVod, vodResponse, _a, nextVodPromise, nextVodStart, _b, loadPromise, hlsOpts, loadStart, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, err_6, _o, length_1, endMseqValue, endMseqValueAudio, lastDiscontinuity, lastDiscontinuityAudio, _p, vodPromise, gracePeriod, nextVodStart, _q, loadPromise, hlsOpts, loadStart, _r, _s, _t, _u, _v, _w, _x, _y, _z, diffMs, err_7, startTS, _0, mSeq, currentVod_2, dSeq, mSeqOffset, reloadBehind, segments, playheadState, nextMseq, _1, err_8;
             var _this = this;
             return __generator(this, function (_2) {
                 switch (_2.label) {
@@ -1962,8 +1944,8 @@ var Session = /** @class */ (function () {
                         mSeq = this.switchDataForSession.mediaSeq;
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
                     case 64:
-                        currentVod_1 = _2.sent();
-                        if (currentVod_1.sequenceAlwaysContainNewSegments) {
+                        currentVod_2 = _2.sent();
+                        if (currentVod_2.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();
@@ -1997,19 +1979,19 @@ var Session = /** @class */ (function () {
                     case 68:
                         playheadState = _2.sent();
                         nextMseq = playheadState.vodMediaSeqVideo + 1;
-                        if (nextMseq > currentVod_1.getLiveMediaSequencesCount() - 1) {
-                            nextMseq = currentVod_1.getLiveMediaSequencesCount() - 1;
+                        if (nextMseq > currentVod_2.getLiveMediaSequencesCount() - 1) {
+                            nextMseq = currentVod_2.getLiveMediaSequencesCount() - 1;
                         }
                         // ---------------------------------------------------.
                         // TODO: Support reloading with audioSegments as well |
                         // ---------------------------------------------------'
-                        return [4 /*yield*/, currentVod_1.reload(nextMseq, segments, null, reloadBehind)];
+                        return [4 /*yield*/, currentVod_2.reload(nextMseq, segments, null, reloadBehind)];
                     case 69:
                         // ---------------------------------------------------.
                         // TODO: Support reloading with audioSegments as well |
                         // ---------------------------------------------------'
                         _2.sent();
-                        return [4 /*yield*/, this._sessionState.setCurrentVod(currentVod_1, { ttl: currentVod_1.getDuration() * 1000 })];
+                        return [4 /*yield*/, this._sessionState.setCurrentVod(currentVod_2, { ttl: currentVod_2.getDuration() * 1000 })];
                     case 70:
                         _2.sent();
                         return [4 /*yield*/, this._sessionState.set("vodReloaded", 1)];
@@ -2032,9 +2014,9 @@ var Session = /** @class */ (function () {
                         _2.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_1.getDeltaTimes(), ")"));
-                        debug("[".concat(this._sessionId, "]: ").concat(currentVod_1.getPlayheadPositions()));
-                        debug("[".concat(this._sessionId, "]: msequences=").concat(currentVod_1.getLiveMediaSequencesCount()));
+                        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()));
                         cloudWatchLog(!this.cloudWatchLogging, "engine-session", { event: "switchback", channel: this._sessionId, reqTimeMs: Date.now() - startTS });
                         return [2 /*return*/];
                     case 77:
@@ -2334,6 +2316,9 @@ var Session = /** @class */ (function () {
                     case 1:
                         currentVod = _a.sent();
                         playheadPositions = currentVod.getPlayheadPositions("audio");
+                        if (seqIdx >= playheadPositions.length - 1) {
+                            seqIdx = playheadPositions.length - 1;
+                        }
                         debug("[".concat(this._sessionId, "]: Current audio playhead position (").concat(seqIdx, "): ").concat(playheadPositions[seqIdx]));
                         return [2 /*return*/, playheadPositions[seqIdx]];
                 }

package/dist/package.json

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

package/dist/server-multicodec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/server-multicodec.js

@@ -0,0 +1,96 @@
+"use strict";
+/*
+ * Reference implementation of Channel Engine library
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+var index_1 = require("./index");
+var RefAssetManager = /** @class */ (function () {
+    function RefAssetManager(opts) {
+        this.assets = {
+            1: [
+                {
+                    id: 1,
+                    title: "Sollevante",
+                    uri: "https://testcontent.eyevinn.technology/dolby/index.m3u8",
+                }
+            ],
+        };
+        this.pos = {
+            1: 0,
+        };
+    }
+    /**
+     *
+     * @param {Object} vodRequest
+     *   {
+     *      sessionId,
+     *      category,
+     *      playlistId
+     *   }
+     */
+    RefAssetManager.prototype.getNextVod = function (vodRequest) {
+        var _this = this;
+        console.log(this.assets);
+        return new Promise(function (resolve, reject) {
+            var channelId = vodRequest.playlistId;
+            if (_this.assets[channelId]) {
+                var vod = _this.assets[channelId][_this.pos[channelId]++];
+                if (_this.pos[channelId] > _this.assets[channelId].length - 1) {
+                    _this.pos[channelId] = 0;
+                }
+                var vodResponse = {
+                    id: vod.id,
+                    title: vod.title,
+                    uri: vod.uri,
+                };
+                resolve(vodResponse);
+            }
+            else {
+                reject("Invalid channelId provided");
+            }
+        });
+    };
+    return RefAssetManager;
+}());
+var RefChannelManager = /** @class */ (function () {
+    function RefChannelManager() {
+    }
+    RefChannelManager.prototype.getChannels = function () {
+        //return [ { id: '1', profile: this._getProfile() }, { id: 'faulty', profile: this._getProfile() } ];
+        return [{
+                id: "1",
+                profile: this._getProfile(),
+                audioTracks: this._getAudioTracks(),
+            }];
+    };
+    RefChannelManager.prototype._getProfile = function () {
+        return [
+            { resolution: [640, 360], bw: 3663471, codecs: "avc1.64001F,mp4a.40.2" },
+            { resolution: [1280, 720], bw: 5841380, codecs: "avc1.64001F,mp4a.40.2" },
+            { resolution: [1920, 1080], bw: 8973571, codecs: "avc1.64001F,mp4a.40.2" },
+            { resolution: [640, 360], bw: 4301519, codecs: "avc1.64001F,ec-3" },
+            { resolution: [1280, 720], bw: 6479428, codecs: "avc1.64001F,ec-3" },
+            { resolution: [1920, 1080], bw: 9611619, codecs: "avc1.640032,ec-3" },
+        ];
+    };
+    RefChannelManager.prototype._getAudioTracks = function () {
+        return [
+            { language: "ja", "name": "日本語 stereo", channels: 2, codecs: "mp4a.40.2", default: true },
+            { language: "ja", "name": "日本語 surround", channels: 16, codecs: "ec-3", default: false }
+        ];
+    };
+    return RefChannelManager;
+}());
+var refAssetManager = new RefAssetManager();
+var refChannelManager = new RefChannelManager();
+var engineOptions = {
+    heartbeat: "/",
+    useDemuxedAudio: true,
+    averageSegmentDuration: 2000,
+    channelManager: refChannelManager,
+    slateRepetitions: 10,
+    redisUrl: process.env.REDIS_URL,
+};
+var engine = new index_1.ChannelEngine(refAssetManager, engineOptions);
+engine.start();
+engine.listen(process.env.PORT || 8000);

package/engine/server.ts

@@ -119,6 +119,8 @@ export interface ClosedCaptions {
 export interface AudioTracks {
   language: string;
   name: string;
+  channels?: number;
+  codecs?: string;
   default?: boolean;
 }
 
@@ -659,7 +661,7 @@ export class ChannelEngine {
           "Access-Control-Allow-Origin": "*",
           "Access-Control-Allow-Headers": "X-Session-Id",
           "Access-Control-Expose-Headers": "X-Session-Id",
-          "Cache-Control": "no-cache",
+          "Cache-Control": "max-age=300",
           "X-Session-Id": session.sessionId,
           "X-Instance-Id": this.instanceId + `<${version}>`,
         });

package/engine/session.js

@@ -160,9 +160,7 @@ class Session {
     while (state !== PlayheadState.CRASHED) {
       try {
         const tsIncrementBegin = Date.now();
-        const manifest = await this.incrementAsync({
-          audio: audioIncrement
-        });
+        const manifest = await this.incrementAsync();
         if (!manifest) {
           debug(`[${this._sessionId}]: No manifest available yet, will try again after 1000ms`);
           await timer(1000);
@@ -202,38 +200,6 @@ class Session {
             debug(`[${this._sessionId}]: Delta time is != 0 need will adjust ${delta}sec to tick interval. tick=${tickInterval}`);
           }
           const position = (await this._getCurrentPlayheadPosition()) * 1000;
-
-          if (this.use_demuxed_audio) {
-            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;
-            let direction = 0;
-            do {
-              const audioPosition = (await this._getAudioPlayheadPosition(sessionState.vodMediaSeqAudio + index)) * 1000;
-              posDiff = position - audioPosition;
-              if (posDiff > thresh && direction >= 0) {
-                index++;
-                incrementValue++;
-                direction = 1;
-              } else if (posDiff < -thresh && direction <= 0) {
-                incrementValue = 0;
-                index--;
-                direction = -1;
-                break;
-              } else if (direction > 0 && posDiff < 0) {
-                break;
-              }
-              if (sessionState.vodMediaSeqAudio + index > audioSeqLastIdx || sessionState.vodMediaSeqAudio + index < 0) {
-                break;
-              }
-            } while (!(-thresh < posDiff && posDiff < thresh));
-            audioIncrement = incrementValue;
-          }
-
           let timePosition = Date.now() - playheadState.playheadRef;
           // Apply time position offset if set, only after external diff compensation has concluded.
           if (this.timePositionOffset && this.diffCompensation <= 0 && this.alwaysNewSegments) {
@@ -576,18 +542,13 @@ class Session {
       this.prevMediaSeqOffset.video = playheadState.mediaSeq;
     }
 
-    if (playheadState.vodMediaSeqVideo > sessionState.vodMediaSeqVideo ||
-      (playheadState.vodMediaSeqVideo < sessionState.vodMediaSeqVideo &&
-        playheadState.mediaSeq === this.prevMediaSeqOffset.video)) {
+    if (playheadState.vodMediaSeqVideo > sessionState.vodMediaSeqVideo || (playheadState.vodMediaSeqVideo < sessionState.vodMediaSeqVideo && playheadState.mediaSeq === this.prevMediaSeqOffset.video)) {
       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.vodMediaSeqVideo}_${sessionState.vodMediaSeqVideo}). Waiting 500ms before reading from store again`);
-        await timer(500);
-        playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"]);
-      } else {
-        debug(`[${this._sessionId}]: Recently Loaded Next Vod. PlayheadState not up-to-date. Delay media-m3u8 Response by 1000ms`);
-        await timer(1000);
-      }
+      const DELAY_TIME_MS = 1000;
+      const ACTION = [SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state) ? "Reloaded" : "Loaded Next";
+      debug(`[${this._sessionId}]: Recently ${ACTION} Vod. PlayheadState not up-to-date (${playheadState.vodMediaSeqVideo}_${sessionState.vodMediaSeqVideo}). Waiting ${DELAY_TIME_MS}ms before reading from store again`);
+      await timer(DELAY_TIME_MS);
+      playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"]);
     }
 
     // Force reading up from store, but only once if the condition is right
@@ -655,24 +616,14 @@ class Session {
     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)
-    ) {
+    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 DELAY_TIME_MS = 1000;
+      const ACTION = [SessionState.VOD_RELOAD_INIT, SessionState.VOD_RELOAD_INITIATING].includes(state) ? "Reloaded" : "Loaded Next";
+      debug(`[${this._sessionId}]: Recently ${ACTION} Vod. PlayheadState not up-to-date (${playheadState.vodMediaSeqAudio}_${sessionState.vodMediaSeqAudio}). Waiting ${DELAY_TIME_MS}ms before reading from store again`);
+      await timer(DELAY_TIME_MS);
+      playheadState = await this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"]);
     }
-
     // local store the prev values
     if (this.prevVodMediaSeq.audio === null) {
       this.prevVodMediaSeq.audio = playheadState.vodMediaSeqAudio;
@@ -684,7 +635,7 @@ class Session {
     if (currentVod) {
       // condition suggesting that a new vod should exist
       if (playheadState.vodMediaSeqAudio < 2 || playheadState.mediaSeqAudio !== this.prevMediaSeqOffset.audio) {
-        const AGE_THRESH = 20 * 1000;
+        const AGE_THRESH = this.averageSegmentDuration * 2;
         let cacheAge = null;
         if (this._sessionState.cache && this._sessionState.cache.currentVod.ts) {
           cacheAge = Date.now() - this._sessionState.cache.currentVod.ts;
@@ -732,7 +683,7 @@ class Session {
     }
   }
 
-  async incrementAsync(incOpts) {
+  async incrementAsync() {
     await this._tickAsync();
     const isLeader = await this._sessionStateStore.isLeader(this._instanceId);
 
@@ -772,9 +723,36 @@ class Session {
       }
     } else {
       sessionState.vodMediaSeqVideo = await this._sessionState.increment("vodMediaSeqVideo");
-      if (incOpts) {
-        sessionState.vodMediaSeqAudio = await this._sessionState.increment("vodMediaSeqAudio", incOpts.audio);
+      let audioIncrement;
+      if (this.use_demuxed_audio) {
+        const position = (await this._getCurrentPlayheadPosition()) * 1000;
+        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;
+        do {
+          const audioPosition = (await this._getAudioPlayheadPosition(sessionState.vodMediaSeqAudio + index)) * 1000;
+          posDiff = position - audioPosition;
+          if (posDiff < 0) {
+            break;
+          }
+          if (posDiff > thresh) {
+            index++;
+            incrementValue++;
+          } else {
+            index = incrementValue;
+            break;
+          }
+          if (sessionState.vodMediaSeqAudio + index > audioSeqLastIdx) {
+            break;
+          }
+        } while (!(-thresh < posDiff && posDiff < thresh));
+        audioIncrement = index;
       }
+      sessionState.vodMediaSeqAudio = await this._sessionState.increment("vodMediaSeqAudio", audioIncrement);
     }
 
     if (sessionState.vodMediaSeqVideo >= currentVod.getLiveMediaSequencesCount() - 1) {
@@ -981,11 +959,12 @@ class Session {
           let audioGroupId = audioGroupIds[i];
           for (let j = 0; j < this._audioTracks.length; j++) {
             let audioTrack = this._audioTracks[j];
+            let channels = this._audioTracks[j].channels ? this._audioTracks[j].channels : 2;
             // Make default track if set property is true.
             if (audioTrack.default) {
-              m3u8 += `#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="${audioGroupId}",LANGUAGE="${audioTrack.language}", NAME="${audioTrack.name}",AUTOSELECT=YES,DEFAULT=YES,CHANNELS="2",URI="master-${audioGroupId}_${audioTrack.language}.m3u8;session=${this._sessionId}"\n`;
+              m3u8 += `#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="${audioGroupId}",LANGUAGE="${audioTrack.language}", NAME="${audioTrack.name}",AUTOSELECT=YES,DEFAULT=YES,CHANNELS="${channels}",URI="master-${audioGroupId}_${audioTrack.language}.m3u8;session=${this._sessionId}"\n`;
             } else {
-              m3u8 += `#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="${audioGroupId}",LANGUAGE="${audioTrack.language}", NAME="${audioTrack.name}",AUTOSELECT=YES,DEFAULT=NO,CHANNELS="2",URI="master-${audioGroupId}_${audioTrack.language}.m3u8;session=${this._sessionId}"\n`;
+              m3u8 += `#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="${audioGroupId}",LANGUAGE="${audioTrack.language}", NAME="${audioTrack.name}",AUTOSELECT=YES,DEFAULT=NO,CHANNELS="${channels}",URI="master-${audioGroupId}_${audioTrack.language}.m3u8;session=${this._sessionId}"\n`;
             }
           }
         }
@@ -1691,6 +1670,9 @@ class Session {
   async _getAudioPlayheadPosition(seqIdx) {
     const currentVod = await this._sessionState.getCurrentVod();
     const playheadPositions = currentVod.getPlayheadPositions("audio");
+    if (seqIdx >= playheadPositions.length - 1) {
+      seqIdx = playheadPositions.length - 1
+    }
     debug(`[${this._sessionId}]: Current audio playhead position (${seqIdx}): ${playheadPositions[seqIdx]}`);
     return playheadPositions[seqIdx];
   }

package/package.json

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

package/server-multicodec.ts

@@ -0,0 +1,104 @@
+/*
+ * Reference implementation of Channel Engine library
+ */
+
+import { ChannelEngine, ChannelEngineOpts, 
+  IAssetManager, IChannelManager, 
+  VodRequest, VodResponse, Channel, ChannelProfile,
+  AudioTracks
+} from "./index";
+
+class RefAssetManager implements IAssetManager {
+  private assets;
+  private pos;
+  constructor(opts?) {
+    this.assets = {
+      1: [
+        {
+          id: 1,
+          title: "Sollevante",
+          uri: "https://testcontent.eyevinn.technology/dolby/index.m3u8",
+        }
+      ],
+    };
+    this.pos = {
+      1: 0,
+    };
+  }
+
+  /**
+   *
+   * @param {Object} vodRequest
+   *   {
+   *      sessionId,
+   *      category,
+   *      playlistId
+   *   }
+   */
+  getNextVod(vodRequest: VodRequest): Promise<VodResponse> {
+    console.log(this.assets);
+    return new Promise((resolve, reject) => {
+      const channelId = vodRequest.playlistId;
+      if (this.assets[channelId]) {
+        let vod = this.assets[channelId][this.pos[channelId]++];
+        if (this.pos[channelId] > this.assets[channelId].length - 1) {
+          this.pos[channelId] = 0;
+        }
+        const vodResponse = {
+          id: vod.id,
+          title: vod.title,
+          uri: vod.uri,
+        };
+        resolve(vodResponse);
+      } else {
+        reject("Invalid channelId provided");
+      }
+    });
+  }
+}
+
+class RefChannelManager implements IChannelManager {
+  getChannels(): Channel[] {
+    //return [ { id: '1', profile: this._getProfile() }, { id: 'faulty', profile: this._getProfile() } ];
+    return [{ 
+      id: "1", 
+      profile: this._getProfile(),
+      audioTracks: this._getAudioTracks(),
+    }];
+  }
+
+  _getProfile(): ChannelProfile[] {
+    return [
+      { resolution: [640, 360], bw: 3663471, codecs: "avc1.64001F,mp4a.40.2" },
+      { resolution: [1280, 720], bw: 5841380, codecs: "avc1.64001F,mp4a.40.2" },
+      { resolution: [1920, 1080], bw: 8973571, codecs: "avc1.64001F,mp4a.40.2" },
+
+      { resolution: [640, 360], bw: 4301519, codecs: "avc1.64001F,ec-3" },
+      { resolution: [1280, 720], bw: 6479428, codecs: "avc1.64001F,ec-3" },
+      { resolution: [1920, 1080], bw: 9611619, codecs: "avc1.640032,ec-3" },
+    ];
+  }
+
+  _getAudioTracks(): AudioTracks[] {
+    return [
+      { language: "ja", "name": "日本語 stereo", channels: 2, codecs: "mp4a.40.2", default: true },
+      { language: "ja", "name": "日本語 surround", channels: 16, codecs: "ec-3", default: false }
+    ];
+  }
+}
+
+const refAssetManager = new RefAssetManager();
+const refChannelManager = new RefChannelManager();
+
+const engineOptions: ChannelEngineOpts = {
+  heartbeat: "/",
+  useDemuxedAudio: true,
+  averageSegmentDuration: 2000,
+  channelManager: refChannelManager,
+  slateRepetitions: 10,
+  redisUrl: process.env.REDIS_URL,
+};
+
+const engine = new ChannelEngine(refAssetManager, engineOptions);
+engine.start();
+engine.listen(process.env.PORT || 8000);

package/tsconfig.json

@@ -6,5 +6,5 @@
     "esModuleInterop": true,
     "declaration": true
   },
-  "include": ["./server.ts", "./server-demux.ts", "./server-livemix.ts", "./engine/**/*"]
+  "include": ["./server.ts", "./server-demux.ts", "./server-livemix.ts", "./server-multicodec.ts", "./engine/**/*"]
 }