bigscreen-player 8.10.2 → 9.0.0

package/dist/esm/{imscsubtitles-2963ed4a.js → imscsubtitles-72c8e371.js}

@@ -1,13 +1,11 @@
 import { fromXML, generateISD, renderHTML } from 'smp-imsc';
-import { f as findSegmentTemplate, L as LoadUrl, a as DebugToolInstance, P as Plugins, U as Utils, D as DOMHelpers } from './main-e65c195f.js';
+import { f as findSegmentTemplate, L as LoadUrl, a as DebugTool, P as Plugins, U as Utils, D as DOMHelpers } from './main-5b4d5af8.js';
+import 'tslib';
 
 const SEGMENTS_BUFFER_SIZE = 3;
 const LOAD_ERROR_COUNT_MAX = 3;
 
 function IMSCSubtitles(mediaPlayer, autoStart, parentElement, mediaSources, defaultStyleOpts) {
-  const windowStartEpochSeconds = mediaSources?.time().windowStartTime / 1000;
-  const presentationTimeOffsetSeconds = mediaSources?.time().presentationTimeOffsetSeconds;
-
   let imscRenderOpts = transformStyleOptions(defaultStyleOpts);
   let currentSegmentRendered = {};
   let loadErrorCount = 0;
@@ -21,8 +19,14 @@ function IMSCSubtitles(mediaPlayer, autoStart, parentElement, mediaSources, defa
     start();
   }
 
-  function getTimeOffset() {
-    return presentationTimeOffsetSeconds || windowStartEpochSeconds
+  function hasOffset() {
+    const { presentationTimeOffsetInMilliseconds } = mediaSources.time();
+
+    return (
+      typeof presentationTimeOffsetInMilliseconds === "number" &&
+      isFinite(presentationTimeOffsetInMilliseconds) &&
+      presentationTimeOffsetInMilliseconds > 0
+    )
   }
 
   function calculateSegmentNumber() {
@@ -31,7 +35,7 @@ function IMSCSubtitles(mediaPlayer, autoStart, parentElement, mediaSources, defa
     // Add 1 as the PTO gives segment '0' relative to the presentation time.
     // DASH segments use one-based indexing, so add 1 to the result of PTO.
     // (Imagine PTO was 0)
-    if (typeof presentationTimeOffsetSeconds === "number" && isFinite(presentationTimeOffsetSeconds)) {
+    if (hasOffset()) {
       return segmentNumber + 1
     }
 
@@ -71,7 +75,7 @@ function IMSCSubtitles(mediaPlayer, autoStart, parentElement, mediaSources, defa
       onLoad: (responseXML, responseText) => {
         resetLoadErrorCount();
         if (!responseXML && isSubtitlesWhole()) {
-          DebugToolInstance.error("responseXML is invalid");
+          DebugTool.error("responseXML is invalid");
           Plugins.interface.onSubtitlesXMLError({ cdn: mediaSources.currentSubtitlesCdn() });
           stop();
           return
@@ -85,7 +89,7 @@ function IMSCSubtitles(mediaPlayer, autoStart, parentElement, mediaSources, defa
             : responseText.split(/<\?xml[^?]+\?>/i)[1] || responseText;
 
           if (isSubtitlesWhole()) {
-            DebugToolInstance.info(`XML trim duration: ${Date.now() - preTrimTime}`);
+            DebugTool.info(`XML trim duration: ${Date.now() - preTrimTime}`);
           }
 
           const preParseTime = Date.now();
@@ -93,7 +97,7 @@ function IMSCSubtitles(mediaPlayer, autoStart, parentElement, mediaSources, defa
           const xml = fromXML(xmlText);
 
           if (isSubtitlesWhole()) {
-            DebugToolInstance.info(`XML parse duration: ${Date.now() - preParseTime}`);
+            DebugTool.info(`XML parse duration: ${Date.now() - preParseTime}`);
           }
 
           const times = xml.getMediaTimeEvents();
@@ -110,18 +114,18 @@ function IMSCSubtitles(mediaPlayer, autoStart, parentElement, mediaSources, defa
           }
         } catch (error) {
           error.name = "SubtitlesTransformError";
-          DebugToolInstance.error(error);
+          DebugTool.error(error);
 
           Plugins.interface.onSubtitlesTransformError();
           stop();
         }
       },
       onError: ({ statusCode, ...rest } = {}) => {
-        DebugToolInstance.error(`Failed to load subtitle data. Status code: ${statusCode}`);
+        DebugTool.error(`Failed to load subtitle data. Status code: ${statusCode}`);
         loadErrorFailover({ statusCode, ...rest });
       },
       onTimeout: () => {
-        DebugToolInstance.error("Loading subtitles timed out");
+        DebugTool.error("Loading subtitles timed out");
         Plugins.interface.onSubtitlesTimeout({ cdn: mediaSources.currentSubtitlesCdn() });
         stop();
       },
@@ -141,16 +145,15 @@ function IMSCSubtitles(mediaPlayer, autoStart, parentElement, mediaSources, defa
   }
 
   function loadErrorFailover(opts) {
-    const errorCase = () => {
-      DebugToolInstance.info("No more CDNs available for subtitle failover");
-    };
-
     const isWhole = isSubtitlesWhole();
 
     if (isWhole || (!isWhole && loadErrorLimit())) {
       stop();
       segments = [];
-      mediaSources.failoverSubtitles(start, errorCase, opts);
+      mediaSources
+        .failoverSubtitles(opts)
+        .then(() => start())
+        .catch(() => DebugTool.info("No more CDNs available for subtitle failover"));
     }
   }
 
@@ -284,7 +287,7 @@ function IMSCSubtitles(mediaPlayer, autoStart, parentElement, mediaSources, defa
       renderHTML(isd, subsElement, null, renderHeight, renderWidth, false, null, null, false, styleOpts);
     } catch (error) {
       error.name = "SubtitlesRenderError";
-      DebugToolInstance.error(error);
+      DebugTool.error(error);
 
       Plugins.interface.onSubtitlesRenderError();
     }
@@ -309,11 +312,15 @@ function IMSCSubtitles(mediaPlayer, autoStart, parentElement, mediaSources, defa
   }
 
   function isValidTime(time) {
-    return time >= getTimeOffset()
+    return time >= 0
   }
 
   function getCurrentTime() {
-    return isSubtitlesWhole() ? mediaPlayer.getCurrentTime() : getTimeOffset() + mediaPlayer.getCurrentTime()
+    const presentationTimeInSeconds = mediaPlayer.getCurrentTime();
+
+    return hasOffset()
+      ? presentationTimeInSeconds + mediaSources.time().presentationTimeOffsetInMilliseconds / 1000
+      : presentationTimeInSeconds
   }
 
   function start() {

package/dist/esm/{legacysubtitles-ff50db6c.js → legacysubtitles-e745299b.js}

@@ -1,4 +1,5 @@
-import { D as DOMHelpers, a as DebugToolInstance, P as Plugins, L as LoadUrl, T as TransportControlPosition } from './main-e65c195f.js';
+import { D as DOMHelpers, a as DebugTool, P as Plugins, L as LoadUrl, T as TransportControlPosition } from './main-5b4d5af8.js';
+import 'tslib';
 
 /**
  * Safely checks if an attribute exists on an element.
@@ -246,7 +247,7 @@ function Transformer() {
         subtitlesForTime: (time) => items.filter((subtitle) => subtitle.start < time && subtitle.end > time),
       }
     } catch (e) {
-      DebugToolInstance.info("Error transforming captions : " + e);
+      DebugTool.info("Error transforming captions : " + e);
       Plugins.interface.onSubtitlesTransformError();
     }
   }
@@ -304,7 +305,7 @@ function Renderer(id, captionsXML, mediaPlayer) {
 
       confirmCaptionsRendered();
     } catch (e) {
-      DebugToolInstance.info("Exception while rendering subtitles: " + e);
+      DebugTool.info("Exception while rendering subtitles: " + e);
       Plugins.interface.onSubtitlesRenderError();
     }
   }
@@ -364,19 +365,20 @@ function LegacySubtitles(mediaPlayer, autoStart, parentElement, mediaSources) {
           if (responseXML) {
             createContainer(responseXML);
           } else {
-            DebugToolInstance.info("Error: responseXML is invalid.");
+            DebugTool.info("Error: responseXML is invalid.");
             Plugins.interface.onSubtitlesXMLError({ cdn: mediaSources.currentSubtitlesCdn() });
           }
         },
         onError: ({ statusCode, ...rest } = {}) => {
-          const errorCase = () => {
-            DebugToolInstance.info("Failed to load from subtitles file from all available CDNs");
-          };
-          DebugToolInstance.info(`Error loading subtitles data: ${statusCode}`);
-          mediaSources.failoverSubtitles(loadSubtitles, errorCase, { statusCode, ...rest });
+          DebugTool.info(`Error loading subtitles data: ${statusCode}`);
+
+          mediaSources
+            .failoverSubtitles({ statusCode, ...rest })
+            .then(() => loadSubtitles())
+            .catch(() => DebugTool.info("Failed to load from subtitles file from all available CDNs"));
         },
         onTimeout: () => {
-          DebugToolInstance.info("Request timeout loading subtitles");
+          DebugTool.info("Request timeout loading subtitles");
           Plugins.interface.onSubtitlesTimeout({ cdn: mediaSources.currentSubtitlesCdn() });
         },
       });