eyevinn-channel-engine 4.0.7 → 4.0.9

package/dist/engine/redis_state_store.d.ts

@@ -2,6 +2,7 @@ export = RedisStateStore;
 declare class RedisStateStore {
     constructor(keyPrefix: any, opts: any);
     keyPrefix: any;
+    volatileKeyTTL: any;
     client: any;
     initAsync(id: any, initData: any): Promise<{}>;
     resetAsync(id: any, initData: any): Promise<void>;

package/dist/engine/redis_state_store.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var redis = require("redis");
 var debug = require("debug")("redis-state-store");
-var VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
+var DEFAULT_VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
 var RedisStateStore = /** @class */ (function () {
     function RedisStateStore(keyPrefix, opts) {
         this.keyPrefix = keyPrefix;
@@ -45,6 +45,11 @@ var RedisStateStore = /** @class */ (function () {
             this.keyPrefix = prependPrefix + this.keyPrefix;
             debug("Prepending keyprefix with ".concat(prependPrefix, " => ").concat(this.keyPrefix));
         }
+        this.volatileKeyTTL = DEFAULT_VOLATILE_KEY_TTL;
+        if (opts.volatileKeyTTL) {
+            debug("Overriding default, volatileKeyTTL=".concat(opts.volatileKeyTTL, "s"));
+            this.volatileKeyTTL = opts.volatileKeyTTL;
+        }
         this.client = redis.createClient(opts.redisUrl);
     }
     RedisStateStore.prototype.initAsync = function (id, initData) {
@@ -187,9 +192,9 @@ var RedisStateStore = /** @class */ (function () {
                         data = _a.sent();
                         storeKey = "" + this.keyPrefix + id + key;
                         expireAsync = new Promise(function (resolve, reject) {
-                            _this.client.expire(storeKey, VOLATILE_KEY_TTL, function (err, res) {
+                            _this.client.expire(storeKey, _this.volatileKeyTTL, function (err, res) {
                                 if (!err) {
-                                    debug("REDIS expire ".concat(storeKey, " ").concat(VOLATILE_KEY_TTL, "s: ").concat(res === 1 ? "OK" : "KEY DOES NOT EXIST"));
+                                    debug("REDIS expire ".concat(storeKey, " ").concat(_this.volatileKeyTTL, "s: ").concat(res === 1 ? "OK" : "KEY DOES NOT EXIST"));
                                     resolve();
                                 }
                                 else {

package/dist/engine/server.d.ts

@@ -22,6 +22,7 @@ export interface ChannelEngineOpts {
     adCopyMgrUri?: string;
     adXchangeUri?: string;
     noSessionDataTags?: boolean;
+    volatileKeyTTL?: number;
 }
 export interface VodRequest {
     sessionId: string;
@@ -58,6 +59,7 @@ export interface ChannelProfile {
     bw: number;
     codecs: string;
     resolution: number[];
+    channels?: string;
 }
 export interface Channel {
     id: string;
@@ -75,8 +77,6 @@ export interface ClosedCaptions {
 export interface AudioTracks {
     language: string;
     name: string;
-    channels?: number;
-    codecs?: string;
     default?: boolean;
 }
 export interface IChannelManager {

package/dist/engine/server.js

@@ -101,11 +101,13 @@ var ChannelEngine = /** @class */ (function () {
                 redisUrl: options.redisUrl,
                 memcachedUrl: options.memcachedUrl,
                 cacheTTL: options.sharedStoreCacheTTL,
+                volatileKeyTTL: options.volatileKeyTTL,
             }),
             playheadStateStore: new PlayheadStateStore({
                 redisUrl: options.redisUrl,
                 memcachedUrl: options.memcachedUrl,
                 cacheTTL: options.sharedStoreCacheTTL,
+                volatileKeyTTL: options.volatileKeyTTL,
             }),
             instanceId: this.instanceId,
         };
@@ -114,6 +116,7 @@ var ChannelEngine = /** @class */ (function () {
                 redisUrl: options.redisUrl,
                 memcachedUrl: options.memcachedUrl,
                 cacheTTL: options.sharedStoreCacheTTL,
+                volatileKeyTTL: options.volatileKeyTTL,
             }),
             instanceId: this.instanceId,
         };

package/dist/engine/session.js

@@ -43,7 +43,7 @@ var HLSTruncateVod = require('@eyevinn/hls-truncate');
 var Readable = require('stream').Readable;
 var SessionState = require('./session_state.js').SessionState;
 var PlayheadState = require('./playhead_state.js').PlayheadState;
-var _a = require('./util.js'), applyFilter = _a.applyFilter, cloudWatchLog = _a.cloudWatchLog, m3u8Header = _a.m3u8Header, logerror = _a.logerror;
+var _a = require('./util.js'), applyFilter = _a.applyFilter, cloudWatchLog = _a.cloudWatchLog, m3u8Header = _a.m3u8Header, logerror = _a.logerror, codecsFromString = _a.codecsFromString;
 var ChaosMonkey = require('./chaos_monkey.js');
 var AVERAGE_SEGMENT_DURATION = 3000;
 var DEFAULT_PLAYHEAD_DIFF_THRESHOLD = 1000;
@@ -923,7 +923,7 @@ var Session = /** @class */ (function () {
                             debug("[".concat(this._sessionId, "]: {").concat(mediaSequenceValue, "}_{").concat(currentVod.getLastSequenceMediaSequenceValueAudio(), "} AUDIO"));
                             manifestMseq = playheadState.mediaSeqAudio + mediaSequenceValue;
                         }
-                        debug("[".concat(this._sessionId, "]: [").concat(playheadState.vodMediaSeqAudio, "]_[").concat(currentVod.getLiveMediaSequencesCount("audio"), "] AUDIO"));
+                        debug("[".concat(this._sessionId, "]: [").concat(playheadState.vodMediaSeqAudio, "]_[").concat(currentVod.getLiveMediaSequencesCount("audio"), "] AUDIO (").concat(audioGroupId, ")"));
                         m3u8_2 = currentVod.getLiveMediaAudioSequences(playheadState.mediaSeqAudio, audioGroupId, audioLanguage, playheadState.vodMediaSeqAudio, sessionState.discSeqAudio, this.targetDurationPadding, this.forceTargetDuration);
                         // # Case: current VOD does not have the selected track.
                         if (!m3u8_2) {
@@ -1031,6 +1031,7 @@ var Session = /** @class */ (function () {
                         index = 0;
                         audioSeqLastIdx = currentVod_1.getLiveMediaSequencesCount("audio") - 1;
                         thresh = 0.5;
+                        debug("[".concat(this._sessionId, "]: About to determine audio increment"));
                         _o.label = 19;
                     case 19: return [4 /*yield*/, this._getAudioPlayheadPosition(sessionState_1.vodMediaSeqAudio + index)];
                     case 20:
@@ -1058,6 +1059,7 @@ var Session = /** @class */ (function () {
                         audioIncrement = index;
                         _o.label = 23;
                     case 23:
+                        debug("[".concat(this._sessionId, "]: Will increment audio with ").concat(audioIncrement));
                         _d = sessionState;
                         return [4 /*yield*/, this._sessionState.increment("vodMediaSeqAudio", audioIncrement)];
                     case 24:
@@ -1346,10 +1348,10 @@ 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, channels, sessionProfile;
+            var m3u8, currentVod, audioGroupIds, defaultAudioGroupId, hasClosedCaptions, i, audioGroupId, j, audioTrack, _a, _, channels, sessionProfile;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         m3u8 = "#EXTM3U\n";
                         m3u8 += "#EXT-X-VERSION:4\n";
@@ -1360,7 +1362,7 @@ var Session = /** @class */ (function () {
                         }
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
                     case 1:
-                        currentVod = _a.sent();
+                        currentVod = _b.sent();
                         if (!currentVod) {
                             throw new Error('Session not ready');
                         }
@@ -1378,14 +1380,16 @@ 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;
+                                        _a = currentVod.getAudioCodecsAndChannelsForGroupId(audioGroupId), _ = _a[0], channels = _a[1];
                                         // 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=\"").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=\"").concat(channels, "\",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=".concat(audioTrack.default ? 'YES' : 'NO') +
+                                            ",CHANNELS=\"".concat(channels ? channels : 2, "\"") +
+                                            ",URI=\"master-".concat(audioGroupId, "_").concat(audioTrack.language, ".m3u8;session=").concat(this._sessionId, "\"") +
+                                            "\n";
                                     }
                                 }
                                 // As of now, by default set StreamItem's AUDIO attribute to <first audio group-id>
@@ -1395,13 +1399,41 @@ var Session = /** @class */ (function () {
                         if (this._sessionProfile) {
                             sessionProfile = filter ? applyFilter(this._sessionProfile, filter) : this._sessionProfile;
                             sessionProfile.forEach(function (profile) {
-                                m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw + ',RESOLUTION=' + profile.resolution[0] + 'x' + profile.resolution[1] + ',CODECS="' + profile.codecs + '"' + (defaultAudioGroupId ? ",AUDIO=\"".concat(defaultAudioGroupId, "\"") : '') + (hasClosedCaptions ? ',CLOSED-CAPTIONS="cc"' : '') + '\n';
-                                m3u8 += "master" + profile.bw + ".m3u8;session=" + _this._sessionId + "\n";
+                                if (_this.use_demuxed_audio) {
+                                    // find matching audio group based on codec in stream
+                                    var audioGroupIdToUse = void 0;
+                                    var _a = codecsFromString(profile.codecs), _ = _a[0], audioCodec = _a[1];
+                                    if (audioCodec) {
+                                        var profileChannels = profile.channels ? profile.channels : "2";
+                                        audioGroupIdToUse = currentVod.getAudioGroupIdForCodecs(audioCodec, profileChannels);
+                                    }
+                                    // skip stream if no corresponding audio group can be found
+                                    if (audioGroupIdToUse) {
+                                        m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw +
+                                            ',RESOLUTION=' + profile.resolution[0] + 'x' + profile.resolution[1] +
+                                            ',CODECS="' + profile.codecs + '"' +
+                                            ",AUDIO=\"".concat(audioGroupIdToUse, "\"") +
+                                            (hasClosedCaptions ? ',CLOSED-CAPTIONS="cc"' : '') + '\n';
+                                        m3u8 += "master" + profile.bw + ".m3u8;session=" + _this._sessionId + "\n";
+                                    }
+                                }
+                                else {
+                                    m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw +
+                                        ',RESOLUTION=' + profile.resolution[0] + 'x' + profile.resolution[1] +
+                                        ',CODECS="' + profile.codecs + '"' +
+                                        (defaultAudioGroupId ? ",AUDIO=\"".concat(defaultAudioGroupId, "\"") : '') +
+                                        (hasClosedCaptions ? ',CLOSED-CAPTIONS="cc"' : '') + '\n';
+                                    m3u8 += "master" + profile.bw + ".m3u8;session=" + _this._sessionId + "\n";
+                                }
                             });
                         }
                         else {
                             currentVod.getUsageProfiles().forEach(function (profile) {
-                                m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw + ',RESOLUTION=' + profile.resolution + ',CODECS="' + profile.codecs + '"' + (defaultAudioGroupId ? ",AUDIO=\"".concat(defaultAudioGroupId, "\"") : '') + (hasClosedCaptions ? ',CLOSED-CAPTIONS="cc"' : '') + '\n';
+                                m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw +
+                                    ',RESOLUTION=' + profile.resolution +
+                                    ',CODECS="' + profile.codecs + '"' +
+                                    (defaultAudioGroupId ? ",AUDIO=\"".concat(defaultAudioGroupId, "\"") : '') +
+                                    (hasClosedCaptions ? ',CLOSED-CAPTIONS="cc"' : '') + '\n';
                                 m3u8 += "master" + profile.bw + ".m3u8;session=" + _this._sessionId + "\n";
                             });
                         }
@@ -1606,7 +1638,8 @@ var Session = /** @class */ (function () {
                         cloudWatchLog(!this.cloudWatchLogging, 'engine-session', { event: 'loadVod', channel: this._sessionId, loadTimeMs: Date.now() - loadStart });
                         debug("[".concat(this._sessionId, "]: first VOD loaded"));
                         debug("[".concat(this._sessionId, "]: ").concat(currentVod.getDeltaTimes()));
-                        debug("[".concat(this._sessionId, "]: ").concat(currentVod.getPlayheadPositions()));
+                        debug("[".concat(this._sessionId, "]: playhead positions [V]=").concat(currentVod.getPlayheadPositions("video")));
+                        debug("[".concat(this._sessionId, "]: playhead positions [A]=").concat(currentVod.getPlayheadPositions("audio")));
                         //debug(newVod);
                         _c = sessionState;
                         return [4 /*yield*/, this._sessionState.set("mediaSeq", 0)];
@@ -1828,7 +1861,8 @@ var Session = /** @class */ (function () {
                         cloudWatchLog(!this.cloudWatchLogging, 'engine-session', { event: 'loadVod', channel: this._sessionId, loadTimeMs: Date.now() - loadStart });
                         this.leaderIsSettingNextVod = true;
                         debug("[".concat(this._sessionId, "]: next VOD loaded (").concat(newVod.getDeltaTimes(), ")"));
-                        debug("[".concat(this._sessionId, "]: ").concat(newVod.getPlayheadPositions()));
+                        debug("[".concat(this._sessionId, "]: playhead positions [V]=").concat(newVod.getPlayheadPositions("video")));
+                        debug("[".concat(this._sessionId, "]: playhead positions [A]=").concat(newVod.getPlayheadPositions("audio")));
                         currentVod = newVod;
                         debug("[".concat(this._sessionId, "]: msequences=").concat(currentVod.getLiveMediaSequencesCount(), "; audio msequences=").concat(currentVod.getLiveMediaSequencesCount("audio")));
                         _r = sessionState;

package/dist/engine/util.d.ts

@@ -17,3 +17,4 @@ export class WaitTimeGenerator {
 export function findNearestValue(val: any, array: any): any;
 export function isValidUrl(url: any): boolean;
 export function fetchWithRetry(uri: any, opts: any, maxRetries: any, retryDelayMs: any, timeoutMs: any, debug: any): Promise<any>;
+export function codecsFromString(codecs: any): any[];

package/dist/engine/util.js

@@ -266,6 +266,15 @@ var fetchWithRetry = function (uri, opts, maxRetries, retryDelayMs, timeoutMs, d
         }
     });
 }); };
+var codecsFromString = function (codecs) {
+    var audioCodecs = codecs.split(",").find(function (c) {
+        return c.match(/^mp4a/) || c.match(/^ac-3/) || c.match(/^ec-3/);
+    });
+    var videoCodecs = codecs.split(",").find(function (c) {
+        return c.match(/^avc/) || c.match(/^hevc/) || c.match(/^dvh/);
+    });
+    return [videoCodecs, audioCodecs];
+};
 module.exports = {
     filterQueryParser: filterQueryParser,
     applyFilter: applyFilter,
@@ -277,5 +286,6 @@ module.exports = {
     WaitTimeGenerator: WaitTimeGenerator,
     findNearestValue: findNearestValue,
     isValidUrl: isValidUrl,
-    fetchWithRetry: fetchWithRetry
+    fetchWithRetry: fetchWithRetry,
+    codecsFromString: codecsFromString
 };

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.0.7",
+  "version": "4.0.9",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.0",
     "@eyevinn/hls-truncate": "^0.2.0",
-    "@eyevinn/hls-vodtolive": "^2.2.1",
+    "@eyevinn/hls-vodtolive": "^2.3.3",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",

package/dist/server-demux.js

@@ -81,8 +81,8 @@ var RefChannelManager = /** @class */ (function () {
     };
     RefChannelManager.prototype._getAudioTracks = function () {
         return [
-            { language: "en", name: "English" },
-            { language: "sp", name: "Spanish" }
+            { language: "en", name: "English", default: true },
+            { language: "sp", name: "Spanish", default: false }
         ];
     };
     return RefChannelManager;

package/dist/server-multicodec.js

@@ -65,18 +65,18 @@ var RefChannelManager = /** @class */ (function () {
     };
     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" },
+            { resolution: [640, 360], bw: 3663471, codecs: "avc1.64001F,mp4a.40.2", channels: "2" },
+            { resolution: [1280, 720], bw: 5841380, codecs: "avc1.64001F,mp4a.40.2", channels: "2" },
+            { resolution: [1920, 1080], bw: 8973571, codecs: "avc1.64001F,mp4a.40.2", channels: "2" },
+            { resolution: [640, 360], bw: 4301519, codecs: "avc1.64001F,ec-3", channels: "16/JOC" },
+            { resolution: [1280, 720], bw: 6479428, codecs: "avc1.64001F,ec-3", channels: "16/JOC" },
+            { resolution: [1920, 1080], bw: 9611619, codecs: "avc1.640032,ec-3", channels: "16/JOC" },
         ];
     };
     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 }
+            { language: "ja", "name": "日本語", default: true },
+            { language: "en", "name": "English", default: false }
         ];
     };
     return RefChannelManager;

package/engine/redis_state_store.js

@@ -1,7 +1,7 @@
 const redis = require("redis");
 const debug = require("debug")("redis-state-store");
 
-const VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
+const DEFAULT_VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
 
 class RedisStateStore {
   constructor(keyPrefix, opts) {
@@ -11,6 +11,11 @@ class RedisStateStore {
       this.keyPrefix = prependPrefix + this.keyPrefix;
       debug(`Prepending keyprefix with ${prependPrefix} => ${this.keyPrefix}`);
     }
+    this.volatileKeyTTL = DEFAULT_VOLATILE_KEY_TTL;
+    if (opts.volatileKeyTTL) {
+      debug(`Overriding default, volatileKeyTTL=${opts.volatileKeyTTL}s`);
+      this.volatileKeyTTL = opts.volatileKeyTTL;  
+    }
     this.client = redis.createClient(opts.redisUrl);
   }
 
@@ -82,9 +87,9 @@ class RedisStateStore {
     const data = await this.setAsync(id, key, value);
     const storeKey = "" + this.keyPrefix + id + key;
     const expireAsync = new Promise((resolve, reject) => {
-      this.client.expire(storeKey, VOLATILE_KEY_TTL, (err, res) => {
+      this.client.expire(storeKey, this.volatileKeyTTL, (err, res) => {
         if (!err) {
-          debug(`REDIS expire ${storeKey} ${VOLATILE_KEY_TTL}s: ${res === 1 ? "OK" : "KEY DOES NOT EXIST"}`);
+          debug(`REDIS expire ${storeKey} ${this.volatileKeyTTL}s: ${res === 1 ? "OK" : "KEY DOES NOT EXIST"}`);
           resolve();
         } else {
           reject(err);

package/engine/server.ts

@@ -47,6 +47,7 @@ export interface ChannelEngineOpts {
   adCopyMgrUri?: string; // deprecated
   adXchangeUri?: string; // deprecated
   noSessionDataTags?: boolean;
+  volatileKeyTTL?: number;
 }
 
 interface StreamerOpts {
@@ -99,6 +100,7 @@ export interface ChannelProfile {
   bw: number;
   codecs: string;
   resolution: number[];
+  channels?: string;
 }
 
 export interface Channel {
@@ -119,8 +121,6 @@ export interface ClosedCaptions {
 export interface AudioTracks {
   language: string;
   name: string;
-  channels?: number;
-  codecs?: string;
   default?: boolean;
 }
 
@@ -207,11 +207,13 @@ export class ChannelEngine {
         redisUrl: options.redisUrl, 
         memcachedUrl: options.memcachedUrl, 
         cacheTTL: options.sharedStoreCacheTTL,
+        volatileKeyTTL: options.volatileKeyTTL,
       }),
       playheadStateStore: new PlayheadStateStore({ 
         redisUrl: options.redisUrl, 
         memcachedUrl: options.memcachedUrl, 
         cacheTTL: options.sharedStoreCacheTTL,
+        volatileKeyTTL: options.volatileKeyTTL,
       }),
       instanceId: this.instanceId,
     };
@@ -221,6 +223,7 @@ export class ChannelEngine {
         redisUrl: options.redisUrl, 
         memcachedUrl: options.memcachedUrl, 
         cacheTTL: options.sharedStoreCacheTTL,
+        volatileKeyTTL: options.volatileKeyTTL,
       }),
       instanceId: this.instanceId,
     };

package/engine/session.js

@@ -9,7 +9,7 @@ const Readable = require('stream').Readable;
 const { SessionState } = require('./session_state.js');
 const { PlayheadState } = require('./playhead_state.js');
 
-const { applyFilter, cloudWatchLog, m3u8Header, logerror } = require('./util.js');
+const { applyFilter, cloudWatchLog, m3u8Header, logerror, codecsFromString } = require('./util.js');
 const ChaosMonkey = require('./chaos_monkey.js');
 
 const AVERAGE_SEGMENT_DURATION = 3000;
@@ -655,7 +655,7 @@ class Session {
           debug(`[${this._sessionId}]: {${mediaSequenceValue}}_{${currentVod.getLastSequenceMediaSequenceValueAudio()}} AUDIO`);
           manifestMseq = playheadState.mediaSeqAudio + mediaSequenceValue;
         }
-        debug(`[${this._sessionId}]: [${playheadState.vodMediaSeqAudio}]_[${currentVod.getLiveMediaSequencesCount("audio")}] AUDIO`);
+        debug(`[${this._sessionId}]: [${playheadState.vodMediaSeqAudio}]_[${currentVod.getLiveMediaSequencesCount("audio")}] AUDIO (${audioGroupId})`);
         const m3u8 = currentVod.getLiveMediaAudioSequences(
           playheadState.mediaSeqAudio,
           audioGroupId,
@@ -733,6 +733,7 @@ class Session {
         let index = 0;
         const audioSeqLastIdx = currentVod.getLiveMediaSequencesCount("audio") - 1;
         const thresh = 0.5;
+        debug(`[${this._sessionId}]: About to determine audio increment`);
         do {
           const audioPosition = (await this._getAudioPlayheadPosition(sessionState.vodMediaSeqAudio + index)) * 1000;
           posDiff = position - audioPosition;
@@ -752,6 +753,7 @@ class Session {
         } while (!(-thresh < posDiff && posDiff < thresh));
         audioIncrement = index;
       }
+      debug(`[${this._sessionId}]: Will increment audio with ${audioIncrement}`);
       sessionState.vodMediaSeqAudio = await this._sessionState.increment("vodMediaSeqAudio", audioIncrement);
     }
 
@@ -959,13 +961,16 @@ 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;
+            const [_, channels] = currentVod.getAudioCodecsAndChannelsForGroupId(audioGroupId);
             // 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="${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="${channels}",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=${audioTrack.default ? 'YES' : 'NO'}` +
+              `,CHANNELS="${channels ? channels : 2}"` +
+              `,URI="master-${audioGroupId}_${audioTrack.language}.m3u8;session=${this._sessionId}"` +
+              "\n";
           }
         }
         // As of now, by default set StreamItem's AUDIO attribute to <first audio group-id>
@@ -975,12 +980,40 @@ class Session {
     if (this._sessionProfile) {
       const sessionProfile = filter ? applyFilter(this._sessionProfile, filter) : this._sessionProfile;
       sessionProfile.forEach(profile => {
-        m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw + ',RESOLUTION=' + profile.resolution[0] + 'x' + profile.resolution[1] + ',CODECS="' + profile.codecs + '"' + (defaultAudioGroupId ? `,AUDIO="${defaultAudioGroupId}"` : '') + (hasClosedCaptions ? ',CLOSED-CAPTIONS="cc"' : '') + '\n';
-        m3u8 += "master" + profile.bw + ".m3u8;session=" + this._sessionId + "\n";
+        if (this.use_demuxed_audio) {
+          // find matching audio group based on codec in stream
+          let audioGroupIdToUse;
+          const [_, audioCodec] = codecsFromString(profile.codecs);        
+          if (audioCodec) {
+            const profileChannels = profile.channels ? profile.channels : "2";
+            audioGroupIdToUse = currentVod.getAudioGroupIdForCodecs(audioCodec, profileChannels);
+          }
+
+          // skip stream if no corresponding audio group can be found
+          if (audioGroupIdToUse) {
+            m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw + 
+              ',RESOLUTION=' + profile.resolution[0] + 'x' + profile.resolution[1] + 
+              ',CODECS="' + profile.codecs + '"' + 
+              `,AUDIO="${audioGroupIdToUse}"` + 
+              (hasClosedCaptions ? ',CLOSED-CAPTIONS="cc"' : '') + '\n';
+            m3u8 += "master" + profile.bw + ".m3u8;session=" + this._sessionId + "\n";
+          }
+        } else {
+          m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw + 
+            ',RESOLUTION=' + profile.resolution[0] + 'x' + profile.resolution[1] + 
+            ',CODECS="' + profile.codecs + '"' + 
+            (defaultAudioGroupId ? `,AUDIO="${defaultAudioGroupId}"` : '') + 
+            (hasClosedCaptions ? ',CLOSED-CAPTIONS="cc"' : '') + '\n';
+          m3u8 += "master" + profile.bw + ".m3u8;session=" + this._sessionId + "\n";
+        }
       });
     } else {
       currentVod.getUsageProfiles().forEach(profile => {
-        m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw + ',RESOLUTION=' + profile.resolution + ',CODECS="' + profile.codecs + '"' + (defaultAudioGroupId ? `,AUDIO="${defaultAudioGroupId}"` : '') + (hasClosedCaptions ? ',CLOSED-CAPTIONS="cc"' : '') + '\n';
+        m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw + 
+          ',RESOLUTION=' + profile.resolution + 
+          ',CODECS="' + profile.codecs + '"' + 
+          (defaultAudioGroupId ? `,AUDIO="${defaultAudioGroupId}"` : '') + 
+          (hasClosedCaptions ? ',CLOSED-CAPTIONS="cc"' : '') + '\n';
         m3u8 += "master" + profile.bw + ".m3u8;session=" + this._sessionId + "\n";
       });
     }
@@ -1129,7 +1162,8 @@ class Session {
               { event: 'loadVod', channel: this._sessionId, loadTimeMs: Date.now() - loadStart });
             debug(`[${this._sessionId}]: first VOD loaded`);
             debug(`[${this._sessionId}]: ${currentVod.getDeltaTimes()}`);
-            debug(`[${this._sessionId}]: ${currentVod.getPlayheadPositions()}`);
+            debug(`[${this._sessionId}]: playhead positions [V]=${currentVod.getPlayheadPositions("video")}`);
+            debug(`[${this._sessionId}]: playhead positions [A]=${currentVod.getPlayheadPositions("audio")}`);
             //debug(newVod);
             sessionState.mediaSeq = await this._sessionState.set("mediaSeq", 0);
             sessionState.mediaSeqAudio = await this._sessionState.set("mediaSeqAudio", 0);
@@ -1292,7 +1326,8 @@ class Session {
               { event: 'loadVod', channel: this._sessionId, loadTimeMs: Date.now() - loadStart });
             this.leaderIsSettingNextVod = true;
             debug(`[${this._sessionId}]: next VOD loaded (${newVod.getDeltaTimes()})`);
-            debug(`[${this._sessionId}]: ${newVod.getPlayheadPositions()}`);
+            debug(`[${this._sessionId}]: playhead positions [V]=${newVod.getPlayheadPositions("video")}`);
+            debug(`[${this._sessionId}]: playhead positions [A]=${newVod.getPlayheadPositions("audio")}`);
             currentVod = newVod;
             debug(`[${this._sessionId}]: msequences=${currentVod.getLiveMediaSequencesCount()}; audio msequences=${currentVod.getLiveMediaSequencesCount("audio")}`);
             sessionState.vodMediaSeqVideo = await this._sessionState.set("vodMediaSeqVideo", 0);

package/engine/util.js

@@ -214,6 +214,16 @@ const fetchWithRetry = async (uri, opts, maxRetries, retryDelayMs, timeoutMs, de
   }
 };
 
+const codecsFromString = (codecs) => {
+  const audioCodecs = codecs.split(",").find(c => {
+    return c.match(/^mp4a/) || c.match(/^ac-3/) || c.match(/^ec-3/);
+  });
+  const videoCodecs = codecs.split(",").find(c => {
+    return c.match(/^avc/) || c.match(/^hevc/) || c.match(/^dvh/);
+  });
+  return [videoCodecs, audioCodecs];
+};
+
 module.exports = {
   filterQueryParser,
   applyFilter,
@@ -225,5 +235,6 @@ module.exports = {
   WaitTimeGenerator,
   findNearestValue,
   isValidUrl,
-  fetchWithRetry
+  fetchWithRetry,
+  codecsFromString
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.0.7",
+  "version": "4.0.9",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.0",
     "@eyevinn/hls-truncate": "^0.2.0",
-    "@eyevinn/hls-vodtolive": "^2.2.1",
+    "@eyevinn/hls-vodtolive": "^2.3.3",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",

package/server-demux.ts

@@ -91,8 +91,8 @@ class RefChannelManager implements IChannelManager {
   }
   _getAudioTracks(): AudioTracks[] {
     return [
-      { language: "en", name: "English" },
-      { language: "sp", name: "Spanish" }
+      { language: "en", name: "English", default: true },
+      { language: "sp", name: "Spanish", default: false }
     ];
   }
 }

package/server-multicodec.ts

@@ -69,20 +69,20 @@ class RefChannelManager implements IChannelManager {
 
   _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: 3663471, codecs: "avc1.64001F,mp4a.40.2", channels: "2" },
+      { resolution: [1280, 720], bw: 5841380, codecs: "avc1.64001F,mp4a.40.2", channels: "2" },
+      { resolution: [1920, 1080], bw: 8973571, codecs: "avc1.64001F,mp4a.40.2", channels: "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" },
+      { resolution: [640, 360], bw: 4301519, codecs: "avc1.64001F,ec-3", channels: "16/JOC" },
+      { resolution: [1280, 720], bw: 6479428, codecs: "avc1.64001F,ec-3", channels: "16/JOC" },
+      { resolution: [1920, 1080], bw: 9611619, codecs: "avc1.640032,ec-3", channels: "16/JOC" },
     ];
   }
 
   _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 }
+      { language: "ja", "name": "日本語", default: true },
+      { language: "en", "name": "English", default: false }
     ];
   }
 }
@@ -101,4 +101,4 @@ const engineOptions: ChannelEngineOpts = {
 
 const engine = new ChannelEngine(refAssetManager, engineOptions);
 engine.start();
-engine.listen(process.env.PORT || 8000);
+engine.listen(process.env.PORT || 8000);