eyevinn-channel-engine 3.3.1 → 3.3.4

package/README.md

@@ -109,6 +109,7 @@ Available options when constructing the Channel Engine object are:
 - `cloudWatchMetrics`: Output CloudWatch JSON metrics on console log. Default is false.
 - `useDemuxedAudio`: Enable playing VODs with multiple audio tracks. Default is false.
 - `alwaysNewSegments`: Force all new HLS media sequences to always contain at least 1 new segment. Default is false.
+- `diffCompensationRate`: The rate for how much time is added on each sequence to slow down the playhead until it is back on schedule. Default is 0.5 (delay with half a segment duration).
 
 ## High Availability
 

package/engine/server.js

@@ -109,6 +109,9 @@ class ChannelEngine {
     if (options && options.forceTargetDuration) {
       this.streamerOpts.forceTargetDuration = options.forceTargetDuration;
     }
+    if (options && options.diffCompensationRate) {
+      this.streamerOpts.diffCompensationRate = options.diffCompensationRate;
+    }
     const handleMasterRoute = async (req, res, next) => {
       debug(req.params);
       let m;
@@ -237,6 +240,7 @@ class ChannelEngine {
         maxTickInterval: channel.options && channel.options.maxTickInterval ? channel.options.maxTickInterval : this.streamerOpts.defaultMaxTickInterval,
         targetDurationPadding: channel.options && channel.options.targetDurationPadding ? channel.options.targetDurationPadding : this.streamerOpts.targetDurationPadding,
         forceTargetDuration: channel.options && channel.options.forceTargetDuration ? channel.options.forceTargetDuration : this.streamerOpts.forceTargetDuration,
+        diffCompensationRate: channel.options && channel.options.diffCompensationRate ? channel.options.diffCompensationRate : this.streamerOpts.diffCompensationRate,
         profile: channel.profile,
         audioTracks: channel.audioTracks,
         closedCaptions: channel.closedCaptions,
@@ -454,6 +458,7 @@ class ChannelEngine {
       options.maxTickInterval = this.streamerOpts.defaultMaxTickInterval;
       options.targetDurationPadding = this.streamerOpts.targetDurationPadding;
       options.forceTargetDuration = this.streamerOpts.forceTargetDuration;
+      options.diffCompensationRate = this.streamerOpts.diffCompensationRate;
       // if we are initiating a master manifest
       // outside of specific Channel context,
       // if slate options are set at the ChannelEngine level, then set these here

package/engine/session.js

@@ -15,6 +15,7 @@ const ChaosMonkey = require('./chaos_monkey.js');
 const AVERAGE_SEGMENT_DURATION = 3000;
 const DEFAULT_PLAYHEAD_DIFF_THRESHOLD = 1000;
 const DEFAULT_MAX_TICK_INTERVAL = 10000;
+const DEFAULT_DIFF_COMPENSATION_RATE = 0.5;
 
 const timer = ms => new Promise(res => setTimeout(res, ms));
 
@@ -42,7 +43,9 @@ class Session {
     this.cloudWatchLogging = false;
     this.playheadDiffThreshold = DEFAULT_PLAYHEAD_DIFF_THRESHOLD;
     this.maxTickInterval = DEFAULT_MAX_TICK_INTERVAL;
+    this.diffCompensationRate = DEFAULT_DIFF_COMPENSATION_RATE;
     this.diffCompensation = null;
+    this.timePositionOffset = 0;
     this.prevVodMediaSeq = {
       video: null,
       audio: null
@@ -117,6 +120,9 @@ class Session {
       if (config.forceTargetDuration) {
         this.forceTargetDuration = config.forceTargetDuration;
       }
+      if (config.diffCompensationRate) {
+        this.diffCompensationRate = config.diffCompensationRate;
+      }
     }
   }
 
@@ -180,28 +186,43 @@ class Session {
           const reqTickInterval = playheadState.tickInterval;
           const timeSpentInIncrement = (tsIncrementEnd - tsIncrementBegin) / 1000;
           let tickInterval = reqTickInterval - timeSpentInIncrement;
+          // Apply HLSVod delta time for current msequence.
           const delta = await this._getCurrentDeltaTime();
           if (delta != 0) {
-            debug(`[${this._sessionId}]: Delta time is != 0 need will adjust ${delta}sec to tick interval`);
             tickInterval += delta;
+            debug(`[${this._sessionId}]: Delta time is != 0 need will adjust ${delta}sec to tick interval. tick=${tickInterval}`);
           }
           const position = (await this._getCurrentPlayheadPosition()) * 1000;
-          const timePosition = Date.now() - playheadState.playheadRef;
+          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) {
+            timePosition -= this.timePositionOffset;
+            cloudWatchLog(!this.cloudWatchLogging, 'engine-session',
+            { event: 'applyTimePositionOffset', channel: this._sessionId, offsetMs: this.timePositionOffset });
+          }
           const diff = position - timePosition;
           debug(`[${this._sessionId}]: ${timePosition}:${position}:${diff > 0 ? '+' : ''}${diff}ms`);
           cloudWatchLog(!this.cloudWatchLogging, 'engine-session',
             { event: 'playheadDiff', channel: this._sessionId, diffMs: diff });
-          if (diff > this.playheadDiffThreshold) {
-            tickInterval += ((diff / 1000)) - (this.playheadDiffThreshold / 1000);
-          } else if (diff < -this.playheadDiffThreshold) {
-            tickInterval += ((diff / 1000)) + (this.playheadDiffThreshold / 1000);
-          }
+            if (this.alwaysNewSegments) {
+              // Apply Playhead diff compensation, only after external diff compensation has concluded.
+              if (this.diffCompensation <= 0) {
+                const timeToAdd = this._getPlayheadDiffCompesationValue(diff, this.playheadDiffThreshold);
+                tickInterval += timeToAdd;
+              }
+            } else {
+              // Apply Playhead diff compensation, always.
+              const timeToAdd = this._getPlayheadDiffCompesationValue(diff, this.playheadDiffThreshold);
+              tickInterval += timeToAdd;
+            }
+          // Apply external diff compensation if available.
           if (this.diffCompensation && this.diffCompensation > 0) {
-            const DIFF_COMPENSATION = 2000;
+            const DIFF_COMPENSATION = (reqTickInterval * this.diffCompensationRate).toFixed(2) * 1000;
             debug(`[${this._sessionId}]: Adding ${DIFF_COMPENSATION}msec to tickInterval to compensate for schedule diff (current=${this.diffCompensation}msec)`);
             tickInterval += (DIFF_COMPENSATION / 1000);
             this.diffCompensation -= DIFF_COMPENSATION;
           }
+          // Keep tickInterval within upper and lower limits.
           debug(`[${this._sessionId}]: Requested tickInterval=${tickInterval}s (max=${this.maxTickInterval / 1000}s, diffThreshold=${this.playheadDiffThreshold}msec)`);
           if (tickInterval <= 0.5) {
             tickInterval = 0.5;
@@ -214,6 +235,13 @@ class Session {
           await this._playheadState.set("tickMs", (tsTickEnd - tsIncrementBegin));
           cloudWatchLog(!this.cloudWatchLogging, 'engine-session',
             { event: 'tickInterval', channel: this._sessionId, tickTimeMs: (tsTickEnd - tsIncrementBegin) });
+          if (this.alwaysNewSegments) {
+            // Use dynamic base-tickInterval. Set according to duration of latest segment.
+            const lastDuration = await this._getLastDuration(manifest);
+            const nextTickInterval = lastDuration < 2 ? 2 : lastDuration;
+            await this._playheadState.set("tickInterval", nextTickInterval);
+            cloudWatchLog(!this.cloudWatchLogging, "engine-session", { event: "tickIntervalUpdated", channel: this._sessionId, tickIntervalSec: nextTickInterval });
+          }
         }
       } catch (err) {
         debug(`[${this._sessionId}]: Playhead consumer crashed (1)`);
@@ -517,6 +545,18 @@ class Session {
         debug(`[${this._sessionId}]: Not a leader and first|second media sequence in a VOD is requested. Invalidate cache to ensure having the correct VOD.`);
         await this._sessionState.clearCurrentVodCache();
         this.isAllowedToClearVodCache = false;
+        const diffMs = await this._playheadState.get("diffCompensation");
+        if (diffMs) {
+          this.diffCompensation = diffMs;
+          debug(`[${this._sessionId}]: Setting diffCompensation->${this.diffCompensation}`);
+          if (this.diffCompensation) {
+            this.timePositionOffset = this.diffCompensation;
+            cloudWatchLog(!this.cloudWatchLogging, 'engine-session',
+            { event: 'timePositionOffsetUpdated', channel: this._sessionId, offsetMs: this.timePositionOffset });
+          } else{
+            this.timePositionOffset = 0;
+          }
+        }
       }
     } else {
       this.isAllowedToClearVodCache = true;
@@ -526,14 +566,16 @@ class Session {
     if (currentVod) {
       try {
 
+        let manifestMseq = playheadState.mediaSeq + playheadState.vodMediaSeqVideo;
         if (currentVod.sequenceAlwaysContainNewSegments) {
           const mediaSequenceValue = currentVod.mediaSequenceValues[playheadState.vodMediaSeqVideo];
           debug(`[${this._sessionId}]: {${mediaSequenceValue}}_{${currentVod.getLastSequenceMediaSequenceValue()}}`);
+          manifestMseq = playheadState.mediaSeq + mediaSequenceValue;
         }
 
         debug(`[${this._sessionId}]: [${playheadState.vodMediaSeqVideo}]_[${currentVod.getLiveMediaSequencesCount()}]`);
         const m3u8 = currentVod.getLiveMediaSequences(playheadState.mediaSeq, bw, playheadState.vodMediaSeqVideo, sessionState.discSeq, this.targetDurationPadding, this.forceTargetDuration);
-        debug(`[${this._sessionId}]: [${playheadState.mediaSeq + playheadState.vodMediaSeqVideo}][${sessionState.discSeq}][+${this.targetDurationPadding || 0}] Current media manifest for ${bw} requested`);
+        debug(`[${this._sessionId}]: [${manifestMseq}][${sessionState.discSeq}][+${this.targetDurationPadding || 0}] Current media manifest for ${bw} requested`);
         this.prevVodMediaSeq.video = playheadState.vodMediaSeqVideo;
         this.prevMediaSeqOffset.video = playheadState.mediaSeq;
         return m3u8;
@@ -650,6 +692,18 @@ class Session {
         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();
         currentVod = await this._sessionState.getCurrentVod();
+        const diffMs = await this._playheadState.get("diffCompensation");
+        if (diffMs) {
+          this.diffCompensation = diffMs;
+          debug(`[${this._sessionId}]: Setting diffCompensation->${this.diffCompensation}`);
+          if (this.diffCompensation) {
+            this.timePositionOffset = this.diffCompensation;
+            cloudWatchLog(!this.cloudWatchLogging, 'engine-session',
+            { event: 'timePositionOffsetUpdated', channel: this._sessionId, offsetMs: this.timePositionOffset });
+          } else{
+            this.timePositionOffset = 0;
+          }
+        }
         this.isAllowedToClearVodCache = false;
       }
     } else {
@@ -1095,6 +1149,13 @@ class Session {
               loadPromise = newVod.loadAfter(currentVod);
               if (vodResponse.diffMs) {
                 this.diffCompensation = vodResponse.diffMs;
+                if (this.diffCompensation) {
+                  this.timePositionOffset = this.diffCompensation;
+                  cloudWatchLog(!this.cloudWatchLogging, 'engine-session',
+                  { event: 'timePositionOffsetUpdated', channel: this._sessionId, offsetMs: this.timePositionOffset });
+                } else{
+                  this.timePositionOffset = 0;
+                }
               }
             } else {
               loadPromise = new Promise((resolve, reject) => {
@@ -1123,6 +1184,8 @@ class Session {
             sessionState.currentVod = await this._sessionState.setCurrentVod(currentVod, { ttl: currentVod.getDuration() * 1000 });
             this.leaderIsSettingNextVod = false;
             await this._playheadState.set("playheadRef", Date.now());
+            await this._playheadState.set("diffCompensation", this.diffCompensation);
+            debug(`[${this._sessionId}]: sharing durrent vods diffCompensation=${this.diffCompensation}`);
             this.produceEvent({
               type: 'NOW_PLAYING',
               data: {
@@ -1138,6 +1201,18 @@ class Session {
             // Allow Leader|Follower to clear vodCache...
             this.isAllowedToClearVodCache = true;
             sessionState.currentVod = await this._sessionState.getCurrentVod();
+            const diffMs = await this._playheadState.get("diffCompensation");
+            if (diffMs) {
+              this.diffCompensation = diffMs;
+              debug(`[${this._sessionId}]: Setting diffCompensation=${this.diffCompensation}`);
+              if (this.diffCompensation) {
+                this.timePositionOffset = this.diffCompensation;
+                cloudWatchLog(!this.cloudWatchLogging, 'engine-session',
+                { event: 'timePositionOffsetUpdated', channel: this._sessionId, offsetMs: this.timePositionOffset });
+              } else{
+                this.timePositionOffset = 0;
+              }
+            }
           }
         } catch (err) {
           console.error(`[${this._sessionId}]: Failed to init next VOD`);
@@ -1161,34 +1236,33 @@ class Session {
           try {
             debug(`[${this._sessionId}]: state=VOD_RELOAD_INIT`);
             if (isLeader) {
-
               const startTS = Date.now();
-
               // 1) To tell Follower that, Leader is working on it!
               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;
               let currentVod = await this._sessionState.getCurrentVod();
               if (currentVod.sequenceAlwaysContainNewSegments) {
                 // (!) will need to compensate if using this setting on HLSVod Object.
-                mSeq -= 1;
-              } 
+                Object.keys(this.switchDataForSession.transitionSegments).forEach(bw => {
+                  let shiftedSeg = this.switchDataForSession.transitionSegments[bw].shift();
+                  if (shiftedSeg && shiftedSeg.discontinuity) {
+                    shiftedSeg = this.switchDataForSession.transitionSegments[bw].shift();
+                  }
+                });
+              }
               const dSeq = this.switchDataForSession.discSeq;
               const mSeqOffset = this.switchDataForSession.mediaSeqOffset;
               const reloadBehind = this.switchDataForSession.reloadBehind;
               const segments = this.switchDataForSession.transitionSegments;
-
               if ([mSeq,dSeq,mSeqOffset,reloadBehind,segments].includes(null)) {
                 debug(`[${this._sessionId}]: LEADER: Cannot Reload VOD, missing switch-back data`);
                 return;
               }
-
               await this._sessionState.set("mediaSeq", mSeq);
               await this._playheadState.set("mediaSeq", mSeq);
               await this._sessionState.set("discSeq", dSeq);
               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.`);
               const playheadState = await this._playheadState.getValues(["vodMediaSeqVideo"]);
@@ -1197,8 +1271,10 @@ class Session {
                 nextMseq = currentVod.getLiveMediaSequencesCount() - 1;
               }
 
-              // TODO: Support reloading with audioSegments as well
-
+              // ---------------------------------------------------.
+              // TODO: Support reloading with audioSegments as well |
+              // ---------------------------------------------------'
+              
               await currentVod.reload(nextMseq, segments, null, reloadBehind);
               await this._sessionState.setCurrentVod(currentVod, { ttl: currentVod.getDuration() * 1000 });
               await this._sessionState.set("vodReloaded", 1);
@@ -1207,10 +1283,12 @@ class Session {
               await this._playheadState.set("vodMediaSeqVideo", 0);
               await this._playheadState.set("vodMediaSeqAudio", 0);
               await this._playheadState.set("playheadRef", Date.now());
+               // 4) Log to debug and cloudwatch
               debug(`[${this._sessionId}]: LEADER: Set new Reloaded VOD and vodMediaSeq counts in store.`);
-              // 4) emit cloudwatch event object
+              debug(`[${this._sessionId}]: next VOD Reloaded (${currentVod.getDeltaTimes()})`);
+              debug(`[${this._sessionId}]: ${currentVod.getPlayheadPositions()}`);
+              debug(`[${this._sessionId}]: msequences=${currentVod.getLiveMediaSequencesCount()}`);
               cloudWatchLog(!this.cloudWatchLogging, "engine-session", { event: "switchback", channel: this._sessionId, reqTimeMs: Date.now() - startTS });
-
               return;
             } else {
               debug(`[${this._sessionId}]: not a leader so will go directly to state VOD_RELOAD_INITIATING`);
@@ -1435,6 +1513,47 @@ class Session {
     debug(`[${this._sessionId}]: Current playhead position (${sessionState.vodMediaSeqVideo}): ${playheadPositions[sessionState.vodMediaSeqVideo]}`);
     return playheadPositions[sessionState.vodMediaSeqVideo];
   }
+
+  _getLastDuration(manifest) {
+    return new Promise((resolve, reject) => {
+      try {
+        const parser = m3u8.createStream();
+        let manifestStream = new Readable();
+        manifestStream.push(manifest);
+        manifestStream.push(null);
+
+        manifestStream.pipe(parser);
+        parser.on('m3u', m3u => {
+          if (m3u.items.PlaylistItem.length > 0) {
+            const endIdx = m3u.items.PlaylistItem.length - 1;
+            const bottomDuration = m3u.items.PlaylistItem[endIdx].get("duration");
+            resolve(bottomDuration);
+          } else {
+            console.error("Empty media playlist");
+            console.error(manifest);
+            reject('Empty media playlist!')
+          }
+        });
+      } catch (err) {
+        reject(err);
+      }
+    });
+  }
+
+  _getPlayheadDiffCompesationValue(diffMs, thresholdMs) {
+    let compensationSec = 0;
+    if (diffMs > thresholdMs) {
+      compensationSec = (diffMs / 1000) - (thresholdMs / 1000);
+      debug(`[${this._sessionId}]: Playhead stepping msequences too early. Need to wait longer. adding ${compensationSec}s`);
+      return compensationSec;
+    } else if (diffMs < -thresholdMs) {
+      compensationSec = (diffMs / 1000) + (thresholdMs / 1000);
+      debug(`[${this._sessionId}]: Playhead stepping msequences too LATE. Need to fast-forward. adding ${compensationSec}s`);
+      return compensationSec;
+    } else {
+      return compensationSec;
+    }
+  }
 }
 
 module.exports = Session;

package/engine/session_live.js

@@ -218,6 +218,7 @@ class SessionLive {
         this.masterManifestUri = masterManifestUri;
         if (this.sessionLiveProfile) {
           this._filterLiveProfiles();
+          debug(`[${this.sessionId}]: Filtered Live profiles! (${Object.keys(this.mediaManifestURIs).length}) profiles left!`);
         }
       } catch (err) {
         this.masterManifestUri = null;
@@ -253,21 +254,37 @@ class SessionLive {
         if (segments[bw][0].discontinuity) {
           segments[bw].shift();
         }
-
+        let cueInExists = null;
         for (let segIdx = 0; segIdx < segments[bw].length; segIdx++) {
-          this.vodSegments[bw].push(segments[bw][segIdx]);
+          const v2lSegment = segments[bw][segIdx];
+          if (v2lSegment.cue) {
+            if (v2lSegment.cue["in"]) {
+              cueInExists = true;
+            } else {
+              cueInExists = false;
+            }
+          }
+          this.vodSegments[bw].push(v2lSegment);
         }
-        if (!segments[bw][segments[bw].length - 1].discontinuity) {
-          this.vodSegments[bw].push({ discontinuity: true, cue: { in: true } });
+
+        const endIdx = segments[bw].length - 1;
+        if (!segments[bw][endIdx].discontinuity) {
+          const finalSegItem = { discontinuity: true };
+          if (!cueInExists) {
+            finalSegItem["cue"] = { in: true };
+          }
+          this.vodSegments[bw].push(finalSegItem);
         } else {
-          segments[bw][segments[bw].length - 1]["cue"] = { in: true };
+          if (!cueInExists) {
+            segments[bw][endIdx]["cue"] = { in: true };
+          }
         }
       }
     } else {
       debug(`[${this.sessionId}]: 'vodSegments' not empty = Using 'transitSegs'`);
     }
 
-    debug(`[${this.sessionId}]: Setting CurrentMediaSequenceSegments. First seg is: [${this.vodSegments[allBws[0]][0].uri}]`);
+    debug(`[${this.sessionId}]: Setting CurrentMediaSequenceSegments. First seg is: [${this.vodSegments[Object.keys(this.vodSegments)[0]][0].uri}]`);
 
     const isLeader = await this.sessionLiveStateStore.isLeader(this.instanceId);
     if (isLeader) {
@@ -501,7 +518,7 @@ class SessionLive {
           this.liveSegQueue[liveBw] = [];
         }
         // Do not push duplicates
-        const liveSegURIs = this.liveSegQueue[liveBw].filter(seg => seg.uri).map(seg => seg.uri);
+        const liveSegURIs = this.liveSegQueue[liveBw].filter((seg) => seg.uri).map((seg) => seg.uri);
         if (liveSegFromLeader.uri && liveSegURIs.includes(liveSegFromLeader.uri)) {
           debug(`[${this.sessionId}]: FOLLOWER: Found duplicate live segment. Skip push! (${liveBw})`);
         } else {
@@ -601,7 +618,7 @@ class SessionLive {
     // ---------------------------------
     let FETCH_ATTEMPTS = 10;
     this.liveSegsForFollowers = {};
-
+    let bandwidthsToSkipOnRetry = [];
     while (FETCH_ATTEMPTS > 0) {
       if (isLeader) {
         debug(`[${this.sessionId}]: LEADER: Trying to fetch manifests for all bandwidths\n Attempts left=[${FETCH_ATTEMPTS}]`);
@@ -619,9 +636,15 @@ class SessionLive {
       let manifestList = [];
       this.pushAmount = 0;
       try {
+        if (bandwidthsToSkipOnRetry.length > 0) {
+          debug(`[${this.sessionId}]: (X) Skipping loadMedia promises for bws ${JSON.stringify(bandwidthsToSkipOnRetry)}`);
+        }
         // Collect Live Source Requesting Promises
         for (let i = 0; i < Object.keys(this.mediaManifestURIs).length; i++) {
           let bw = Object.keys(this.mediaManifestURIs)[i];
+          if (bandwidthsToSkipOnRetry.includes(bw)) {
+            continue;
+          }
           livePromises.push(this._loadMediaManifest(bw));
           debug(`[${this.sessionId}]: Pushed loadMedia promise for bw=[${bw}]`);
         }
@@ -638,20 +661,32 @@ class SessionLive {
       if (manifestList.some((result) => result.status === "rejected")) {
         FETCH_ATTEMPTS--;
         debug(`[${this.sessionId}]: ALERT! Promises I: Failed, Rejection Found! Trying again in 1000ms...`);
-        await timer(1000)
+        await timer(1000);
         continue;
       }
 
-      const allMediaSeqCounts = manifestList.map((item) => {
-        if (item.status === "rejected") {
-          return item.reason.mediaSeq;
+      // Store the results locally
+      manifestList.forEach((variantItem) => {
+        const bw = variantItem.value.bandwidth;
+        if (!this.liveSourceM3Us[bw]) {
+          this.liveSourceM3Us[bw] = {};
         }
-        return item.value.mediaSeq;
+        this.liveSourceM3Us[bw] = variantItem.value;
       });
 
+      const allStoredMediaSeqCounts = Object.keys(this.liveSourceM3Us).map((variant) => this.liveSourceM3Us[variant].mediaSeq);
+
       // Handle if mediaSeqCounts are NOT synced up!
-      if (!allMediaSeqCounts.every((val, i, arr) => val === arr[0])) {
-        debug(`[${this.sessionId}]: Live Mseq counts=[${allMediaSeqCounts}]`);
+      if (!allStoredMediaSeqCounts.every((val, i, arr) => val === arr[0])) {
+        debug(`[${this.sessionId}]: Live Mseq counts=[${allStoredMediaSeqCounts}]`);
+        // Figure out what bw's are behind.
+        const higestMediaSeqCount = Math.max(...allStoredMediaSeqCounts);
+        bandwidthsToSkipOnRetry = Object.keys(this.liveSourceM3Us).filter((bw) => {
+          if (this.liveSourceM3Us[bw].mediaSeq === higestMediaSeqCount) {
+            return true;
+          }
+          return false;
+        });
         // Decrement fetch counter
         FETCH_ATTEMPTS--;
         // Calculate retry delay time. Default=1000
@@ -672,13 +707,13 @@ class SessionLive {
         continue;
       }
 
-      currentMseqRaw = allMediaSeqCounts[0];
+      currentMseqRaw = allStoredMediaSeqCounts[0];
 
       if (!isLeader) {
         let leadersFirstSeqCounts = await this.sessionLiveState.get("firstCounts");
         let tries = 20;
 
-        while (!isLeader && (!leadersFirstSeqCounts.liveSourceMseqCount && tries > 0) || leadersFirstSeqCounts.liveSourceMseqCount === 0) {
+        while ((!isLeader && !leadersFirstSeqCounts.liveSourceMseqCount && tries > 0) || leadersFirstSeqCounts.liveSourceMseqCount === 0) {
           debug(`[${this.sessionId}]: NEW FOLLOWER: Waiting for LEADER to add 'firstCounts' in store! Will look again after 1000ms (tries left=${tries})`);
           await timer(1000);
           leadersFirstSeqCounts = await this.sessionLiveState.get("firstCounts");
@@ -719,8 +754,9 @@ class SessionLive {
         }
         if (leadersFirstSeqCounts.mediaSeqCount !== this.mediaSeqCount) {
           this.mediaSeqCount = leadersFirstSeqCounts.mediaSeqCount;
-          debug(`[${this.sessionId}]: FOLLOWER transistioned with wrong V2L segments, updating counts to [${
-            this.mediaSeqCount}][${this.discSeqCount}], and reading 'transitSegs' from store`);
+          debug(
+            `[${this.sessionId}]: FOLLOWER transistioned with wrong V2L segments, updating counts to [${this.mediaSeqCount}][${this.discSeqCount}], and reading 'transitSegs' from store`
+          );
           const transitSegs = await this.sessionLiveState.get("transitSegs");
           if (!this._isEmpty(transitSegs)) {
             this.vodSegments = transitSegs;
@@ -732,7 +768,6 @@ class SessionLive {
         if (currentMseqRaw === leadersFirstSeqCounts.liveSourceMseqCount) {
           this.pushAmount = 1; // Follower from start
         } else {
-
           // TODO: To support and account for past discontinuity tags in the Live Source stream,
           // we will need to get the real 'current' discontinuity-sequence count from Leader somehow.
 
@@ -1029,8 +1064,8 @@ class SessionLive {
           const resolveObj = {
             M3U: m3u,
             mediaSeq: m3u.get("mediaSequence"),
+            bandwidth: liveTargetBandwidth,
           };
-          this.liveSourceM3Us[liveTargetBandwidth] = resolveObj;
           resolve(resolveObj);
         } catch (exc) {
           debug(`[${this.sessionId}]: Error when parsing latest manifest`);
@@ -1070,7 +1105,7 @@ class SessionLive {
         if (startIdx < 0) {
           this.restAmount = startIdx * -1;
           startIdx = 0;
-        } 
+        }
         if (mediaManifestUri) {
           // push segments
           this._addLiveSegmentsToQueue(startIdx, m3u.items.PlaylistItem, baseUrl, liveTargetBandwidth, isLeader);
@@ -1092,7 +1127,7 @@ class SessionLive {
    * @param {string} liveTargetBandwidth
    */
   _addLiveSegmentsToQueue(startIdx, playlistItems, baseUrl, liveTargetBandwidth, isLeader) {
-    const leaderOrFollower = isLeader ? "LEADER": "NEW FOLLOWER";
+    const leaderOrFollower = isLeader ? "LEADER" : "NEW FOLLOWER";
 
     for (let i = startIdx; i < playlistItems.length; i++) {
       let seg = {};
@@ -1162,7 +1197,7 @@ class SessionLive {
           seg["daterange"] = daterangeData;
         }
         // Push new Live Segments! But do not push duplicates
-        const liveSegURIs = this.liveSegQueue[liveTargetBandwidth].filter(seg => seg.uri).map(seg => seg.uri);
+        const liveSegURIs = this.liveSegQueue[liveTargetBandwidth].filter((seg) => seg.uri).map((seg) => seg.uri);
         if (seg.uri && liveSegURIs.includes(seg.uri)) {
           debug(`[${this.sessionId}]: ${leaderOrFollower}: Found duplicate live segment. Skip push! (${liveTargetBandwidth})`);
         } else {
@@ -1372,12 +1407,12 @@ class SessionLive {
     if (this._isEmpty(this.liveSegQueue)) {
       return null;
     }
-  
-    const bw0 = Object.keys(this.liveSegQueue)[0]; 
+
+    const bw0 = Object.keys(this.liveSegQueue)[0];
     if (this.liveSegQueue[bw0].length === 0) {
       return null;
     }
-    
+
     for (let i = 0; i < this.liveSegQueue[bw0].length; i++) {
       const segment = this.liveSegQueue[bw0][i];
       if (!segment.duration) {

package/engine/stream_switcher.js

@@ -482,7 +482,7 @@ class StreamSwitcher {
           if (mediaUri.match("^http")) {
             mediaURIs[bw] = mediaUri;
           } else {
-            mediaURIs[bw] = new URL(mediaUri, uri);
+            mediaURIs[bw] = new URL(mediaUri, uri).href;
           }
         }
 
@@ -575,7 +575,7 @@ class StreamSwitcher {
             if (playlistItem.properties.uri.match("^http")) {
               segmentUri = playlistItem.properties.uri;
             } else {
-              segmentUri = new URL(playlistItem.properties.uri, mediaURIs[bw]);
+              segmentUri = new URL(playlistItem.properties.uri, mediaURIs[bw]).href;
             }
             seg["duration"] = playlistItem.properties.duration;
             seg["uri"] = segmentUri;
@@ -626,7 +626,7 @@ class StreamSwitcher {
       } else {
         const lastSeg = toSegments[bw][toSegments[bw].length - 1];
         if (lastSeg.uri && !lastSeg.discontinuity) {
-          toSegments[bw].push({ discontinuity: true });
+          toSegments[bw].push({ discontinuity: true, cue: { in: true } });
           OUTPUT_SEGMENTS[bw] = toSegments[bw].concat(fromSegments[targetBw]);
         } else {
           OUTPUT_SEGMENTS[bw] = toSegments[bw].concat(fromSegments[targetBw]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "3.3.1",
+  "version": "3.3.4",
   "description": "OTT TV Channel Engine",
   "main": "index.js",
   "scripts": {
@@ -22,7 +22,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.1.1",
     "@eyevinn/hls-truncate": "^0.1.0",
-    "@eyevinn/hls-vodtolive": "^2.0.1",
+    "@eyevinn/hls-vodtolive": "^2.0.2",
     "@eyevinn/m3u8": "^0.4.1",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",

package/spec/engine/init_switching_spec.js

@@ -413,14 +413,12 @@ describe("The initialize switching", () => {
       uri: "http://mock.mock.com/180000/seg12.ts",
     });
     expect(sessionCurrentSegs["1313000"][size - 1 - 2]).toEqual({
-      duration: 7.5,
-      timelinePosition: null,
-      uri: 'https://maitv-vod.lab.eyevinn.technology/tearsofsteel_4k.mov/600/600-00008.ts',
-      cue: null
+      discontinuity: true,
+      cue: { in: true }
     });
     expect(sessionCurrentSegs["1313000"][size - 1]).toEqual({
-      duration: 7.5,
-      uri: "https://maitv-vod.lab.eyevinn.technology/tearsofsteel_4k.mov/600/600-00010.ts",
+      duration: 11.25,
+      uri: "https://maitv-vod.lab.eyevinn.technology/tearsofsteel_4k.mov/600/600-00015.ts",
       timelinePosition: null,
       cue: null,
     });