eyevinn-channel-engine 4.0.16 → 4.0.18

package/CONTRIBUTING.md

@@ -0,0 +1,62 @@
+# Submitting Issues
+
+We use GitHub issues to track public bugs. If you are submitting a bug, please provide
+as much info as possible to make it easier to reproduce the issue and update unit tests.
+
+# Contributing Code
+
+This project uses [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/#summary).
+
+We follow the [GitHub Flow](https://guides.github.com/introduction/flow/index.html) so all contributions happen through pull requests. We actively welcome your pull requests:
+
+1.  Fork the repo and create your branch from master.
+2.  If you've added code that should be tested, add tests.
+3.  If you've changed APIs, update the documentation.
+4.  Ensure the test suite passes.
+5.  Issue that pull request!
+
+When submitting code changes your submissions are understood to be under the same MIT License that covers the project. Feel free to contact Eyevinn Technology if that's a concern.
+
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the Contributor Covenant, version 1.4, available at http://contributor-covenant.org/version/1/4

package/README.md

@@ -91,6 +91,68 @@ and this means that it is not possible to mix muxed TS with demuxed CMAF.
 
 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')`;
 
+## Contributing
+
+Read [CONTRIBUTING](CONTRIBUTING.md) first and then follow the instructions below to get started with the devolpment environment.
+
+### Development
+
+Ensure that you are running node version 16 as version 18 is not supported yet.
+
+```
+node --version
+v16.17.0
+```
+
+Then install the dependencies:
+
+```
+npm install
+```
+
+Build the app:
+
+```
+npm run build
+```
+
+To start the reference implementation in `server.ts` run:
+
+```
+npm start
+```
+
+For full debug mode you set the environment variable `DEBUG`.
+
+```
+DEBUG=* npm start
+```
+
+or if you want be more specific for example:
+
+```
+DEBUG=engine-* npm start
+```
+
+In addition there other reference implemetations that can be used:
+- `server-demux.ts` : example with demuxed audio
+- `server-livemix.ts` : example with live mimxing
+- `server-multicodec.ts` : example with multicodec
+
+### Source linking hls-vodtolive library
+
+It is not uncommon that you need to test an local branch of the hls-vodtolive library and in order to do that you can use `npm link`.
+
+1. Go to the directory where you have the source code for the hls-vodtolive library and run `npm link`
+2. Then go to the channel engine source code directory and run `npm link @eyevinn/hls-vodtolive`
+
+To restore and use the npm published version run the following in the channel engine source code directory:
+
+```
+npm uninstall --no-save @eyevinn/hls-vodtolive
+npm install
+```
+
 ## 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

@@ -50,6 +50,7 @@ export interface VodResponse {
     type?: string;
     currentMetadata?: VodResponseMetadata;
     timedMetadata?: VodTimedMetadata;
+    unixTs?: number;
 }
 export interface IAssetManager {
     getNextVod: (vodRequest: VodRequest) => Promise<VodResponse>;

package/dist/engine/session.js

@@ -952,7 +952,7 @@ var Session = /** @class */ (function () {
     };
     Session.prototype.incrementAsync = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var isLeader, sessionState, playheadState, currentVod, _a, leaderAction, _b, m3u8_3, _c, audioIncrement, position, currentVod_1, sessionState_1, posDiff, incrementValue, index, audioSeqLastIdx, thresh, audioPosition, _d, _e, _f, _g, _h, _j, _k, _l, _m, mediaSequenceValue, diffMs, m3u8;
+            var isLeader, sessionState, playheadState, currentVod, _a, leaderAction, _b, m3u8_3, _c, audioIncrement, positionV, positionA, position, currentVod_1, sessionState_1, posDiff, incrementValue, index, audioSeqLastIdx, thresh, audioPosition, _d, _e, _f, _g, _h, _j, _k, _l, _m, mediaSequenceValue, diffMs, m3u8;
             return __generator(this, function (_o) {
                 switch (_o.label) {
                     case 0: return [4 /*yield*/, this._tickAsync()];
@@ -1020,9 +1020,12 @@ var Session = /** @class */ (function () {
                         _c.vodMediaSeqVideo = _o.sent();
                         audioIncrement = void 0;
                         if (!this.use_demuxed_audio) return [3 /*break*/, 23];
+                        positionV = 0;
+                        positionA = 0;
                         return [4 /*yield*/, this._getCurrentPlayheadPosition()];
                     case 16:
                         position = (_o.sent()) * 1000;
+                        positionV = position / 1000;
                         return [4 /*yield*/, this._sessionState.getCurrentVod()];
                     case 17:
                         currentVod_1 = _o.sent();
@@ -1039,6 +1042,7 @@ var Session = /** @class */ (function () {
                     case 19: return [4 /*yield*/, this._getAudioPlayheadPosition(sessionState_1.vodMediaSeqAudio + index)];
                     case 20:
                         audioPosition = (_o.sent()) * 1000;
+                        positionA = audioPosition / 1000;
                         posDiff = position - audioPosition;
                         if (posDiff <= 0) {
                             return [3 /*break*/, 22];
@@ -1060,6 +1064,7 @@ var Session = /** @class */ (function () {
                         _o.label = 22;
                     case 22:
                         audioIncrement = index;
+                        debug("[".concat(this._sessionId, "]: Current VOD Playhead Positions are to be: [").concat(positionV.toFixed(3), "][").concat(positionA.toFixed(3), "] (").concat((positionA - positionV).toFixed(3), ")"));
                         _o.label = 23;
                     case 23:
                         debug("[".concat(this._sessionId, "]: Will increment audio with ").concat(audioIncrement));
@@ -1628,7 +1633,7 @@ var Session = /** @class */ (function () {
                         if (!vodResponse.type) {
                             debug("[".concat(this._sessionId, "]: got first VOD uri=").concat(vodResponse.uri, ":").concat(vodResponse.offset || 0));
                             hlsOpts = { sequenceAlwaysContainNewSegments: this.alwaysNewSegments, forcedDemuxMode: this.use_demuxed_audio };
-                            newVod = new HLSVod(vodResponse.uri, [], null, vodResponse.offset * 1000, m3u8Header(this._instanceId), hlsOpts);
+                            newVod = new HLSVod(vodResponse.uri, [], vodResponse.unixTs, vodResponse.offset * 1000, m3u8Header(this._instanceId), hlsOpts);
                             if (vodResponse.timedMetadata) {
                                 Object.keys(vodResponse.timedMetadata).map(function (k) {
                                     newVod.addMetadata(k, vodResponse.timedMetadata[k]);
@@ -1836,7 +1841,7 @@ var Session = /** @class */ (function () {
                         if (!vodResponse.type) {
                             debug("[".concat(this._sessionId, "]: got next VOD uri=").concat(vodResponse.uri, ":").concat(vodResponse.offset));
                             hlsOpts = { sequenceAlwaysContainNewSegments: this.alwaysNewSegments, forcedDemuxMode: this.use_demuxed_audio };
-                            newVod = new HLSVod(vodResponse.uri, null, null, vodResponse.offset * 1000, m3u8Header(this._instanceId), hlsOpts);
+                            newVod = new HLSVod(vodResponse.uri, null, vodResponse.unixTs, vodResponse.offset * 1000, m3u8Header(this._instanceId), hlsOpts);
                             if (vodResponse.timedMetadata) {
                                 Object.keys(vodResponse.timedMetadata).map(function (k) {
                                     newVod.addMetadata(k, vodResponse.timedMetadata[k]);
@@ -2147,8 +2152,8 @@ var Session = /** @class */ (function () {
                 slateVod_1.load()
                     .then(function () {
                     var hlsOpts = { sequenceAlwaysContainNewSegments: _this.alwaysNewSegments, forcedDemuxMode: _this.use_demuxed_audio };
-                    hlsVod_1 = new HLSVod(_this.slateUri, null, null, null, m3u8Header(_this._instanceId), hlsOpts);
                     var timestamp = Date.now();
+                    hlsVod_1 = new HLSVod(_this.slateUri, null, timestamp, null, m3u8Header(_this._instanceId), hlsOpts);
                     hlsVod_1.addMetadata('id', "slate-".concat(timestamp));
                     hlsVod_1.addMetadata('start-date', new Date(timestamp).toISOString());
                     hlsVod_1.addMetadata('planned-duration', ((reps || _this.slateRepetitions) * _this.slateDuration) / 1000);
@@ -2210,8 +2215,8 @@ var Session = /** @class */ (function () {
                 slateVod_2.load()
                     .then(function () {
                     var hlsOpts = { sequenceAlwaysContainNewSegments: _this.alwaysNewSegments, forcedDemuxMode: _this.use_demuxed_audio };
-                    hlsVod_2 = new HLSVod(nexVodUri, null, null, null, m3u8Header(_this._instanceId), hlsOpts);
                     var timestamp = Date.now();
+                    hlsVod_2 = new HLSVod(nexVodUri, null, timestamp, null, m3u8Header(_this._instanceId), hlsOpts);
                     hlsVod_2.addMetadata('id', "slate-".concat(timestamp));
                     hlsVod_2.addMetadata('start-date', new Date(timestamp).toISOString());
                     hlsVod_2.addMetadata('planned-duration', requestedDuration);

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.0.16",
+  "version": "4.0.18",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,6 +13,9 @@
     "start-demux": "node dist/server-demux.js",
     "start-livemix": "node dist/server-livemix.js"
   },
+  "engines": {
+    "node": "<18"
+  },
   "author": "Eyevinn Technology AB <work@eyevinn.se>",
   "contributors": [
     "Jonas Birmé <jonas.birme@eyevinn.se> (Eyevinn Technology AB)",
@@ -26,7 +29,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.0",
     "@eyevinn/hls-truncate": "^0.2.0",
-    "@eyevinn/hls-vodtolive": "^2.3.5",
+    "@eyevinn/hls-vodtolive": "^2.3.8",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",

package/engine/server.ts

@@ -89,6 +89,9 @@ export interface VodResponse {
   type?: string;
   currentMetadata?: VodResponseMetadata;
   timedMetadata?: VodTimedMetadata;
+  // Wall-clock start time of the VOD as unix ts. If set
+  // the program-date-time will be added to each segment
+  unixTs?: number;
 }
 
 export interface IAssetManager {

package/engine/session.js

@@ -726,7 +726,10 @@ class Session {
       sessionState.vodMediaSeqVideo = await this._sessionState.increment("vodMediaSeqVideo");
       let audioIncrement;
       if (this.use_demuxed_audio) {
+        let positionV = 0;
+        let positionA = 0;
         const position = (await this._getCurrentPlayheadPosition()) * 1000;
+        positionV = position / 1000;
         let currentVod = await this._sessionState.getCurrentVod();
         const sessionState = await this._sessionState.getValues(["vodMediaSeqAudio"]);
         let posDiff;
@@ -737,6 +740,7 @@ class Session {
         debug(`[${this._sessionId}]: About to determine audio increment`);
         do {
           const audioPosition = (await this._getAudioPlayheadPosition(sessionState.vodMediaSeqAudio + index)) * 1000;
+          positionA = audioPosition / 1000;
           posDiff = position - audioPosition;
           if (posDiff <= 0) {
             break;
@@ -753,6 +757,7 @@ class Session {
           }
         } while (!(-thresh < posDiff && posDiff < thresh));
         audioIncrement = index;
+        debug(`[${this._sessionId}]: Current VOD Playhead Positions are to be: [${positionV.toFixed(3)}][${positionA.toFixed(3)}] (${(positionA-positionV).toFixed(3)})`);
       }
       debug(`[${this._sessionId}]: Will increment audio with ${audioIncrement}`);
       sessionState.vodMediaSeqAudio = await this._sessionState.increment("vodMediaSeqAudio", audioIncrement);
@@ -1152,7 +1157,7 @@ class Session {
             if (!vodResponse.type) {
               debug(`[${this._sessionId}]: got first VOD uri=${vodResponse.uri}:${vodResponse.offset || 0}`);
               const hlsOpts = { sequenceAlwaysContainNewSegments: this.alwaysNewSegments, forcedDemuxMode: this.use_demuxed_audio };
-              newVod = new HLSVod(vodResponse.uri, [], null, vodResponse.offset * 1000, m3u8Header(this._instanceId), hlsOpts);
+              newVod = new HLSVod(vodResponse.uri, [], vodResponse.unixTs, vodResponse.offset * 1000, m3u8Header(this._instanceId), hlsOpts);
               if (vodResponse.timedMetadata) {
                 Object.keys(vodResponse.timedMetadata).map(k => {
                   newVod.addMetadata(k, vodResponse.timedMetadata[k]);
@@ -1301,7 +1306,7 @@ class Session {
             if (!vodResponse.type) {
               debug(`[${this._sessionId}]: got next VOD uri=${vodResponse.uri}:${vodResponse.offset}`);
               const hlsOpts = { sequenceAlwaysContainNewSegments: this.alwaysNewSegments, forcedDemuxMode: this.use_demuxed_audio };
-              newVod = new HLSVod(vodResponse.uri, null, null, vodResponse.offset * 1000, m3u8Header(this._instanceId), hlsOpts);
+              newVod = new HLSVod(vodResponse.uri, null, vodResponse.unixTs, vodResponse.offset * 1000, m3u8Header(this._instanceId), hlsOpts);
               if (vodResponse.timedMetadata) {
                 Object.keys(vodResponse.timedMetadata).map(k => {
                   newVod.addMetadata(k, vodResponse.timedMetadata[k]);
@@ -1532,8 +1537,8 @@ class Session {
         slateVod.load()
           .then(() => {
             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 = new HLSVod(this.slateUri, null, timestamp, null, m3u8Header(this._instanceId), hlsOpts);
             hlsVod.addMetadata('id', `slate-${timestamp}`);
             hlsVod.addMetadata('start-date', new Date(timestamp).toISOString());
             hlsVod.addMetadata('planned-duration', ((reps || this.slateRepetitions) * this.slateDuration) / 1000);
@@ -1592,8 +1597,8 @@ class Session {
         slateVod.load()
           .then(() => {
             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 = new HLSVod(nexVodUri, null, timestamp, null, m3u8Header(this._instanceId), hlsOpts);
             hlsVod.addMetadata('id', `slate-${timestamp}`);
             hlsVod.addMetadata('start-date', new Date(timestamp).toISOString());
             hlsVod.addMetadata('planned-duration', requestedDuration);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "4.0.16",
+  "version": "4.0.18",
   "description": "OTT TV Channel Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,6 +13,9 @@
     "start-demux": "node dist/server-demux.js",
     "start-livemix": "node dist/server-livemix.js"
   },
+  "engines": {
+    "node": "<18"
+  },
   "author": "Eyevinn Technology AB <work@eyevinn.se>",
   "contributors": [
     "Jonas Birmé <jonas.birme@eyevinn.se> (Eyevinn Technology AB)",
@@ -26,7 +29,7 @@
   "dependencies": {
     "@eyevinn/hls-repeat": "^0.2.0",
     "@eyevinn/hls-truncate": "^0.2.0",
-    "@eyevinn/hls-vodtolive": "^2.3.5",
+    "@eyevinn/hls-vodtolive": "^2.3.8",
     "@eyevinn/m3u8": "^0.5.3",
     "abort-controller": "^3.0.0",
     "debug": "^3.2.7",

package/spec/engine/init_switching_spec.js

@@ -468,6 +468,7 @@ describe("The initialize switching", () => {
     if (m) {
       mseqNo = Number(m[1]);
     }
+    
     expect(mseqNo).toBe(10);
     const size = sessionCurrentSegs["1313000"].length;
     expect(sessionCurrentSegs["1313000"][0]).toEqual({
@@ -484,7 +485,7 @@ describe("The initialize switching", () => {
     const borderSegment = sessionCurrentSegs["1313000"][size - 1 - 3];
     expect(borderSegment.duration).toBe(10.880);
     expect(borderSegment.cue).toBe(null);
-    expect(borderSegment.timelinePosition).toBe(null);
+    expect(borderSegment.timelinePosition).not.toBe(null);
     expect(borderSegment.uri).toBe("https://maitv-vod.lab.eyevinn.technology/MORBIUS_Trailer_2020.mp4/1000/1000-00000.ts");
     expect(borderSegment.daterange["id"]).not.toBe(null);
     expect(borderSegment.daterange["start-date"]).not.toBe(null);
@@ -750,7 +751,8 @@ describe("The initialize switching", () => {
 
     const expectedLastVODSegItem = {
       discontinuity: true,
-      daterange: null
+      daterange: null,
+      vodTransition: true
     }
     const expectedFirstV2LSegItem = {
       duration: 7.2,
@@ -768,13 +770,11 @@ describe("The initialize switching", () => {
     }
 
     expect(newVodSegments["1313000"][0]).toEqual(expectedLastVODSegItem);
-    expect(newVodSegments["1313000"][1]).toEqual({
-      duration: 10.846444,
-      timelinePosition: null,
-      cue: null,
-      uri: 'https://maitv-vod.lab.eyevinn.technology/VINN.mp4/600/600-00000.ts',
-      byteRange: undefined,
-    });
+    expect(newVodSegments["1313000"][1].duration).toEqual(10.846444);
+    expect(newVodSegments["1313000"][1].cue).toBeNull();
+    expect(newVodSegments["1313000"][1].uri).toEqual('https://maitv-vod.lab.eyevinn.technology/VINN.mp4/600/600-00000.ts');
+
+    newVodSegments["1313000"][2].timelinePosition = null; // disregard timeline position
     expect(newVodSegments["1313000"][2]).toEqual(expectedFirstV2LSegItem);
     // expect(newVodSegments["1313000"][5]).toEqual({
     //   discontinuity: true,
@@ -784,9 +784,11 @@ describe("The initialize switching", () => {
     expect("start-date" in borderSegment.daterange).toBe(true);
     expect("id" in borderSegment.daterange).toBe(true);
     expect(borderSegment.duration).toEqual(11.3447);
-    expect(borderSegment.timelinePosition).toEqual(null);
+    expect(borderSegment.timelinePosition).not.toEqual(null);
     expect(borderSegment.cue).toEqual(null);
     expect(borderSegment.uri).toEqual("https://maitv-vod.lab.eyevinn.technology/BECKY_Trailer_2020.mp4/1000/1000-00000.ts");
+
+    newVodSegments["1313000"][7].timelinePosition = null; // disregard timeline position
     expect(newVodSegments["1313000"][7]).toEqual(expectedSecondVODSegItem);
   });