eyevinn-channel-engine 3.4.3 → 4.0.0-rc.0

package/README.md

@@ -33,6 +33,12 @@ Supported Node.js Versions
 
 Follow [this tutorial](https://vod2live.docs.eyevinn.technology/getting-started.html) to get started building your own FAST channel engine.
 
+## Migration
+
+### Upgrading from 3.3.x to >= 3.4.x
+
+A breaking change was introduced in v3.4.0 when Typescript types were introduced. The library no longer exports a default. This means that you need to change `const ChannelEngine = require('eyevinn-channel-engine')` to `const { ChannelEngine } = require('eyevinn-channel-engine')`;
+
 ## Support
 
 Join our [community on Slack](http://slack.streamingtech.se) where you can post any questions regarding any of our open source projects. Eyevinn's consulting business can also offer you:

package/dist/engine/server.d.ts

@@ -61,6 +61,14 @@ export interface Channel {
     id: string;
     profile: ChannelProfile[];
     audioTracks?: AudioTracks[];
+    closedCaptions?: ClosedCaptions[];
+}
+export interface ClosedCaptions {
+    id: string;
+    lang: string;
+    name: string;
+    default?: boolean;
+    auto?: boolean;
 }
 export interface AudioTracks {
     language: string;

package/dist/engine/server.js

@@ -203,6 +203,30 @@ var ChannelEngine = /** @class */ (function () {
                 }
             });
         }); });
+        this.server.opts('/live/:file', function (req, res, next) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                res.sendRaw(204, "", {
+                    headers: {
+                        "Access-Control-Allow-Origin": "*",
+                        "Access-Control-Allow-Methods": "GET, OPTIONS",
+                    },
+                });
+                next();
+                return [2 /*return*/];
+            });
+        }); });
+        this.server.opts('/channels/:channelId/:file', function (req, res, next) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                res.sendRaw(204, "", {
+                    headers: {
+                        "Access-Control-Allow-Origin": "*",
+                        "Access-Control-Allow-Methods": "GET, OPTIONS",
+                    },
+                });
+                next();
+                return [2 /*return*/];
+            });
+        }); });
         this.server.get('/eventstream/:sessionId', this._handleEventStream.bind(this));
         this.server.get('/status/:sessionId', this._handleStatus.bind(this));
         this.server.get('/health', this._handleAggregatedSessionHealth.bind(this));

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -35,7 +35,7 @@
     "promise.allsettled": "^1.0.4",
     "redis": "^3.0.2",
     "request": ">=2.88.0",
-    "restify": ">=8.5.1",
+    "restify": "9.0.0",
     "restify-errors": "^8.0.2",
     "uuid": "^8.3.2"
   },

package/dist/server-demux.js

@@ -10,13 +10,13 @@ var RefAssetManager = /** @class */ (function () {
             1: [
                 {
                     id: 1,
-                    title: "Elephants Dream",
-                    uri: "https://playertest.longtailvideo.com/adaptive/elephants_dream_v4/index.m3u8",
+                    title: "Nymo bloopers 2022",
+                    uri: "https://vod.streaming.a2d.tv/3f389c48-03e3-48a2-8e98-a02c55185a68/4c792a30-89ad-11ed-95d9-1b374c4e2f9f_20411056.ism/.m3u8",
                 },
                 {
                     id: 2,
-                    title: "Test HLS Bird noises (1m10s)",
-                    uri: "https://mtoczko.github.io/hls-test-streams/test-audio-pdt/playlist.m3u8",
+                    title: "Skrattfest",
+                    uri: "https://vod.streaming.a2d.tv/09399ba0-70de-4ce7-9d84-bfcd6d9f8d43/fba308d0-39f5-11ed-b93e-a747b4a166ca_20062029.ism/.m3u8",
                 },
             ],
         };
@@ -81,9 +81,7 @@ var RefChannelManager = /** @class */ (function () {
     };
     RefChannelManager.prototype._getAudioTracks = function () {
         return [
-            { language: "sp", name: "Spanish" },
-            { language: "ru", name: "Russian" },
-            { language: "en", name: "English", default: true },
+            { language: "sv", name: "Swedish", default: true },
         ];
     };
     return RefChannelManager;

package/engine/server.ts

@@ -78,6 +78,7 @@ export interface VodTimedMetadata {
 }
 
 export interface VodResponse {
+  title: any;
   id: string;
   uri: string;
   offset?: number;
@@ -103,6 +104,15 @@ export interface Channel {
   id: string;
   profile: ChannelProfile[];
   audioTracks?: AudioTracks[];
+  closedCaptions?: ClosedCaptions[];
+}
+
+export interface ClosedCaptions {
+  id: string;
+  lang: string;
+  name: string;
+  default?: boolean;
+  auto?: boolean;
 }
 
 export interface AudioTracks {
@@ -267,6 +277,24 @@ export class ChannelEngine {
       req.query['channel'] = req.params.channelId;
       await handleMasterRoute(req, res, next);
     });   
+    this.server.opts('/live/:file', async (req, res, next) => {
+      res.sendRaw(204, "", {
+        headers: {
+          "Access-Control-Allow-Origin": "*",
+          "Access-Control-Allow-Methods": "GET, OPTIONS",
+        },
+      });
+      next();
+    });
+    this.server.opts('/channels/:channelId/:file', async (req, res, next) => {
+      res.sendRaw(204, "", {
+        headers: {
+          "Access-Control-Allow-Origin": "*",
+          "Access-Control-Allow-Methods": "GET, OPTIONS",
+        },
+      });
+      next();
+    });
     this.server.get('/eventstream/:sessionId', this._handleEventStream.bind(this));
     this.server.get('/status/:sessionId', this._handleStatus.bind(this));
     this.server.get('/health', this._handleAggregatedSessionHealth.bind(this));

package/engine/session.js

@@ -153,10 +153,13 @@ class Session {
     let playheadState = await this._playheadState.getValues(["state"]);
     let state = await this._playheadState.setState(PlayheadState.RUNNING);
     let numberOfLargeTicks = 0;
+    let audioIncrement = 1;
     while (state !== PlayheadState.CRASHED) {
       try {
         const tsIncrementBegin = Date.now();
-        const manifest = await this.incrementAsync();
+        const manifest = await this.incrementAsync({
+          audio: audioIncrement
+        });
         if (!manifest) {
           debug(`[${this._sessionId}]: No manifest available yet, will try again after 1000ms`);
           await timer(1000);
@@ -196,6 +199,38 @@ 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; // PUT REAL WHEN DONE
+              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) {
@@ -477,6 +512,8 @@ class Session {
 
     const playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"]);
     const discSeqOffset = await this._sessionState.get("discSeq");
+    // TODO: support Audio too ^
+
     // Clear Vod Cache here when Switching to Live just to be safe...
     if (playheadState.vodMediaSeqVideo === 0) {
       const isLeader = await this._sessionStateStore.isLeader(this._instanceId);
@@ -618,17 +655,17 @@ class Session {
       throw new Error('Session not ready');
     }
 
-    const sessionState = await this._sessionState.getValues(["discSeq"]);
-    const playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqAudio"]);
+    const sessionState = await this._sessionState.getValues(["discSeqAudio"]);
+    const playheadState = await this._playheadState.getValues(["mediaSeqAudio", "vodMediaSeqAudio"]);
     const currentVod = await this._sessionState.getCurrentVod();
     if (currentVod) {
       try {
-        const m3u8 = currentVod.getLiveMediaAudioSequences(playheadState.mediaSeq, audioGroupId, audioLanguage, playheadState.vodMediaSeqAudio, sessionState.discSeq, this.targetDurationPadding, this.forceTargetDuration);
+        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.mediaSeq + playheadState.vodMediaSeqAudio}] Request Failed for current audio manifest for ${audioGroupId}-${audioLanguage}`);
+          debug(`[${this._sessionId}]: [${playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio}] Request Failed for current audio manifest for ${audioGroupId}-${audioLanguage}`);
         }
-        debug(`[${this._sessionId}]: [${playheadState.mediaSeq + playheadState.vodMediaSeqAudio}] Current audio manifest for ${audioGroupId}-${audioLanguage} requested`);
+        debug(`[${this._sessionId}]: [${playheadState.mediaSeqAudio + playheadState.vodMediaSeqAudio}] Current audio manifest for ${audioGroupId}-${audioLanguage} requested`);
         return m3u8;
       } catch (err) {
         logerror(this._sessionId, err);
@@ -640,13 +677,13 @@ class Session {
     }
   }
 
-  async incrementAsync() {
+  async incrementAsync(incOpts) {
     await this._tickAsync();
     const isLeader = await this._sessionStateStore.isLeader(this._instanceId);
 
     let sessionState = await this._sessionState.getValues(
-      ["state", "mediaSeq", "discSeq", "vodMediaSeqVideo", "vodMediaSeqAudio"]);
-    let playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo", "vodMediaSeqAudio"]);
+      ["state", "mediaSeq", "mediaSeqAudio", "discSeq", "discSeqAudio", "vodMediaSeqVideo", "vodMediaSeqAudio"]);
+    let playheadState = await this._playheadState.getValues(["mediaSeq", "mediaSeqAudio", "vodMediaSeqVideo", "vodMediaSeqAudio"]);
     let currentVod = await this._sessionState.getCurrentVod();
     if (!currentVod ||
       sessionState.vodMediaSeqVideo === null ||
@@ -678,14 +715,16 @@ class Session {
         }
         this.isAllowedToClearVodCache = true;
       }
-    } else {
+    } else { // TODO ADD BETTER INCREMENT
       sessionState.vodMediaSeqVideo = await this._sessionState.increment("vodMediaSeqVideo");
-      sessionState.vodMediaSeqAudio = await this._sessionState.increment("vodMediaSeqAudio");
+      if (incOpts) {
+        sessionState.vodMediaSeqAudio = await this._sessionState.increment("vodMediaSeqAudio", incOpts.audio);
+      }
     }
 
     if (sessionState.vodMediaSeqVideo >= currentVod.getLiveMediaSequencesCount() - 1) {
       sessionState.vodMediaSeqVideo = await this._sessionState.set("vodMediaSeqVideo", currentVod.getLiveMediaSequencesCount() - 1);
-      sessionState.vodMediaSeqAudio = await this._sessionState.set("vodMediaSeqAudio", currentVod.getLiveMediaSequencesCount() - 1);
+      sessionState.vodMediaSeqAudio = await this._sessionState.set("vodMediaSeqAudio", currentVod.getLiveMediaSequencesCount("audio") - 1);
       sessionState.state = await this._sessionState.set("state", SessionState.VOD_NEXT_INIT);
     }
 
@@ -695,6 +734,7 @@ class Session {
     }
 
     playheadState.mediaSeq = await this._playheadState.set("mediaSeq", sessionState.mediaSeq);
+    playheadState.mediaSeqAudio = await this._playheadState.set("mediaSeqAudio", sessionState.mediaSeqAudio);
     playheadState.vodMediaSeqVideo = await this._playheadState.set("vodMediaSeqVideo", sessionState.vodMediaSeqVideo);
     playheadState.vodMediaSeqAudio = await this._playheadState.set("vodMediaSeqAudio", sessionState.vodMediaSeqAudio);
 
@@ -703,7 +743,7 @@ class Session {
       debug(`[${this._sessionId}]: Session can now serve mseq={${playheadState.mediaSeq + mediaSequenceValue}}`);
     }
 
-    debug(`[${this._sessionId}]: INCREMENT (mseq=${playheadState.mediaSeq + playheadState.vodMediaSeqVideo}) vodMediaSeq=(${playheadState.vodMediaSeqVideo}_${playheadState.vodMediaSeqAudio} of ${currentVod.getLiveMediaSequencesCount()})`);
+    debug(`[${this._sessionId}]: INCREMENT (mseq=${playheadState.mediaSeq + playheadState.vodMediaSeqVideo}) vodMediaSeq=(${playheadState.vodMediaSeqVideo}_${playheadState.vodMediaSeqAudio} of ${currentVod.getLiveMediaSequencesCount()}_${currentVod.getLiveMediaSequencesCount("audio")})`);
 
     // As a FOLLOWER, we might need to read up from shared store... 
     if (playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video) {
@@ -819,15 +859,15 @@ class Session {
     let timeSinceLastRequest = (tsLastRequestAudio === null) ? 0 : Date.now() - tsLastRequestAudio;
 
     let sessionState = await this._sessionState.getValues(
-      ["state", "vodMediaSeqVideo", "vodMediaSeqAudio", "mediaSeq", "discSeq", "lastM3u8"]);
+      ["state", "vodMediaSeqVideo", "vodMediaSeqAudio", "mediaSeqAudio", "discSeqAudio", "lastM3u8"]);
     const currentVod = await this._sessionState.getCurrentVod();
     if (sessionState.state !== SessionState.VOD_NEXT_INITIATING) {
       let sequencesToIncrement = Math.ceil(timeSinceLastRequest / this.averageSegmentDuration);
 
       if (sessionState.vodMediaSeqAudio < sessionState.vodMediaSeqVideo) {
         sessionState.vodMediaSeqAudio = await this._sessionState.increment("vodMediaSeqAudio", sequencesToIncrement);
-        if (sessionState.vodMediaSeqAudio >= currentVod.getLiveMediaSequencesCount() - 1) {
-          sessionState.vodMediaSeqAudio = await this._sessionState.set("vodMediaSeqAudio", currentVod.getLiveMediaSequencesCount() - 1);
+        if (sessionState.vodMediaSeqAudio >= currentVod.getLiveMediaSequencesCount("audio") - 1) {
+          sessionState.vodMediaSeqAudio = await this._sessionState.set("vodMediaSeqAudio", currentVod.getLiveMediaSequencesCount("audio") - 1);
         }
       }
     }
@@ -835,7 +875,7 @@ class Session {
     debug(`[${this._sessionId}]: AUDIO ${timeSinceLastRequest} (${this.averageSegmentDuration}) audioGroupId=${audioGroupId} audioLanguage=${audioLanguage} vodMediaSeq=(${sessionState.vodMediaSeqVideo}_${sessionState.vodMediaSeqAudio})`);
     let m3u8;
     try {
-      m3u8 = currentVod.getLiveMediaAudioSequences(sessionState.mediaSeq, audioGroupId, audioLanguage, sessionState.vodMediaSeqAudio, sessionState.discSeq);
+      m3u8 = currentVod.getLiveMediaAudioSequences(sessionState.mediaSeqAudio, audioGroupId, audioLanguage, sessionState.vodMediaSeqAudio, sessionState.discSeqAudio);
     } catch (exc) {
       if (sessionState.lastM3u8[audioGroupId][audioLanguage]) {
         m3u8 = sessionState.lastM3u8[audioGroupId][audioLanguage];
@@ -847,7 +887,7 @@ class Session {
     let lastM3u8 = sessionState.lastM3u8;
     lastM3u8[audioGroupId] = {};
     lastM3u8[audioGroupId][audioLanguage] = m3u8;
-    sessionState.lastM3u8 = await this._sessionState.set("lastM3u8", lastM3u8);
+    sessionState.lastM3u8 = await this._sessionState.set("lastM3u8", lastM3u8); // for audio?
     sessionState.tsLastRequestAudio = await this._sessionState.set("tsLastRequestAudio", Date.now());
     return m3u8;
   }
@@ -954,23 +994,30 @@ class Session {
       console.error(`[${this._sessionId}]: Will insert slate`);
       const slateVod = await this._loadSlate(currentVod);
       debug(`[${this._sessionId}]: slate loaded`);
-      const sessionState = await this._sessionState.getValues(["slateCount", "mediaSeq", "discSeq"]);
+      const sessionState = await this._sessionState.getValues(["slateCount", "mediaSeq", "discSeq", "mediaSeqAudio", "discSeqAudio"]);
       let endValue = 0;
+      let endValueAudio = 0;
       let lastDiscontinuity = 0;
+      let lastDiscontinuityAudio = 0;
       if (currentVod) {
         if (currentVod.sequenceAlwaysContainNewSegments) {
           endValue = currentVod.getLastSequenceMediaSequenceValue();
+          endValueAudio = currentVod.getLastSequenceMediaSequenceValueAudio();
         } else {
           endValue = currentVod.getLiveMediaSequencesCount();
+          endValueAudio = currentVod.getLiveMediaSequencesCount("audio");
         }
         lastDiscontinuity = currentVod.getLastDiscontinuity();
+        lastDiscontinuityAudio = currentVod.getLastDiscontinuityAudio();
       }
       await this._sessionState.set("vodMediaSeqVideo", 0);
       await this._sessionState.set("vodMediaSeqAudio", 0);
       await this._sessionState.set("state", SessionState.VOD_NEXT_INITIATING);
       await this._sessionState.setCurrentVod(slateVod);
       await this._sessionState.set("mediaSeq", sessionState.mediaSeq + endValue);
+      await this._sessionState.set("mediaSeqAudio", sessionState.mediaSeqAudio + endValueAudio);
       await this._sessionState.set("discSeq", sessionState.discSeq + lastDiscontinuity);
+      await this._sessionState.set("discSeqAudio", sessionState.discSeqAudio + lastDiscontinuityAudio);
       await this._sessionState.set("slateCount", sessionState.slateCount + 1);
       await this._playheadState.set("playheadRef", Date.now());
 
@@ -986,7 +1033,7 @@ class Session {
     let newVod;
 
     let sessionState = await this._sessionState.getValues(
-      ["state", "assetId", "vodMediaSeqVideo", "vodMediaSeqAudio", "mediaSeq", "discSeq", "nextVod"]);
+      ["state", "assetId", "vodMediaSeqVideo", "vodMediaSeqAudio", "mediaSeq", "mediaSeqAudio", "discSeq", "discSeqAudio", "nextVod"]);
 
     let isLeader = await this._sessionStateStore.isLeader(this._instanceId);
 
@@ -1022,7 +1069,7 @@ class Session {
             let loadPromise;
             if (!vodResponse.type) {
               debug(`[${this._sessionId}]: got first VOD uri=${vodResponse.uri}:${vodResponse.offset || 0}`);
-              const hlsOpts = { sequenceAlwaysContainNewSegments: this.alwaysNewSegments };
+              const hlsOpts = { sequenceAlwaysContainNewSegments: this.alwaysNewSegments, forcedDemuxMode: this.use_demuxed_audio };
               newVod = new HLSVod(vodResponse.uri, [], null, vodResponse.offset * 1000, m3u8Header(this._instanceId), hlsOpts);
               if (vodResponse.timedMetadata) {
                 Object.keys(vodResponse.timedMetadata).map(k => {
@@ -1051,7 +1098,9 @@ class Session {
             debug(`[${this._sessionId}]: ${currentVod.getPlayheadPositions()}`);
             //debug(newVod);
             sessionState.mediaSeq = await this._sessionState.set("mediaSeq", 0);
+            sessionState.mediaSeqAudio = await this._sessionState.set("mediaSeqAudio", 0);
             sessionState.discSeq = await this._sessionState.set("discSeq", 0);
+            sessionState.discSeqAudio = await this._sessionState.set("discSeqAudio", 0);
             sessionState.vodMediaSeqVideo = await this._sessionState.set("vodMediaSeqVideo", 0);
             sessionState.vodMediaSeqAudio = await this._sessionState.set("vodMediaSeqAudio", 0);
             await this._playheadState.set("playheadRef", Date.now());
@@ -1112,10 +1161,10 @@ class Session {
             this.isAllowedToClearVodCache = true;
           }
         }
-        debug(`[${this._sessionId}]: state=VOD_PLAYING (${sessionState.vodMediaSeqVideo}_${sessionState.vodMediaSeqAudio}, ${currentVod.getLiveMediaSequencesCount()})`);
+        debug(`[${this._sessionId}]: state=VOD_PLAYING (${sessionState.vodMediaSeqVideo}_${sessionState.vodMediaSeqAudio}, ${currentVod.getLiveMediaSequencesCount()}_${currentVod.getLiveMediaSequencesCount("audio")})`);
         return;
       case SessionState.VOD_NEXT_INITIATING:
-        debug(`[${this._sessionId}]: state=VOD_NEXT_INITIATING (${sessionState.vodMediaSeqVideo}_${sessionState.vodMediaSeqAudio}, ${currentVod.getLiveMediaSequencesCount()})`);
+        debug(`[${this._sessionId}]: state=VOD_NEXT_INITIATING (${sessionState.vodMediaSeqVideo}_${sessionState.vodMediaSeqAudio}, ${currentVod.getLiveMediaSequencesCount()}_${currentVod.getLiveMediaSequencesCount("audio")})`);
         if (!isLeader) {
           debug(`[${this._sessionId}]: not the leader so just waiting for the VOD to be initiated`);
         }
@@ -1133,12 +1182,16 @@ class Session {
             }
             const length = currentVod.getLiveMediaSequencesCount();
             let endMseqValue;
+            let endMseqValueAudio;
             if (currentVod.sequenceAlwaysContainNewSegments) {
               endMseqValue = currentVod.getLastSequenceMediaSequenceValue();
+              endMseqValueAudio = currentVod.getLastSequenceMediaSequenceValueAudio();
             } else {
               endMseqValue = currentVod.getLiveMediaSequencesCount();
+              endMseqValueAudio = currentVod.getLiveMediaSequencesCount("audio");
             }
             const lastDiscontinuity = currentVod.getLastDiscontinuity();
+            const lastDiscontinuityAudio = currentVod.getLastDiscontinuityAudio();
             sessionState.state = await this._sessionState.set("state", SessionState.VOD_NEXT_INITIATING);
             let vodPromise = this._getNextVod();
             if (length === 1) {
@@ -1155,7 +1208,7 @@ class Session {
             let loadPromise;
             if (!vodResponse.type) {
               debug(`[${this._sessionId}]: got next VOD uri=${vodResponse.uri}:${vodResponse.offset}`);
-              const hlsOpts = { sequenceAlwaysContainNewSegments: this.alwaysNewSegments };
+              const hlsOpts = { sequenceAlwaysContainNewSegments: this.alwaysNewSegments, forcedDemuxMode: this.use_demuxed_audio };
               newVod = new HLSVod(vodResponse.uri, null, null, vodResponse.offset * 1000, m3u8Header(this._instanceId), hlsOpts);
               if (vodResponse.timedMetadata) {
                 Object.keys(vodResponse.timedMetadata).map(k => {
@@ -1198,12 +1251,14 @@ class Session {
             debug(`[${this._sessionId}]: next VOD loaded (${newVod.getDeltaTimes()})`);
             debug(`[${this._sessionId}]: ${newVod.getPlayheadPositions()}`);
             currentVod = newVod;
-            debug(`[${this._sessionId}]: msequences=${currentVod.getLiveMediaSequencesCount()}`);
+            debug(`[${this._sessionId}]: msequences=${currentVod.getLiveMediaSequencesCount()}; audio msequences=${currentVod.getLiveMediaSequencesCount("audio")}`);
             sessionState.vodMediaSeqVideo = await this._sessionState.set("vodMediaSeqVideo", 0);
             sessionState.vodMediaSeqAudio = await this._sessionState.set("vodMediaSeqAudio", 0);
             sessionState.mediaSeq = await this._sessionState.set("mediaSeq", sessionState.mediaSeq + endMseqValue);
+            sessionState.mediaSeqAudio = await this._sessionState.set("mediaSeqAudio", sessionState.mediaSeqAudio + endMseqValueAudio);
             sessionState.discSeq = await this._sessionState.set("discSeq", sessionState.discSeq + lastDiscontinuity);
-            debug(`[${this._sessionId}]: new sequence data set in store [${sessionState.mediaSeq}][${sessionState.discSeq}]`);
+            sessionState.discSeqAudio = await this._sessionState.set("discSeqAudio", sessionState.discSeqAudio + lastDiscontinuityAudio);
+            debug(`[${this._sessionId}]: new sequence data set in store [${sessionState.mediaSeq}][${sessionState.discSeq}]_[${sessionState.mediaSeqAudio}][${sessionState.discSeqAudio}]`);
             await this._sessionState.remove("nextVod");
             sessionState.currentVod = await this._sessionState.setCurrentVod(currentVod, { ttl: currentVod.getDuration() * 1000 });
             this.leaderIsSettingNextVod = false;
@@ -1265,6 +1320,7 @@ class Session {
             sessionState.state = await this._sessionState.set("state", SessionState.VOD_RELOAD_INITIATING);
             // 2) Set new 'offset' sequences, to carry on the continuity from session-live 
             let mSeq = this.switchDataForSession.mediaSeq;
+            // TODO: support demux^
             let currentVod = await this._sessionState.getCurrentVod();
             if (currentVod.sequenceAlwaysContainNewSegments) {
               // (!) will need to compensate if using this setting on HLSVod Object.
@@ -1286,6 +1342,7 @@ class Session {
             await this._sessionState.set("mediaSeq", mSeq);
             await this._playheadState.set("mediaSeq", mSeq);
             await this._sessionState.set("discSeq", dSeq);
+            // TODO: support demux^
             debug(`[${this._sessionId}]: Setting current media and discontinuity count -> [${mSeq}]:[${dSeq}]`);
             // 3) Set new media segments/currentVod, to carry on the continuity from session-live
             debug(`[${this._sessionId}]: LEADER: making changes to current VOD. I will also update currentVod in store.`);
@@ -1324,7 +1381,7 @@ class Session {
         }
         break;
       case SessionState.VOD_RELOAD_INITIATING:
-        debug(`[${this._sessionId}]: state=VOD_RELOAD_INITIATING (${sessionState.vodMediaSeqVideo}_${sessionState.vodMediaSeqAudio}, ${currentVod.getLiveMediaSequencesCount()})`);
+        debug(`[${this._sessionId}]: state=VOD_RELOAD_INITIATING (${sessionState.vodMediaSeqVideo}_${sessionState.vodMediaSeqAudio}, ${currentVod.getLiveMediaSequencesCount()}_${currentVod.getLiveMediaSequencesCount("audio")})`);
         if (!isLeader) {
           debug(`[${this._sessionId}]: not the leader so just waiting for the VOD to be reloaded`);
           if (sessionState.vodMediaSeqVideo === 0 || this.waitingForNextVod) {
@@ -1381,7 +1438,7 @@ class Session {
 
         slateVod.load()
           .then(() => {
-            const hlsOpts = { sequenceAlwaysContainNewSegments: this.alwaysNewSegments };
+            const hlsOpts = { sequenceAlwaysContainNewSegments: this.alwaysNewSegments, forcedDemuxMode: this.use_demuxed_audio };
             hlsVod = new HLSVod(this.slateUri, null, null, null, m3u8Header(this._instanceId), hlsOpts);
             const timestamp = Date.now();
             hlsVod.addMetadata('id', `slate-${timestamp}`);
@@ -1393,11 +1450,26 @@ class Session {
               mediaManifestStream.push(null);
               return mediaManifestStream;
             };
-            if (afterVod) {
-              return hlsVod.loadAfter(afterVod, null, slateMediaManifestLoader);
+            if (this.use_demuxed_audio) {
+              const slateAudioManifestLoader = (audioGroupId, audioLanguage) => {
+                let mediaManifestStream = new Readable();
+                mediaManifestStream.push(slateVod.getAudioManifest(audioGroupId, audioLanguage));
+                mediaManifestStream.push(null);
+                return mediaManifestStream;
+              };
+              if (afterVod) {
+                return hlsVod.loadAfter(afterVod, null, slateMediaManifestLoader, slateAudioManifestLoader);
+              } else {
+                return hlsVod.load(null, slateMediaManifestLoader, slateAudioManifestLoader);
+              }
             } else {
-              return hlsVod.load(null, slateMediaManifestLoader);
+              if (afterVod) {
+                return hlsVod.loadAfter(afterVod, null, slateMediaManifestLoader);
+              } else {
+                return hlsVod.load(null, slateMediaManifestLoader);
+              }
             }
+
           })
           .then(() => {
             resolve(hlsVod);
@@ -1426,7 +1498,7 @@ class Session {
 
         slateVod.load()
           .then(() => {
-            const hlsOpts = { sequenceAlwaysContainNewSegments: this.alwaysNewSegments };
+            const hlsOpts = { sequenceAlwaysContainNewSegments: this.alwaysNewSegments, forcedDemuxMode: this.use_demuxed_audio };
             hlsVod = new HLSVod(nexVodUri, null, null, null, m3u8Header(this._instanceId), hlsOpts);
             const timestamp = Date.now();
             hlsVod.addMetadata('id', `slate-${timestamp}`);
@@ -1438,10 +1510,24 @@ class Session {
               mediaManifestStream.push(null);
               return mediaManifestStream;
             };
-            if (afterVod) {
-              return hlsVod.loadAfter(afterVod, null, slateMediaManifestLoader);
+            if (this.use_demuxed_audio) {
+              const slateAudioManifestLoader = (audioGroupId, audioLanguage) => {
+                let mediaManifestStream = new Readable();
+                mediaManifestStream.push(slateVod.getAudioManifest(audioGroupId, audioLanguage));
+                mediaManifestStream.push(null);
+                return mediaManifestStream;
+              };
+              if (afterVod) {
+                return hlsVod.loadAfter(afterVod, null, slateMediaManifestLoader, slateAudioManifestLoader);
+              } else {
+                return hlsVod.load(null, slateMediaManifestLoader, slateAudioManifestLoader);
+              }
             } else {
-              return hlsVod.load(null, slateMediaManifestLoader);
+              if (afterVod) {
+                return hlsVod.loadAfter(afterVod, null, slateMediaManifestLoader);
+              } else {
+                return hlsVod.load(null, slateMediaManifestLoader);
+              }
             }
           })
           .then(() => {
@@ -1538,6 +1624,13 @@ class Session {
     return playheadPositions[sessionState.vodMediaSeqVideo];
   }
 
+  async _getAudioPlayheadPosition(seqIdx) {
+    const currentVod = await this._sessionState.getCurrentVod();
+    const playheadPositions = currentVod.getPlayheadPositions("audio");
+    debug(`[${this._sessionId}]: Current audio playhead position (${seqIdx}): ${playheadPositions[seqIdx]}`);
+    return playheadPositions[seqIdx];
+  }
+
   _getLastDuration(manifest) {
     return new Promise((resolve, reject) => {
       try {

package/engine/session_state.js

@@ -131,6 +131,8 @@ class SessionStateStore extends SharedStateStore {
     super("session", opts, {
       mediaSeq: 0,
       discSeq: 0,
+      mediaSeqAudio: 0,
+      discSeqAudio: 0,
       vodMediaSeqVideo: 0,
       vodMediaSeqAudio: 0, // assume only one audio group now
       state: SessionState.VOD_INIT,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "3.4.3",
+  "version": "4.0.0-rc.0",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc --project ./ && cp ./package.json dist/",
     "debug-server": "DEBUG=engine-*,vod-to-live node dist/server.js",
-    "test": "$(npm bin)/jasmine",
+    "test": "jasmine",
     "postversion": "git push && git push --tags",
     "start": "node dist/server.js",
     "start-demux": "node dist/server-demux.js",
@@ -23,10 +23,10 @@
   "repository": "https://github.com/Eyevinn/channel-engine",
   "license": "Apache-2.0",
   "dependencies": {
-    "@eyevinn/hls-repeat": "^0.1.1",
-    "@eyevinn/hls-truncate": "^0.1.0",
-    "@eyevinn/hls-vodtolive": "^2.0.2",
-    "@eyevinn/m3u8": "^0.4.1",
+    "@eyevinn/hls-repeat": "^0.2.0",
+    "@eyevinn/hls-truncate": "^0.2.0",
+    "@eyevinn/hls-vodtolive": "^2.1.1",
+    "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",
     "memcache-client": "^0.10.1",
@@ -35,7 +35,7 @@
     "promise.allsettled": "^1.0.4",
     "redis": "^3.0.2",
     "request": ">=2.88.0",
-    "restify": ">=8.5.1",
+    "restify": "9.0.0",
     "restify-errors": "^8.0.2",
     "uuid": "^8.3.2"
   },

package/server-demux.ts

@@ -2,26 +2,53 @@
  * Reference implementation of Channel Engine library using demuxed VOD assets.
  */
 
-import { ChannelEngine, ChannelEngineOpts, 
-  IAssetManager, IChannelManager, 
-  VodRequest, VodResponse, Channel, ChannelProfile,
-  AudioTracks
+import {
+  ChannelEngine,
+  ChannelEngineOpts,
+  IAssetManager,
+  IChannelManager,
+  VodRequest,
+  VodResponse,
+  Channel,
+  ChannelProfile,
+  AudioTracks,
 } from "./index";
 
+const STITCH_ENDPOINT = "http://localhost:8000/stitch/master.m3u8";
+
 class RefAssetManager implements IAssetManager {
   private assets;
   private pos;
   constructor(opts?) {
     this.assets = {
       1: [
+        /* #TS+DEMUX HLS VODS */
+        // {
+        //   id: 1,
+        //   title: "Elephants Dream",
+        //   uri: "https://playertest.longtailvideo.com/adaptive/elephants_dream_v4/index.m3u8",
+        // },
+        // {
+        //   id: 2,
+        //   title: "Test HLS Bird noises (1m10s)",
+        //   uri: "https://mtoczko.github.io/hls-test-streams/test-audio-pdt/playlist.m3u8",
+        // },
+        /* #CMAF+DEMUX HLS VODS */
         {
           id: 1,
-          title: "Elephants Dream",
-          uri: "https://playertest.longtailvideo.com/adaptive/elephants_dream_v4/index.m3u8", },
+          title: "Nymo Bloopers",
+          uri: "https://vod.streaming.a2d.tv/a07ff4eb-6770-4805-a0ad-a4d1b127880d/4fef8b00-6d0b-11ed-89b6-2b1a288899a0_20356478.ism/.m3u8"
+        },
         {
           id: 2,
-          title: "Test HLS Bird noises (1m10s)",
-          uri: "https://mtoczko.github.io/hls-test-streams/test-audio-pdt/playlist.m3u8",},
+          title: "Benjamin Sjunger",
+          uri: "https://vod.streaming.a2d.tv/3f389c48-03e3-48a2-8e98-a02c55185a68/4c792a30-89ad-11ed-95d9-1b374c4e2f9f_20411056.ism/.m3u8"
+        },
+        {
+          id: 3,
+          title: "Idol Vinnarlåten",
+          uri: "https://vod.streaming.a2d.tv/369f8dd6-bc62-40a3-b734-4bc1cb50c00b/e9ef93d0-6d10-11ed-83d0-17c0db863fe0_20356484.ism/.m3u8"
+        },
       ],
     };
     this.pos = {
@@ -47,8 +74,32 @@ class RefAssetManager implements IAssetManager {
           this.pos[channelId] = 0;
         }
         vod.timedMetadata = {
-          'start-date': new Date().toISOString(),
-          'class': 'se.eyevinn.demo'
+          "start-date": new Date().toISOString(),
+          class: "se.eyevinn.demo",
+        };
+        const payload = {
+          uri: vod.uri,
+          breaks: [
+            /* #TS+DEMUX HLS BREAK VOD */
+            // {
+            //   pos: 0,
+            //   duration: 60 * 1000,
+            //   url: "https://lab-live.cdn.eyevinn.technology/DEMUX_002/master_demux_aac-en-fr.m3u8",
+            // },
+            /* #CMAF+DEMUX HLS BREAK VOD */
+            {
+              pos: 0,
+              duration: 20 * 1000,
+              url: "https://ovpuspvod.a2d-stage.tv/trailers/63ef9c36e3ffa90028603374/output.ism/.m3u8",
+            },
+          ],
+        };
+        const buff = Buffer.from(JSON.stringify(payload));
+        const encodedPayload = buff.toString("base64");
+        vod = {
+          id: vod.id,
+          title: vod.title,
+          uri: STITCH_ENDPOINT + "?payload=" + encodedPayload,
         };
         resolve(vod);
       } else {
@@ -60,7 +111,7 @@ class RefAssetManager implements IAssetManager {
 
 class RefChannelManager implements IChannelManager {
   getChannels(): Channel[] {
-    return [ { id: "1", profile: this._getProfile(), audioTracks: this._getAudioTracks(), }, ];
+    return [{ id: "1", profile: this._getProfile(), audioTracks: this._getAudioTracks() }];
   }
 
   _getProfile(): ChannelProfile[] {
@@ -82,11 +133,7 @@ class RefChannelManager implements IChannelManager {
     ];
   }
   _getAudioTracks(): AudioTracks[] {
-    return [
-      { language: "sp", name: "Spanish" },
-      { language: "ru", name: "Russian" },
-      { language: "en", name: "English", default: true },
-    ];
+    return [{ language: "Swedish", name: "Swedish" }];
   }
 }
 
@@ -97,13 +144,16 @@ const engineOptions: ChannelEngineOpts = {
   heartbeat: "/",
   averageSegmentDuration: 2000,
   channelManager: refChannelManager,
-  defaultSlateUri:
-    "https://maitv-vod.lab.eyevinn.technology/slate-consuo.mp4/master.m3u8",
+  /* #TS+DEMUX SLATE VOD */
+  defaultSlateUri: "https://ovpuspvod.a2d-stage.tv/trailers/bumpers/tv4_spring/output.ism/.m3u8",
+  /* #CMAF+DEMUX SLATE VOD */
+  //defaultSlateUri: "https://ovpuspvod.a2d-stage.tv/trailers/bumpers/tv4_spring/output.ism/.m3u8",
   slateRepetitions: 10,
   redisUrl: process.env.REDIS_URL,
   useDemuxedAudio: true,
+  alwaysNewSegments: true,
 };
 
 const engine = new ChannelEngine(refAssetManager, engineOptions);
 engine.start();
-engine.listen(process.env.port || 8000);
+engine.listen(process.env.PORT || 8000);