eyevinn-channel-engine 3.1.0 → 3.1.3

package/engine/session.js

@@ -395,20 +395,10 @@ class Session {
     if (!this._sessionState) {
       throw new Error('Session not ready');
     }
-    const sessionState = await this._sessionState.getValues(["discSeq", "vodMediaSeqVideo"]);
+    const sessionState = await this._sessionState.getValues(["discSeq"]);
     const playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo"]);
 
-    /*
-      Since sessionState is always newer. If it is a smaller value, then this signals that
-      a new vod has been loaded but playheadState has yet to get the new mseq value in 'incrementAsync()'.
-      Without this, we risk returning an m3u8 with an old mseq on a new vod to the client.
-    */
-    if (playheadState.vodMediaSeqVideo > sessionState.vodMediaSeqVideo) {
-      playheadState.vodMediaSeqVideo = sessionState.vodMediaSeqVideo;
-    }
-
-    if (playheadState.vodMediaSeqVideo === 0 || this.waitingForNextVod) { 
-      this.waitingForNextVod = false;
+    if (playheadState.vodMediaSeqVideo === 0) { 
       const isLeader = await this._sessionStateStore.isLeader(this._instanceId);
       if (!isLeader) {
         debug(`[${this._sessionId}]: Not a leader and first media sequence in a VOD is requested. Invalidate cache to ensure having the correct VOD.`);
@@ -465,14 +455,6 @@ class Session {
     let sessionState = await this._sessionState.getValues(
       ["state", "mediaSeq", "discSeq", "vodMediaSeqVideo", "vodMediaSeqAudio"]);
     let playheadState = await this._playheadState.getValues(["mediaSeq", "vodMediaSeqVideo", "vodMediaSeqAudio"]);
-    if (playheadState.vodMediaSeqVideo < 2) {
-      // This is due to the possibility that we miss the tick where vodMediaSeqVideo is 0
-      // The worst case scenario is that we clear cache two times in a row on a switch
-      if (!isLeader) {
-        debug(`[${this._sessionId}]: Not a leader and first media sequence in a VOD is requested. Invalidate cache to ensure having the correct VOD.`);
-        await this._sessionState.clearCurrentVodCache(); // force reading up from shared store
-      }
-    }
     let currentVod = await this._sessionState.getCurrentVod();
     if (!currentVod ||
         sessionState.vodMediaSeqVideo === null ||
@@ -517,6 +499,12 @@ class Session {
     debug(`[${this._sessionId}]: INCREMENT (mseq=${playheadState.mediaSeq + playheadState.vodMediaSeqVideo}) vodMediaSeq=(${playheadState.vodMediaSeqVideo}_${playheadState.vodMediaSeqAudio} of ${currentVod.getLiveMediaSequencesCount()})`);
     let m3u8 = currentVod.getLiveMediaSequences(playheadState.mediaSeq, 180000, playheadState.vodMediaSeqVideo, sessionState.discSeq);
     await this._playheadState.setLastM3u8(m3u8);
+
+    if (!isLeader && playheadState.vodMediaSeqVideo < 2) {
+      debug(`[${this._sessionId}]: Not a leader and have just set playheadState vodMediaSeqVideo to 0|1. Invalidate cache to ensure having the correct VOD.`);
+      await this._sessionState.clearCurrentVodCache();
+    }
+
     return m3u8;
   }
 

package/engine/session_live.js

@@ -18,6 +18,7 @@ const daterangeAttribute = (key, attr) => {
 const TARGET_PLAYLIST_DURATION_SEC = 60;
 const RESET_DELAY = 5000;
 const FAIL_TIMEOUT = 4000;
+const DEFAULT_PLAYHEAD_INTERVAL_MS = 6 * 1000;
 const PlayheadState = Object.freeze({
   RUNNING: 1,
   STOPPED: 2,
@@ -40,7 +41,6 @@ class SessionLive {
     this.mediaManifestURIs = {};
     this.liveSegQueue = {};
     this.lastRequestedMediaSeqRaw = null;
-    this.targetNumSeg = 0;
     this.liveSourceM3Us = {};
     this.playheadState = PlayheadState.IDLE;
     this.liveSegsForFollowers = {};
@@ -117,7 +117,6 @@ class SessionLive {
     this.mediaManifestURIs = {};
     this.liveSegQueue = {};
     this.lastRequestedMediaSeqRaw = null;
-    this.targetNumSeg = 0;
     this.liveSourceM3Us = {};
     this.liveSegsForFollowers = {};
     this.timerCompensation = null;
@@ -149,13 +148,6 @@ class SessionLive {
           return;
         }
 
-        // Let the playhead move at an interval set according to live segment duration
-        let liveSegmentDurationMs = 6000;
-        let liveBws = Object.keys(this.liveSegQueue);
-        if (liveBws.length !== 0 && this.liveSegQueue[liveBws[0]].length !== 0 && this.liveSegQueue[liveBws[0]][0].duration) {
-          liveSegmentDurationMs = this.liveSegQueue[liveBws[0]][0].duration * 1000;
-        }
-
         // Fetch Live-Source Segments, and get ready for on-the-fly manifest generation
         // And also compensate for processing time
 
@@ -165,6 +157,13 @@ class SessionLive {
         const tsIncrementEnd = Date.now();
         this.waitForPlayhead = false;
 
+        // Let the playhead move at an interval set according to live segment duration
+        let liveSegmentDurationMs = DEFAULT_PLAYHEAD_INTERVAL_MS;
+        let liveBws = Object.keys(this.liveSegQueue);
+        if (liveBws.length !== 0 && this.liveSegQueue[liveBws[0]].length !== 0 && this.liveSegQueue[liveBws[0]][0].duration) {
+          liveSegmentDurationMs = this.liveSegQueue[liveBws[0]][0].duration * 1000;
+        }
+
         // Set the timer
         let timerValueMs = 0;
         if (this.timerCompensation) {
@@ -242,14 +241,13 @@ class SessionLive {
     }
     // Make it possible to add & share new segments
     this.allowedToSet = true;
-    let segCount = 0;
     const allBws = Object.keys(segments);
     for (let i = 0; i < allBws.length; i++) {
       const bw = allBws[i];
       if (!this.vodSegments[bw]) {
         this.vodSegments[bw] = [];
       }
-
+      
       if (segments[bw][0].discontinuity) {
         segments[bw].shift();
       }
@@ -264,12 +262,6 @@ class SessionLive {
       }
     }
 
-    for (let segIdx = 0; segIdx < segments[allBws[0]].length; segIdx++) {
-      if (segments[allBws[0]][segIdx].uri) {
-        segCount++;
-      }
-    }
-    this.targetNumSeg = segCount;
     debug(`[${this.sessionId}]: Setting CurrentMediaSequenceSegments. First seg is: [${this.vodSegments[allBws[0]][0].uri}]`);
 
     const isLeader = await this.sessionLiveStateStore.isLeader(this.instanceId);
@@ -645,12 +637,16 @@ class SessionLive {
         if (Object.keys(this.liveSegQueue).length > 0) {
           const firstBw = Object.keys(this.liveSegQueue)[0];
           const lastIdx = this.liveSegQueue[firstBw].length - 1;
-          retryDelayMs = this.liveSegQueue[firstBw][lastIdx].duration * 1000 * 0.25;
+          if (this.liveSegQueue[firstBw][lastIdx].duration) {
+            retryDelayMs = this.liveSegQueue[firstBw][lastIdx].duration * 1000 * 0.25;
+          }
         }
         // Wait a little before trying again
         debug(`[${this.sessionId}]: ALERT! Live Source Data NOT in sync! Will try again after ${retryDelayMs}ms`);
         await timer(retryDelayMs);
-        this.timerCompensation = false;
+        if (isLeader) {
+          this.timerCompensation = false;
+        }
         continue;
       }
 
@@ -688,14 +684,6 @@ class SessionLive {
           const transitSegs = await this.sessionLiveState.get("transitSegs");
           if (!this._isEmpty(transitSegs)) {
             this.vodSegments = transitSegs;
-            let discTagCount = 0;
-            const allBws = Object.keys(this.vodSegments);
-            for (let segIdx = 0; segIdx < this.vodSegments[allBws[0]].length; segIdx++) {
-              if (this.vodSegments[allBws[0]][segIdx].discontinuity) {
-                discTagCount++;
-              }
-            }
-            this.targetNumSeg = this.vodSegments[allBws[0]].length - (discTagCount - 1);
           }
         }
 
@@ -711,14 +699,6 @@ class SessionLive {
           //debug(`[${this.sessionId}]: NEW FOLLOWER: I tried to get 'transitSegs'. This is what I found ${JSON.stringify(transitSegs)}`);
           if (!this._isEmpty(transitSegs)) {
             this.vodSegments = transitSegs;
-            let discTagCount = 0;
-            const allBws = Object.keys(this.vodSegments);
-            for (let segIdx = 0; segIdx < this.vodSegments[allBws[0]].length; segIdx++) {
-              if (this.vodSegments[allBws[0]][segIdx].discontinuity) {
-                discTagCount++;
-              }
-            }
-            this.targetNumSeg = this.vodSegments[allBws[0]].length - (discTagCount - 1);
           }
         }
         debug(`[${this.sessionId}]: ...pushAmount=${this.pushAmount}`);
@@ -779,7 +759,8 @@ class SessionLive {
       await allSettled(pushPromises);
 
       // UPDATE COUNTS, & Shift Segments in vodSegments and liveSegQueue if needed.
-      const newTotalDuration = this._incrementAndShift("LEADER");
+      const leaderORFollower = isLeader ? "LEADER" : "NEW FOLLOWER";
+      const newTotalDuration = this._incrementAndShift(leaderORFollower);
       if (newTotalDuration) {
         debug(`[${this.sessionId}]: New Adjusted Playlist Duration=${newTotalDuration}s`);
       }
@@ -1128,7 +1109,7 @@ class SessionLive {
         }
         // Push new Live Segments!
         this.liveSegQueue[liveTargetBandwidth].push(seg);
-        this.liveSegsForFollowers[liveTargetBandwidth].push(seg);        
+        this.liveSegsForFollowers[liveTargetBandwidth].push(seg);
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "3.1.0",
+  "version": "3.1.3",
   "description": "OTT TV Channel Engine",
   "main": "index.js",
   "scripts": {