eyevinn-channel-engine 4.0.6 → 4.0.7

package/dist/engine/server.d.ts

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

package/dist/engine/session.js

@@ -1346,7 +1346,7 @@ var Session = /** @class */ (function () {
     };
     Session.prototype.getMasterManifestAsync = function (filter) {
         return __awaiter(this, void 0, void 0, function () {
-            var m3u8, currentVod, audioGroupIds, defaultAudioGroupId, hasClosedCaptions, i, audioGroupId, j, audioTrack, sessionProfile;
+            var m3u8, currentVod, audioGroupIds, defaultAudioGroupId, hasClosedCaptions, i, audioGroupId, j, audioTrack, channels, sessionProfile;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -1378,12 +1378,13 @@ var Session = /** @class */ (function () {
                                     audioGroupId = audioGroupIds[i];
                                     for (j = 0; j < this._audioTracks.length; j++) {
                                         audioTrack = this._audioTracks[j];
+                                        channels = this._audioTracks[j].channels ? this._audioTracks[j].channels : 2;
                                         // Make default track if set property is true.
                                         if (audioTrack.default) {
-                                            m3u8 += "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"".concat(audioGroupId, "\",LANGUAGE=\"").concat(audioTrack.language, "\", NAME=\"").concat(audioTrack.name, "\",AUTOSELECT=YES,DEFAULT=YES,CHANNELS=\"2\",URI=\"master-").concat(audioGroupId, "_").concat(audioTrack.language, ".m3u8;session=").concat(this._sessionId, "\"\n");
+                                            m3u8 += "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"".concat(audioGroupId, "\",LANGUAGE=\"").concat(audioTrack.language, "\", NAME=\"").concat(audioTrack.name, "\",AUTOSELECT=YES,DEFAULT=YES,CHANNELS=\"").concat(channels, "\",URI=\"master-").concat(audioGroupId, "_").concat(audioTrack.language, ".m3u8;session=").concat(this._sessionId, "\"\n");
                                         }
                                         else {
-                                            m3u8 += "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"".concat(audioGroupId, "\",LANGUAGE=\"").concat(audioTrack.language, "\", NAME=\"").concat(audioTrack.name, "\",AUTOSELECT=YES,DEFAULT=NO,CHANNELS=\"2\",URI=\"master-").concat(audioGroupId, "_").concat(audioTrack.language, ".m3u8;session=").concat(this._sessionId, "\"\n");
+                                            m3u8 += "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"".concat(audioGroupId, "\",LANGUAGE=\"").concat(audioTrack.language, "\", NAME=\"").concat(audioTrack.name, "\",AUTOSELECT=YES,DEFAULT=NO,CHANNELS=\"").concat(channels, "\",URI=\"master-").concat(audioGroupId, "_").concat(audioTrack.language, ".m3u8;session=").concat(this._sessionId, "\"\n");
                                         }
                                     }
                                 }

package/dist/package.json

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

package/dist/server-multicodec.d.ts

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

package/dist/server-multicodec.js

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

package/engine/server.ts

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

package/engine/session.js

@@ -959,11 +959,12 @@ class Session {
           let audioGroupId = audioGroupIds[i];
           for (let j = 0; j < this._audioTracks.length; j++) {
             let audioTrack = this._audioTracks[j];
+            let channels = this._audioTracks[j].channels ? this._audioTracks[j].channels : 2;
             // Make default track if set property is true.
             if (audioTrack.default) {
-              m3u8 += `#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="${audioGroupId}",LANGUAGE="${audioTrack.language}", NAME="${audioTrack.name}",AUTOSELECT=YES,DEFAULT=YES,CHANNELS="2",URI="master-${audioGroupId}_${audioTrack.language}.m3u8;session=${this._sessionId}"\n`;
+              m3u8 += `#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="${audioGroupId}",LANGUAGE="${audioTrack.language}", NAME="${audioTrack.name}",AUTOSELECT=YES,DEFAULT=YES,CHANNELS="${channels}",URI="master-${audioGroupId}_${audioTrack.language}.m3u8;session=${this._sessionId}"\n`;
             } else {
-              m3u8 += `#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="${audioGroupId}",LANGUAGE="${audioTrack.language}", NAME="${audioTrack.name}",AUTOSELECT=YES,DEFAULT=NO,CHANNELS="2",URI="master-${audioGroupId}_${audioTrack.language}.m3u8;session=${this._sessionId}"\n`;
+              m3u8 += `#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="${audioGroupId}",LANGUAGE="${audioTrack.language}", NAME="${audioTrack.name}",AUTOSELECT=YES,DEFAULT=NO,CHANNELS="${channels}",URI="master-${audioGroupId}_${audioTrack.language}.m3u8;session=${this._sessionId}"\n`;
             }
           }
         }

package/package.json

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

package/server-multicodec.ts

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

package/tsconfig.json

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