@eluvio/elv-player-js 2.1.23 → 2.1.25

package/lib/player/Player.js

@@ -160,18 +160,19 @@ export class EluvioPlayer {
     let options = {
       ignore_trimming: playoutParameters.ignoreTrimming,
       resolve: playoutParameters.resolve,
-      ...(playoutParameters.options || {})
+      ...(playoutParameters.options || {}),
+      clip_start: (playoutParameters.options || {}).clip_start || playoutParameters.clipStart,
+      clip_end: (playoutParameters.options || {}).clip_end || playoutParameters.clipEnd,
     };
 
-    if(playoutParameters.clipStart || playoutParameters.clipEnd) {
-      options.clip_start = parseFloat(playoutParameters.clipStart || 0);
+    let clipStart, clipEnd;
+    if(options.clip_start || options.clip_end) {
+      clipStart = parseFloat(options.clip_start || 0);
+      clipEnd = parseFloat(options.clip_end || 0);
 
-      if(playoutParameters.clipEnd) {
-        options.clip_end = parseFloat(playoutParameters.clipEnd);
-      }
-
-      options.clip_start = options.clip_start || 0;
-      options.clip_end = options.clip_end || 9999999;
+      // These may need to be adjusted due to content trimming later
+      delete options.clip_start;
+      delete options.clip_end;
     }
 
     if(!playoutParameters.channel) {
@@ -203,8 +204,6 @@ export class EluvioPlayer {
 
       offeringURI = availableOfferings[offeringId].uri;
 
-
-
       if(this.sourceOptions.contentInfo.liveDVR === EluvioPlayerParameters.liveDVR.ON && offeringProperties.dvr_available) {
         options.dvr = 1;
         this.dvrAvailable = true;
@@ -215,6 +214,68 @@ export class EluvioPlayer {
       this.isLive = offeringProperties.live;
     }
 
+    const GetPlayoutOptions = async options => {
+      if(playoutParameters.directLink) {
+        return await client.PlayoutOptions({
+          offeringURI,
+          options
+        });
+      } else {
+        return await client.PlayoutOptions({
+          ...playoutParameters,
+          handler: playoutParameters.channel ? "channel" : "playout",
+          offering: playoutParameters.channel || offeringId,
+          options
+        });
+      }
+    };
+
+    if(!this.sourceOptions.playoutOptions) {
+      let playoutOptions;
+
+      if(!clipStart && !clipEnd) {
+        // No clipping
+        playoutOptions = await GetPlayoutOptions(options);
+      } else if(!playoutParameters.clipRelativeToUntrimmed) {
+        // Clip without considering trimming
+        playoutOptions = await GetPlayoutOptions({
+          ...options,
+          clip_start: clipStart,
+          clip_end: clipEnd
+        });
+      } else {
+        // Content may be trimmed - get full content to determine start offset and adjust clip points accordingly
+        playoutOptions = await GetPlayoutOptions(options);
+
+        let offset;
+        try {
+          for(const protocol of Object.keys(playoutOptions || {})) {
+            for(const drm of Object.keys(playoutOptions[protocol].playoutMethods || {})) {
+              if(typeof (playoutOptions[protocol].playoutMethods[drm].properties || {}).start_offset_float !== "undefined") {
+                offset = parseFloat(playoutOptions[protocol].playoutMethods[drm].properties.start_offset_float);
+                break;
+              }
+            }
+
+            if(typeof offset !== "undefined") {
+              break;
+            }
+          }
+        } catch(error) {
+          this.Log("Failed to load content offset for clip adjustment:");
+          this.Log(error, true);
+        }
+
+        playoutOptions = await GetPlayoutOptions({
+          ...options,
+          clip_start: (clipStart || 0) - (offset || 0),
+          clip_end: ((clipEnd || 0) - (offset || 0)) || 9999999
+        });
+      }
+
+      this.sourceOptions.playoutOptions = playoutOptions;
+    }
+
     if(playoutParameters.directLink) {
       if(!this.sourceOptions.playoutOptions) {
         this.sourceOptions.playoutOptions = await client.PlayoutOptions({
@@ -491,6 +552,7 @@ export class EluvioPlayer {
         versionHash,
         offering,
         compositionKey,
+        trimOffset,
         clipStart,
         clipEnd
       };
@@ -577,7 +639,7 @@ export class EluvioPlayer {
       if(this.thumbnailTrackUrl) {
         this.thumbnailHandler = new ThumbnailHandler(
           this.thumbnailTrackUrl,
-           (this.playerOptions.startTime || this.sourceOptions.playoutParameters.clipStart || 0) - trimOffset
+           trimOffset || 0
         );
         this.thumbnailHandler.LoadThumbnails()
           .then(() => {

package/lib/player/PlayerParameters.js

@@ -164,6 +164,7 @@ export const DefaultParameters = {
       authorizationToken: undefined,
       clipStart: undefined,
       clipEnd: undefined,
+      clipRelativeToUntrimmed: true,
       audioTrackLabel: undefined,
       options: undefined
     }

package/lib/player/ThumbnailHandler.js

@@ -59,8 +59,8 @@ const FormatVTTCue = ({label, cue, offset=0}) => {
     tagId,
     tagType: "vtt",
     label,
-    startTime: cue.startTime + offset,
-    endTime: cue.endTime + offset,
+    startTime: cue.startTime - offset,
+    endTime: cue.endTime - offset,
     text: cue.text,
     tag: cueCopy
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-player-js",
-  "version": "2.1.23",
+  "version": "2.1.25",
   "description": "![Eluvio Logo](lib/static/images/Logo.png \"Eluvio Logo\")",
   "main": "dist/elv-player-js.es.js",
   "license": "MIT",