cloudinary-video-player 2.1.2-edge.1 → 2.1.2-edge.2

package/dist/cld-video-player.js

@@ -9243,7 +9243,7 @@ class CloudinaryAnalytics {
       this.cloudinaryAnalytics.startManualTracking(metadata, {
         ...(lodash_isPlainObject__WEBPACK_IMPORTED_MODULE_1___default()(this.analyticsOptions) ? this.analyticsOptions : {}),
         videoPlayerType: 'cloudinary video player',
-        videoPlayerVersion: "2.1.2-edge.1"
+        videoPlayerVersion: "2.1.2-edge.2"
       });
     } else if (this.currentVideMetadata.cloudName !== metadata.cloudName || this.currentVideMetadata.publicId !== metadata.publicId) {
       this.cloudinaryAnalytics.stopManualTracking();
@@ -9614,7 +9614,7 @@ class CloudinaryContext {
       options.sourceTypes = options.sourceTypes || _this.sourceTypes();
       options.poster = options.poster || posterOptionsForCurrent();
       options.queryParams = Object.assign(options.queryParams || {}, options.usageReport ? {
-        _s: `vp-${"2.1.2-edge.1"}`
+        _s: `vp-${"2.1.2-edge.2"}`
       } : {});
       if (options.sourceTypes.indexOf('audio') > -1) {
         builtSrc = new _models_audio_source_audio_source__WEBPACK_IMPORTED_MODULE_7__["default"](publicId, options);
@@ -10878,7 +10878,7 @@ const contextMenuContent = player => {
   const isFullscreen = player.isFullscreen();
   const aboutMenuItem = {
     class: 'player-version',
-    label: 'Cloudinary Player v' + "2.1.2-edge.1"
+    label: 'Cloudinary Player v' + "2.1.2-edge.2"
   };
   if (!player.controls()) {
     return [aboutMenuItem];
@@ -12566,13 +12566,13 @@ const isKeyInTransformation = (transformation, key) => {
 };
 const addTextTracks = (tracks, videojs) => {
   tracks.forEach(track => {
-    if (track.src) {
+    if (track.src && track.src.endsWith('.vtt')) {
       fetch(track.src, GET_ERROR_DEFAULT_REQUEST).then(r => {
         if (r.status >= 200 && r.status <= 399) {
           videojs.addRemoteTextTrack(track, true);
         }
       });
-    } else if (videojs.pacedTranscript) {
+    } else if (videojs.pacedTranscript && (!track.src || track.src.endsWith('.transcript'))) {
       videojs.pacedTranscript(track);
     }
   });
@@ -12870,6 +12870,19 @@ const getCloudinaryOptions = function () {
     posterOptionsPublicId: cloudinaryOptions.posterOptions && hasConfig(cloudinaryOptions.posterOptions.publicId)
   };
 };
+const getTranscriptOptions = function () {
+  let textTracks = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const tracksArr = [textTracks.captions, ...textTracks.subtitles];
+  return {
+    textTracks: hasConfig(textTracks),
+    pacedTextTracks: hasConfig(textTracks) && JSON.stringify(textTracks || {}).includes('"maxWords":') || null,
+    wordHighlight: hasConfig(textTracks) && JSON.stringify(textTracks || {}).includes('"wordHighlight":') || null,
+    transcriptAutoLoaded: tracksArr.some(track => !track.url) || null,
+    transcriptFromURl: tracksArr.some(track => track.url?.endsWith('.transcript')) || null,
+    transcriptLanguages: tracksArr.filter(track => !track.url).map(track => track.language || '').join(',') || null,
+    vttFromUrl: tracksArr.some(track => track.url?.endsWith('.vtt')) || null
+  };
+};
 const getSourceOptions = function () {
   let sourceOptions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return {
@@ -12883,9 +12896,7 @@ const getSourceOptions = function () {
       sourceInfoDescription: sourceOptions.info.description
     } : {}),
     ...(sourceOptions.textTracks ? {
-      textTracks: hasConfig(sourceOptions.textTracks),
-      pacedTextTracks: hasConfig(sourceOptions.textTracks) && JSON.stringify(sourceOptions.textTracks || {}).includes('"maxWords":'),
-      wordHighlight: hasConfig(sourceOptions.textTracks) && JSON.stringify(sourceOptions.textTracks || {}).includes('"wordHighlight":'),
+      ...(hasConfig(sourceOptions.textTracks) && getTranscriptOptions(sourceOptions.textTracks)),
       ...(sourceOptions.textTracks.options ? {
         styledTextTracksTheme: sourceOptions.textTracks.options.theme,
         styledTextTracksFont: sourceOptions.textTracks.options.fontFace,
@@ -13475,7 +13486,7 @@ class VideoPlayer extends _utils__WEBPACK_IMPORTED_MODULE_9__["default"].mixin(_
       const analyticsData = (0,_utils_get_analytics_player_options__WEBPACK_IMPORTED_MODULE_18__.getAnalyticsFromPlayerOptions)(options);
       const analyticsParams = new URLSearchParams(analyticsData).toString();
       const baseParams = new URLSearchParams({
-        vpVersion: "2.1.2-edge.1",
+        vpVersion: "2.1.2-edge.2",
         vpInstanceId: this.getVPInstanceId(),
         // #if (process.env.WEBPACK_BUILD_LIGHT)
         //         vpLightBuild: true,

package/dist/cld-video-player.light.js

@@ -1407,7 +1407,7 @@ class CloudinaryAnalytics {
       this.cloudinaryAnalytics.startManualTracking(metadata, {
         ...(lodash_isPlainObject__WEBPACK_IMPORTED_MODULE_1___default()(this.analyticsOptions) ? this.analyticsOptions : {}),
         videoPlayerType: 'cloudinary video player',
-        videoPlayerVersion: "2.1.2-edge.1"
+        videoPlayerVersion: "2.1.2-edge.2"
       });
     } else if (this.currentVideMetadata.cloudName !== metadata.cloudName || this.currentVideMetadata.publicId !== metadata.publicId) {
       this.cloudinaryAnalytics.stopManualTracking();
@@ -1778,7 +1778,7 @@ class CloudinaryContext {
       options.sourceTypes = options.sourceTypes || _this.sourceTypes();
       options.poster = options.poster || posterOptionsForCurrent();
       options.queryParams = Object.assign(options.queryParams || {}, options.usageReport ? {
-        _s: `vp-${"2.1.2-edge.1"}`
+        _s: `vp-${"2.1.2-edge.2"}`
       } : {});
       if (options.sourceTypes.indexOf('audio') > -1) {
         builtSrc = new _models_audio_source_audio_source__WEBPACK_IMPORTED_MODULE_7__["default"](publicId, options);
@@ -3042,7 +3042,7 @@ const contextMenuContent = player => {
   const isFullscreen = player.isFullscreen();
   const aboutMenuItem = {
     class: 'player-version',
-    label: 'Cloudinary Player v' + "2.1.2-edge.1"
+    label: 'Cloudinary Player v' + "2.1.2-edge.2"
   };
   if (!player.controls()) {
     return [aboutMenuItem];
@@ -4441,13 +4441,13 @@ const isKeyInTransformation = (transformation, key) => {
 };
 const addTextTracks = (tracks, videojs) => {
   tracks.forEach(track => {
-    if (track.src) {
+    if (track.src && track.src.endsWith('.vtt')) {
       fetch(track.src, GET_ERROR_DEFAULT_REQUEST).then(r => {
         if (r.status >= 200 && r.status <= 399) {
           videojs.addRemoteTextTrack(track, true);
         }
       });
-    } else if (videojs.pacedTranscript) {
+    } else if (videojs.pacedTranscript && (!track.src || track.src.endsWith('.transcript'))) {
       videojs.pacedTranscript(track);
     }
   });
@@ -4745,6 +4745,19 @@ const getCloudinaryOptions = function () {
     posterOptionsPublicId: cloudinaryOptions.posterOptions && hasConfig(cloudinaryOptions.posterOptions.publicId)
   };
 };
+const getTranscriptOptions = function () {
+  let textTracks = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const tracksArr = [textTracks.captions, ...textTracks.subtitles];
+  return {
+    textTracks: hasConfig(textTracks),
+    pacedTextTracks: hasConfig(textTracks) && JSON.stringify(textTracks || {}).includes('"maxWords":') || null,
+    wordHighlight: hasConfig(textTracks) && JSON.stringify(textTracks || {}).includes('"wordHighlight":') || null,
+    transcriptAutoLoaded: tracksArr.some(track => !track.url) || null,
+    transcriptFromURl: tracksArr.some(track => track.url?.endsWith('.transcript')) || null,
+    transcriptLanguages: tracksArr.filter(track => !track.url).map(track => track.language || '').join(',') || null,
+    vttFromUrl: tracksArr.some(track => track.url?.endsWith('.vtt')) || null
+  };
+};
 const getSourceOptions = function () {
   let sourceOptions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return {
@@ -4758,9 +4771,7 @@ const getSourceOptions = function () {
       sourceInfoDescription: sourceOptions.info.description
     } : {}),
     ...(sourceOptions.textTracks ? {
-      textTracks: hasConfig(sourceOptions.textTracks),
-      pacedTextTracks: hasConfig(sourceOptions.textTracks) && JSON.stringify(sourceOptions.textTracks || {}).includes('"maxWords":'),
-      wordHighlight: hasConfig(sourceOptions.textTracks) && JSON.stringify(sourceOptions.textTracks || {}).includes('"wordHighlight":'),
+      ...(hasConfig(sourceOptions.textTracks) && getTranscriptOptions(sourceOptions.textTracks)),
       ...(sourceOptions.textTracks.options ? {
         styledTextTracksTheme: sourceOptions.textTracks.options.theme,
         styledTextTracksFont: sourceOptions.textTracks.options.fontFace,
@@ -5349,7 +5360,7 @@ class VideoPlayer extends _utils__WEBPACK_IMPORTED_MODULE_9__["default"].mixin(_
       const analyticsData = (0,_utils_get_analytics_player_options__WEBPACK_IMPORTED_MODULE_18__.getAnalyticsFromPlayerOptions)(options);
       const analyticsParams = new URLSearchParams(analyticsData).toString();
       const baseParams = new URLSearchParams({
-        vpVersion: "2.1.2-edge.1",
+        vpVersion: "2.1.2-edge.2",
         vpInstanceId: this.getVPInstanceId(),
         // #if (process.env.WEBPACK_BUILD_LIGHT)
         vpLightBuild: true,